Morb0 636bea81df Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # Content.Client/Entry/EntryPoint.cs # Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs # Content.Server/Zombies/ZombifyOnDeathSystem.cs # Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Datasets/Names/cargo_shuttle.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Command/captain.yml # Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml # Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/ServerInfo/Guidebook/Science/Robotics.xml # Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png # Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png # Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png # Resources/Textures/Structures/Furniture/chairs.rsi/meta.json		2023-06-19 21:06:28 +03:00
..
ArrivalsSystem.cs	Refactor stations to properly use entity prototypes. (stationsv3) (#16570)	2023-05-19 15:45:09 -05:00
DockingSystem.AutoDock.cs	Don't re-close closed doors (#15007)	2023-04-03 13:28:27 -05:00
DockingSystem.cs	Split Door Bolt functionality out of AirlockDoor (#16354)	2023-05-31 10:23:35 -04:00
DockingSystem.Shuttle.cs	Fix some docking configs (#17012)	2023-06-01 10:48:44 +10:00
EmergencyShuttleSystem.Console.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-05-25 00:18:11 +03:00
EmergencyShuttleSystem.cs	Cargo shuttle fixes (#17118)	2023-06-05 13:37:00 +10:00
RadarConsoleSystem.cs	"Fix" aghost mass scanner (#9438)	2022-07-06 14:33:54 +10:00
ShuttleConsoleSystem.cs	Zooming for everyone with keyboard keys (#16605)	2023-06-17 09:22:21 +10:00
ShuttleConsoleSystem.Drone.cs	Shuttle drone improvements (#16931)	2023-05-31 11:13:02 +10:00
ShuttleSystem.cs	Split Door Bolt functionality out of AirlockDoor (#16354)	2023-05-31 10:23:35 -04:00
ShuttleSystem.FasterThanLight.cs	Split Door Bolt functionality out of AirlockDoor (#16354)	2023-05-31 10:23:35 -04:00
ShuttleSystem.GridFill.cs	Shuttle drone improvements (#16931)	2023-05-31 11:13:02 +10:00
ShuttleSystem.IFF.cs	IFF console (#10504)	2022-08-11 11:58:44 -05:00
ShuttleSystem.Impact.cs	Remove obsolete Fixture.Body references (#16259)	2023-05-09 17:21:26 +10:00
SpaceGarbageSystem.cs	Remove obsolete Fixture.Body references (#16259)	2023-05-09 17:21:26 +10:00
ThrusterSystem.cs	Content fixes for timeoffsets (#15934)	2023-05-01 14:49:25 +10:00