VigersRay 5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Administration/Commands/PlayTimeCommands.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Server/Station/Systems/StationSpawningSystem.cs # Content.Server/StationEvents/Events/BreakerFlipRule.cs # Content.Shared/Roles/JobPrototype.cs # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml # Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Roles/Antags/traitor.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Roles/Jobs/Civilian/clown.yml # Resources/Prototypes/Roles/Jobs/Civilian/musician.yml # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml # Resources/Prototypes/Roles/Jobs/Medical/chemist.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml		2024-06-04 09:41:27 +03:00
..
auto_emotes.yml	Cluwne smite (#13367)	2023-03-06 11:09:24 -08:00
disease_emotes.yml	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
speech_emote_sounds.yml	"Death gasp" for a moth (#28409)	2024-06-03 14:48:01 -04:00
speech_emotes.yml	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-04 09:41:27 +03:00
speech_sounds.yml	New borg sounds (#27205)	2024-04-28 21:38:31 -07:00
speech_verbs.yml	Fix master (#26501)	2024-03-28 04:12:36 -07:00