mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-02-15 05:10:54 +01:00
d9bfc5cdcb
# Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Content.Server/GameTicking/GameTicker.Spawning.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Maps/cog.yml # Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml # Resources/Prototypes/Roles/Jobs/departments.yml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png # Resources/Textures/Structures/Walls/solid.rsi/meta.json # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png # Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png # Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png # Resources/Textures/Structures/Walls/solid.rsi/solid0.png # Resources/Textures/Structures/Walls/solid.rsi/solid1.png # Resources/Textures/Structures/Walls/solid.rsi/solid2.png # Resources/Textures/Structures/Walls/solid.rsi/solid3.png # Resources/Textures/Structures/Walls/solid.rsi/solid4.png # Resources/Textures/Structures/Walls/solid.rsi/solid5.png # Resources/Textures/Structures/Walls/solid.rsi/solid6.png # Resources/Textures/Structures/Walls/solid.rsi/solid7.png