mirror of
https://github.com/corvax-team/ss14-wl.git
synced 2026-02-14 19:29:57 +01:00
a5980baa7d
# Conflicts: # Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml # Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml # Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/magboots-science.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/speedboots.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/chemistry2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/court.png # Resources/Textures/Structures/Wallmounts/signs.rsi/deathsposal.png # Resources/Textures/Structures/Wallmounts/signs.rsi/doors.png # Resources/Textures/Structures/Wallmounts/signs.rsi/examroom.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/hydro3.png # Resources/Textures/Structures/Wallmounts/signs.rsi/janitor.png # Resources/Textures/Structures/Wallmounts/signs.rsi/law.png # Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json # Resources/Textures/Structures/Wallmounts/signs.rsi/psychology.png # Resources/Textures/Structures/Wallmounts/signs.rsi/science1.png # Resources/Textures/Structures/Wallmounts/signs.rsi/science2.png # Resources/Textures/Structures/Wallmounts/signs.rsi/security.png # Resources/Textures/Structures/Wallmounts/signs.rsi/space.png # Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio.png # Resources/Textures/Structures/Wallmounts/signs.rsi/xenobio2.png # Resources/migration.yml