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
..
Ambience	New salvage expedition ambience. (#25983)	2024-03-11 17:56:01 +11:00
Animals	Diona Nymphs & Splitting (#24630)	2024-02-16 18:54:44 -08:00
Announcements	Fix yml source	2023-11-14 19:29:26 +03:00
Corvax	New lobby music (#2030)	2024-04-11 12:38:03 +03:00
Effects	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-04-17 11:57:44 +03:00
Items	Add ability to shake fizzy drinks so they spray in peoples' faces (#25574)	2024-04-18 11:49:58 +10:00
Jukebox	Add new jukebox song. (#27074)	2024-04-19 19:41:32 -04:00
Lobby	New lobby music (#2030)	2024-04-11 12:38:03 +03:00
Machines	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-02 11:32:48 +03:00
Magic	Adds Hellspawn (Nar'Sie demon mob) (#20291)	2024-01-04 05:53:15 -07:00
Mecha	Exosuit: Ripley (#12668)	2022-12-10 11:05:39 -06:00
MidiCustom	Cleanup pAI synth instrument in soundfont (#10836)	2022-08-25 20:16:01 -07:00
Misc	Add Ratvar (#24958)	2024-02-23 04:42:00 +03:00
StationEvents	New Nukie Song (#25765)	2024-03-09 12:44:54 +11:00
UserInterface	Add UI click sounds (#22410)	2023-12-29 15:43:36 +11:00
Voice	Reduce clown snore volume (#27012)	2024-04-16 20:48:38 +02:00
Weapons	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-02 11:32:48 +03:00