Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/GameRules/midround.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml # Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png		2024-04-26 11:19:50 +03:00
..
ArrivalsSystem.cs	Make station components use StationPostInitEvent (#27126)	2024-04-19 15:26:56 +10:00
DockingSystem.cs	Fix drone console docking (#25822)	2024-03-04 16:46:45 +11:00
DockingSystem.Shuttle.cs	Fix arrivals not docking on spinning stations (#26033)	2024-03-12 23:57:35 +11:00
EmergencyShuttleSystem.Console.cs	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
EmergencyShuttleSystem.cs	Possible fix for evac shuttle test failures (#27175)	2024-04-21 07:55:43 +10:00
RadarConsoleSystem.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleConsoleSystem.cs	Refactor FTL time tracking code to fix a UI bug (#26538)	2024-03-30 12:40:55 +11:00
ShuttleConsoleSystem.Drone.cs	Fix drone console docking (#25822)	2024-03-04 16:46:45 +11:00
ShuttleConsoleSystem.FTL.cs	Coordinates Disks & Shuttle FTL Travel (#23240)	2024-04-01 15:50:00 +11:00
ShuttleSystem.cs	Admin log shuttle gibbing + Make shuttle gibbing and immovable rods drop organs and correctly put player in ghost (#27114)	2024-04-20 16:27:38 +10:00
ShuttleSystem.FasterThanLight.cs	Admin log shuttle gibbing + Make shuttle gibbing and immovable rods drop organs and correctly put player in ghost (#27114)	2024-04-20 16:27:38 +10:00
ShuttleSystem.GridFill.cs	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
ShuttleSystem.IFF.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
ShuttleSystem.Impact.cs	Revert "Fix chat bubbles (#25643)" (#25645)	2024-02-28 00:51:20 +11:00
SpaceGarbageSystem.cs	Salvage magnet revamp (#23119)	2024-01-04 14:25:32 +11:00
ThrusterSystem.cs	Fix turned off thrusters consume power (#26690)	2024-04-04 17:28:33 +11:00