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
..
Dungeon	SS14-26480 Roll Traversal Distorter into regular Artifact Analyzers (#26545)	2024-04-21 12:09:26 -04:00
Misc	Merge remote-tracking branch 'upstream/master' into master-syndicate	2024-03-27 01:12:55 +03:00
Nonstations	Shuttle console + FTL rework (#24430)	2024-03-03 18:39:19 +11:00
Ruins	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
Salvage	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
Shuttles	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19:50 +03:00
Test	You can bless more containers with a bible (#26526)	2024-04-20 16:16:55 +10:00
atlas.yml	You can bless more containers with a bible (#26526)	2024-04-20 16:16:55 +10:00
bagel.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
box.yml	box update (#27069)	2024-04-17 16:01:24 -06:00
centcomm.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
cluster.yml	You can bless more containers with a bible (#26526)	2024-04-20 16:16:55 +10:00
core.yml	Update Core (#27195)	2024-04-20 23:58:23 -06:00
corvax_astra.yml	Remove RecentlyDocked from maps	2024-03-08 16:38:39 +03:00
corvax_avrit.yml	[FixMap] Avrite (#2016)	2024-04-04 10:10:16 +03:00
corvax_centcomm.yml	Fix centcomm (#2032)	2024-04-11 12:37:16 +03:00
corvax_delta.yml	[Maps] Delta update (#2013)	2024-04-04 10:09:31 +03:00
corvax_gelta.yml	Update Gelta Station (#2015)	2024-04-04 10:10:08 +03:00
corvax_ishimura.yml	[Maps] Ishimura update (#1918)	2024-03-03 00:50:35 +03:00
corvax_maus.yml	Update Maus (#2041)	2024-04-17 08:27:48 +03:00
corvax_outpost.yml	Outpost WorldsWide Update Steal (#2000)	2024-03-28 17:09:00 +03:00
corvax_paper.yml	Update Paper Station (#2038)	2024-04-17 10:25:40 +03:00
corvax_silly.yml	Silly island next gen 4k update №2 (#1998)	2024-04-04 10:08:47 +03:00
corvax_split.yml	[Maps] Pilot on Split stations (#2026)	2024-04-08 14:39:09 +03:00
europa.yml	Component of planet initialization on the map (#26510)	2024-04-18 21:27:54 +10:00
fland.yml	You can bless more containers with a bible (#26526)	2024-04-20 16:16:55 +10:00
marathon.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
meta.yml	No More Bartender Incendiaries on Meta (#27142)	2024-04-20 11:06:21 +10:00
oasis.yml	Add map Oasis (#25736)	2024-04-20 23:59:12 -06:00
omega.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
origin.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
packed.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00
reach.yml	Fix dirt decals in reach not being cleanable (#26636)	2024-04-01 13:14:28 +11:00
saltern.yml	saltern bar stool (#27263)	2024-04-24 13:40:54 -06:00
train.yml	Remove CRLF, enforce with workflow (#26401)	2024-03-24 22:06:17 +01:00