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
..
Antagonist	Guidebook update for the Space Ninja (#26650)	2024-04-20 16:10:22 +10:00
Cargo	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-12 12:53:34 +03:00
ChemicalTabs	Changes in chemicals page in guidebook (#25831)	2024-04-01 07:20:37 +00:00
Controls	Guidebook translate (Controls, radio, adv brute) (#1986)	2024-03-27 00:32:40 +03:00
Engineering	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
Medical	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-18 12:04:58 +03:00
Mobs	General slime improvements (#23425)	2024-04-22 03:03:03 -07:00
Science	SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)	2024-04-21 12:09:26 -04:00
Security	Guidebook update for the Space Ninja (#26650)	2024-04-20 16:10:22 +10:00
Service	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-03 03:38:29 +03:00
Chemicals.xml	Guidebook locale (#1393)	2023-09-07 16:07:33 +03:00
Glossary.xml	Glossary (#22840)	2023-12-22 00:25:56 -07:00
Jobs.xml	Fix typos calling salvage specialists a 'salvage technician' (#25657)	2024-02-27 21:59:21 +01:00
SpaceStation14.xml	Merge remote-tracking branch 'wizards/master' into upstream-sync	2023-06-26 17:34:49 +03:00
Survival.xml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-12 12:53:34 +03:00
Writing.xml	Translate Upstream #1362 (#1366)	2023-08-27 04:45:39 +03:00