mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-02-15 03:32:07 +01:00
5828dca50b
# Conflicts: # Content.Server/Nuke/NukeSystem.cs # Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml # Resources/Prototypes/Entities/Mobs/Player/human.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Roles/Jobs/Civilian/mime.yml # Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml # Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Medical/chemist.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml # Resources/Prototypes/Roles/Jobs/Science/scientist.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/secret_weights.yml # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cap.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-ce.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cent.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-chaplain.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-clown.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-cmo.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-deny.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hop.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-hos.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-iaa.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-mime.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-qm.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-rd.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-syndicate.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/stamp-warden.png