This repository was archived by the owner on May 22, 2025. It is now read-only.
Commit bd1ffde
committed
Merge branch 'PortsPsionics' of https://github.com/cowbot92/Yogstation into pr/22301
File tree
1,069 files changed
+215581
-697852
lines changed- _maps
- RandomRuins
- IceRuins
- LavaRuins
- SpaceRuins
- StationRuins
- BoxStation
- GaxStation
- maint
- 10x10
- 10x5
- 3x3
- 3x5
- 5x3
- RandomZLevels
- VR
- map_files
- DonutStation
- GaxStation
- IceMeta
- ManateeStation
- MiniStation
- YogStation
- generic
- shuttles
- templates
- holodeck
- lazy_templates
- shipbreaker
- code
- __DEFINES
- dcs/signals
- signals_mob
- traits
- {yogs_defines}
- __HELPERS
- logging
- _globalvars
- lists
- _onclick
- hud
- rendering
- plane_masters
- controllers
- configuration
- entries
- subsystem
- datums
- brain_damage
- components
- crafting
- storage
- diseases
- advance/symptoms
- elements
- greyscale/json_configs
- helper_datums
- keybinding
- mapgen/Cavegens
- martial
- mood_events
- mutations
- ruins
- shuttles
- station_traits
- status_effects
- buffs
- debuffs
- traits
- votes
- weather
- weather_types
- wires
- wounds
- game
- area
- areas
- atom
- gamemodes
- bloodsuckers
- brother
- changeling
- clown_ops
- cult
- devil
- devil agent
- dynamic
- eldritch_cult
- extended
- hivemind
- malfunction
- meteor
- monkey
- nuclear
- revolution
- traitor
- wizard
- zombie
- machinery
- camera
- computer
- doors
- porta_turret
- telecomms
- computers
- machines
- mecha
- equipment
- tools
- objects
- effects
- decals/cleanable
- effect_system/fluid_spread
- temporary_visuals
- items
- devices
- PDA
- radio
- granters
- magic
- grenades
- implants
- robot
- stacks
- sheets
- tiles
- storage
- tools
- two_handed
- structures
- crates_lockers/closets/secure
- icemoon
- turfs
- closed
- open
- floor
- space
- modules
- admin
- verbs
- SDQL2
- antagonists
- _common
- abductor
- blob
- bloodsuckers
- clans
- powers
- targeted
- structures
- vassal
- brother
- changeling
- powers
- clockcult
- clock_items
- clock_scriptures
- clock_structures
- creep
- cult
- demon
- devil
- sintouched
- disease
- eldritch_cult
- ert
- hivemind
- horror
- monkey
- monsterhunter
- morph
- nightmare
- ninja
- nukeop
- equipment
- pirate
- revenant
- revolution
- slaughter
- space_dragon
- traitor
- IAA
- wizard
- equipment
- spellbook_entries
- xeno
- zombie
- abilities
- asset_cache/assets
- atmospherics/machinery
- components/unary_devices
- awaymissions
- mission_code
- cargo
- client
- preferences
- middleware
- clothing
- gloves
- head
- masks
- outfits
- shoes
- spacesuits
- suits
- under
- events
- anomaly
- ghost_role
- holiday
- meteors
- shuttle_loan
- wizard
- food_and_drinks
- food
- kitchen_machinery
- recipes/tablecraft
- goals
- department_goals
- station_goals
- holiday
- hydroponics
- grown
- jobs/job_types
- library
- meteors
- mining
- equipment
- lavaland
- ruins
- mob
- dead
- new_player
- observer
- living
- brain
- carbon
- alien
- larva
- human
- species_types
- monkey
- silicon
- ai
- ai_network
- decentralized/systech
- pai
- robot
- simple_animal
- bot
- friendly
- drone
- hostile
- jungle
- megafauna
- mining_mobs
- slime
- modular_computers
- computers/item
- integrated_tablet
- pda
- phone
- file_system
- programs
- ai_network
- engineering
- hardware
- ninja
- suit
- paperwork
- power
- singularity
- supermatter
- projectiles
- boxes_magazines
- guns
- ballistic
- energy
- psionics/faculties
- reagents
- chemistry
- machinery
- reagents
- reagent_containers
- research
- designs
- nanites/nanite_programs
- techweb
- xenobiology
- crossbreeding
- ruins
- shuttle
- spells/spell_types
- surgery
- advanced
- bioware
- organs
- swarmers
- tgchat
- tgui_input
- tgui/states
- unit_tests
- uplink
- vehicles
- vending
- zombie
- config
- goon/icons/turfs
- html
- changelogs
- icons
- effects
- mob
- clothing
- hands
- suit
- inhands
- clothing
- misc
- weapons
- obj
- atmospherics/components
- clothing
- hats
- suits
- food
- guns
- ice_moon
- turf/walls
- sound
- ambience
- items
- strings/names
- tgui
- packages
- common
- tgui-dev-server
- tgui-panel/styles/components
- tgui/interfaces
- PreferencesMenu
- antagonists/antagonists
- preferences/features
- character_preferences
- game_preferences
- tools
- yogstation
- code
- controllers/subsystem
- datums
- components
- mapgen
- biomes
- martial
- ruins
- game
- gamemodes
- battle_royale
- changeling/powers
- clean_this_shit_up
- clown_ops
- darkspawn
- gangs
- infiltration
- traitor
- vampire
- objects
- effects
- decals
- items
- circuitboards
- devices
- PDA
- implants
- structures
- turfs/simulated
- modules
- admin
- verbs
- antagonists
- darkspawn
- darkspawn_abilities
- darkspawn_objects
- darkspawn_upgrades
- gang
- infiltrator
- vampire
- abilities
- client
- verbs
- clothing
- donor
- events
- guardian
- jobs/job_types
- jungleland
- megafauna
- liquids
- mentor
- mob/living
- carbon/human/species_types
- preternis
- silicon/robot
- simple_animal/hostile
- mining_mobs
- ninja/suit
- scripting
- Implementations
- Parser
- storytellers
- antag_rep
- converted_events
- solo
- ghosts
- event_groups
- storytellers
- uplink
- vending
- icons
- effects
- mob
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
1,069 files changed
+215581
-697852
lines changedLines changed: 398 additions & 401 deletions
Large diffs are not rendered by default.
Lines changed: 50 additions & 50 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
| |||
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
| 62 | + | |
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
| |||
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
85 | | - | |
86 | 85 | | |
87 | | - | |
| 86 | + | |
88 | 87 | | |
89 | 88 | | |
90 | 89 | | |
| |||
125 | 124 | | |
126 | 125 | | |
127 | 126 | | |
128 | | - | |
| 127 | + | |
129 | 128 | | |
130 | 129 | | |
131 | 130 | | |
| |||
232 | 231 | | |
233 | 232 | | |
234 | 233 | | |
235 | | - | |
| 234 | + | |
236 | 235 | | |
237 | 236 | | |
238 | 237 | | |
| |||
295 | 294 | | |
296 | 295 | | |
297 | 296 | | |
| 297 | + | |
298 | 298 | | |
299 | | - | |
| 299 | + | |
300 | 300 | | |
301 | 301 | | |
302 | 302 | | |
| |||
383 | 383 | | |
384 | 384 | | |
385 | 385 | | |
386 | | - | |
| 386 | + | |
387 | 387 | | |
388 | 388 | | |
389 | 389 | | |
| |||
415 | 415 | | |
416 | 416 | | |
417 | 417 | | |
418 | | - | |
| 418 | + | |
419 | 419 | | |
420 | 420 | | |
421 | 421 | | |
| |||
447 | 447 | | |
448 | 448 | | |
449 | 449 | | |
450 | | - | |
| 450 | + | |
451 | 451 | | |
452 | 452 | | |
453 | 453 | | |
| |||
511 | 511 | | |
512 | 512 | | |
513 | 513 | | |
514 | | - | |
| 514 | + | |
515 | 515 | | |
516 | 516 | | |
517 | 517 | | |
| |||
543 | 543 | | |
544 | 544 | | |
545 | 545 | | |
546 | | - | |
| 546 | + | |
547 | 547 | | |
548 | 548 | | |
549 | 549 | | |
| |||
575 | 575 | | |
576 | 576 | | |
577 | 577 | | |
578 | | - | |
| 578 | + | |
579 | 579 | | |
580 | 580 | | |
581 | 581 | | |
| |||
927 | 927 | | |
928 | 928 | | |
929 | 929 | | |
930 | | - | |
| 930 | + | |
931 | 931 | | |
932 | 932 | | |
933 | 933 | | |
934 | 934 | | |
935 | | - | |
| 935 | + | |
936 | 936 | | |
937 | 937 | | |
938 | 938 | | |
| |||
959 | 959 | | |
960 | 960 | | |
961 | 961 | | |
962 | | - | |
| 962 | + | |
963 | 963 | | |
964 | 964 | | |
965 | 965 | | |
966 | 966 | | |
967 | | - | |
| 967 | + | |
968 | 968 | | |
969 | 969 | | |
970 | 970 | | |
| |||
991 | 991 | | |
992 | 992 | | |
993 | 993 | | |
994 | | - | |
995 | | - | |
996 | | - | |
997 | | - | |
998 | | - | |
| 994 | + | |
| 995 | + | |
| 996 | + | |
| 997 | + | |
| 998 | + | |
999 | 999 | | |
1000 | 1000 | | |
1001 | 1001 | | |
| |||
1023 | 1023 | | |
1024 | 1024 | | |
1025 | 1025 | | |
1026 | | - | |
| 1026 | + | |
1027 | 1027 | | |
1028 | 1028 | | |
1029 | 1029 | | |
| |||
1055 | 1055 | | |
1056 | 1056 | | |
1057 | 1057 | | |
1058 | | - | |
| 1058 | + | |
1059 | 1059 | | |
1060 | 1060 | | |
1061 | 1061 | | |
| |||
1087 | 1087 | | |
1088 | 1088 | | |
1089 | 1089 | | |
1090 | | - | |
1091 | | - | |
| 1090 | + | |
| 1091 | + | |
1092 | 1092 | | |
1093 | 1093 | | |
1094 | 1094 | | |
| |||
1119 | 1119 | | |
1120 | 1120 | | |
1121 | 1121 | | |
1122 | | - | |
1123 | | - | |
| 1122 | + | |
| 1123 | + | |
1124 | 1124 | | |
1125 | 1125 | | |
1126 | 1126 | | |
| |||
1146 | 1146 | | |
1147 | 1147 | | |
1148 | 1148 | | |
1149 | | - | |
1150 | | - | |
1151 | | - | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
1152 | 1152 | | |
1153 | 1153 | | |
1154 | | - | |
| 1154 | + | |
1155 | 1155 | | |
1156 | 1156 | | |
1157 | 1157 | | |
| |||
1173 | 1173 | | |
1174 | 1174 | | |
1175 | 1175 | | |
1176 | | - | |
1177 | | - | |
| 1176 | + | |
| 1177 | + | |
1178 | 1178 | | |
| 1179 | + | |
| 1180 | + | |
| 1181 | + | |
1179 | 1182 | | |
1180 | | - | |
1181 | | - | |
1182 | | - | |
1183 | | - | |
1184 | | - | |
1185 | | - | |
1186 | | - | |
| 1183 | + | |
| 1184 | + | |
| 1185 | + | |
| 1186 | + | |
1187 | 1187 | | |
1188 | 1188 | | |
1189 | 1189 | | |
| |||
1206 | 1206 | | |
1207 | 1207 | | |
1208 | 1208 | | |
1209 | | - | |
1210 | | - | |
1211 | | - | |
1212 | | - | |
1213 | | - | |
| 1209 | + | |
| 1210 | + | |
| 1211 | + | |
| 1212 | + | |
| 1213 | + | |
| 1214 | + | |
| 1215 | + | |
1214 | 1216 | | |
1215 | 1217 | | |
1216 | | - | |
1217 | | - | |
1218 | | - | |
| 1218 | + | |
1219 | 1219 | | |
1220 | 1220 | | |
1221 | 1221 | | |
| |||
0 commit comments