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
..
AccessConfigurator.xml	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
AirlockSecurity.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
AME.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
Atmospherics.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
Construction.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
Engineering.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
Fires.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
NetworkConfigurator.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
Networking.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
PortableGenerator.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
Power.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
RTG.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
Shuttlecraft.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
Singularity.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00
TEG.xml	Engineering guidebook update (#26851)	2024-04-22 01:58:54 -07:00