5f10d21fa6
# 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 |
||
|---|---|---|
| .. | ||
| alerts.yml | ||
| categories.yml | ||
| magboots.yml | ||
| ninja.yml | ||
| revenant.yml | ||