Morb0 1e0bee212f Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Maps/barratry.yml # Resources/ServerInfo/Gameplay.txt # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml # Resources/Textures/Clothing/Mask/bat.rsi/meta.json # Resources/Textures/Clothing/Mask/bear.rsi/meta.json # Resources/Textures/Clothing/Mask/bee.rsi/meta.json # Resources/Textures/Clothing/Mask/breath.rsi/meta.json # Resources/Textures/Clothing/Mask/clown.rsi/meta.json # Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json # Resources/Textures/Clothing/Mask/ert.rsi/meta.json # Resources/Textures/Clothing/Mask/fox.rsi/meta.json # Resources/Textures/Clothing/Mask/gas.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json # Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json # Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json # Resources/Textures/Clothing/Mask/jackal.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/medical.rsi/meta.json # Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/merc.rsi/meta.json # Resources/Textures/Clothing/Mask/mime.rsi/meta.json # Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json # Resources/Textures/Clothing/Mask/rat.rsi/meta.json # Resources/Textures/Clothing/Mask/raven.rsi/meta.json # Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json # Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json # Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json # Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Mask/sterile.rsi/meta.json # Resources/Textures/Clothing/Mask/swat.rsi/meta.json		2024-01-10 00:23:02 +03:00
..
Ambience	Sound Effect For Emagged Borgs (#21451)	2023-11-20 10:36:25 -05:00
Animals	Bread dog (#22548)	2023-12-16 01:30:20 -07:00
Announcements	Fix yml source	2023-11-14 19:29:26 +03:00
Corvax	Title2 lobby music (#1160)	2023-07-19 13:47:04 +03:00
Effects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-05 00:55:19 +03:00
Items	Added a regular and an engraved zippo (flippo) lighter (#23020)	2023-12-27 15:47:35 -07:00
Lobby	Add missing song names (#18432)	2023-08-02 19:36:59 +10:00
Machines	Ports the /tg/ airlock deny sounds (#22954)	2024-01-03 17:22:37 -05: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	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
StationEvents	Use new sound collection for nuke music	2023-04-29 15:02:06 +03:00
UserInterface	Add UI click sounds (#22410)	2023-12-29 15:43:36 +11:00
Voice	More arachnid emote noises (#23548)	2024-01-05 20:32:11 -05:00
Weapons	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00