mirror of
https://github.com/corvax-team/ss14-wl.git
synced 2026-02-14 19:29:57 +01:00
f76d1edf27
# Conflicts: # Content.Shared/Humanoid/NamingSystem.cs # Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml # Resources/ServerInfo/Guidebook/Service/Botany.xml # Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/berries.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/blood_tomato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/cabbage.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/chilly.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/corn.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/cotton.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/eggy.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/fly_amanita.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/galaxythistle.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/garlic.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/grape.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/lemoon.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lily.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/lime.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/orange.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/poppy.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/pyrotton.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/soybeans.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/steelcap.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/meta.json # Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/produce.png # Resources/Textures/Objects/Specific/Hydroponics/watermelon.rsi/slice.png # Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/metalfoam.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/modular.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/pyrogrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/shrapnelgrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/singularitygrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/syndgrenade.rsi/meta.json # Resources/Textures/Objects/Weapons/Grenades/whiteholegrenade.rsi/meta.json # Resources/Textures/Structures/Furniture/rollerbeds.rsi/meta.json # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json