mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-02-15 03:50:54 +01:00
eb75c67cf8
# Conflicts: # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Clothing/Neck/mantles.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml # Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml # Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml # Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml # Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png # Resources/Textures/Mobs/Animals/regalrat.rsi/regalrat.png # Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png # Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png