Skip to content

Commit

Permalink
fix: yaml name inheritance (space-wizards#38)
Browse files Browse the repository at this point in the history
  • Loading branch information
SS14-RU authored Jan 6, 2022
1 parent 6b094aa commit ee1d0cc
Show file tree
Hide file tree
Showing 495 changed files with 3,268 additions and 526 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
ent-BaseHumanOrgan = { ent-BaseItem }
.desc = { ent-BaseItem.desc }
ent-OrganHumanBrain = brain
.desc = The source of incredible, unending intelligence. Honk.
ent-OrganHumanEyes = eyes
.desc = I see you!
ent-OrganHumanTongue = tongue
.desc = A fleshy muscle mostly used for lying.
ent-OrganHumanAppendix = appendix
.desc = { ent-BaseHumanOrgan.desc }
ent-OrganHumanEars = ears
.desc = There are three parts to the ear. Inner, middle and outer. Only one of these parts should normally be visible.
ent-OrganHumanLungs = lungs
Expand Down
12 changes: 12 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/body/parts/animal.ftl
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
ent-PartAnimal = animal body part
.desc = { ent-BaseItem.desc }
ent-HandsAnimal = animal hands
.desc = { ent-PartAnimal.desc }
ent-LegsAnimal = animal legs
.desc = { ent-PartAnimal.desc }
ent-FeetAnimal = animal feet
.desc = { ent-PartAnimal.desc }
ent-TorsoAnimal = animal torso
.desc = { ent-PartAnimal.desc }
ent-BaseAnimalOrgan = { ent-BaseItem }
.desc = { ent-BaseItem.desc }
ent-OrganAnimalLungs = lungs
.desc = { ent-BaseAnimalOrgan.desc }
ent-OrganAnimalStomach = stomach
.desc = { ent-BaseAnimalOrgan.desc }
ent-OrganAnimalLiver = liver
.desc = { ent-BaseAnimalOrgan.desc }
ent-OrganAnimalHeart = heart
.desc = { ent-BaseAnimalOrgan.desc }
ent-OrganAnimalKidneys = kidneys
.desc = { ent-BaseAnimalOrgan.desc }
11 changes: 11 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/body/parts/human.ftl
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
ent-PartHuman = human body part
.desc = { ent-BaseItem.desc }
ent-TorsoHuman = human torso
.desc = { ent-PartHuman.desc }
ent-HeadHuman = human head
.desc = { ent-PartHuman.desc }
ent-LeftArmHuman = left human arm
.desc = { ent-PartHuman.desc }
ent-RightArmHuman = right human arm
.desc = { ent-PartHuman.desc }
ent-LeftHandHuman = left human hand
.desc = { ent-PartHuman.desc }
ent-RightHandHuman = right human hand
.desc = { ent-PartHuman.desc }
ent-LeftLegHuman = left human leg
.desc = { ent-PartHuman.desc }
ent-RightLegHuman = right human leg
.desc = { ent-PartHuman.desc }
ent-LeftFootHuman = left human foot
.desc = { ent-PartHuman.desc }
ent-RightFootHuman = right human foot
.desc = { ent-PartHuman.desc }
11 changes: 11 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/body/parts/slime.ftl
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
ent-PartSlime = slime body part
.desc = { ent-BaseItem.desc }
ent-TorsoSlime = slime torso
.desc = { ent-PartSlime.desc }
ent-HeadSlime = slime head
.desc = { ent-PartSlime.desc }
ent-LeftArmSlime = left slime arm
.desc = { ent-PartSlime.desc }
ent-RightArmSlime = right slime arm
.desc = { ent-PartSlime.desc }
ent-LeftHandSlime = left slime hand
.desc = { ent-PartSlime.desc }
ent-RightHandSlime = right slime hand
.desc = { ent-PartSlime.desc }
ent-LeftLegSlime = left slime leg
.desc = { ent-PartSlime.desc }
ent-RightLegSlime = right slime leg
.desc = { ent-PartSlime.desc }
ent-LeftFootSlime = left slime foot
.desc = { ent-PartSlime.desc }
ent-RightFootSlime = right slime foot
.desc = { ent-PartSlime.desc }
11 changes: 11 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/body/parts/vox.ftl
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
ent-PartVox = vox body part
.desc = { ent-BaseItem.desc }
ent-TorsoVox = vox torso
.desc = { ent-PartVox.desc }
ent-HeadVox = vox head
.desc = { ent-PartVox.desc }
ent-LeftArmVox = left vox arm
.desc = { ent-PartVox.desc }
ent-RightArmVox = right vox arm
.desc = { ent-PartVox.desc }
ent-LeftHandVox = left vox hand
.desc = { ent-PartVox.desc }
ent-RightHandVox = right vox hand
.desc = { ent-PartVox.desc }
ent-LeftLegVox = left vox leg
.desc = { ent-PartVox.desc }
ent-RightLegVox = right vox leg
.desc = { ent-PartVox.desc }
ent-LeftFootVox = left vox foot
.desc = { ent-PartVox.desc }
ent-RightFootVox = right vox foot
.desc = { ent-PartVox.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
ent-ClothingBackpackFilled = { ent-ClothingBackpack }
.desc = { ent-ClothingBackpack.desc }
ent-ClothingBackpackClownFilled = { ent-ClothingBackpackClown }
.desc = { ent-ClothingBackpackClown.desc }
ent-ClothingBackpackSecurityFilled = { ent-ClothingBackpackSecurity }
.desc = { ent-ClothingBackpackSecurity.desc }
ent-ClothingBackpackMedicalFilled = { ent-ClothingBackpackMedical }
.desc = { ent-ClothingBackpackMedical.desc }
ent-ClothingBackpackCaptainFilled = { ent-ClothingBackpackCaptain }
.desc = { ent-ClothingBackpackCaptain.desc }
ent-ClothingBackpackEngineeringFilled = { ent-ClothingBackpackEngineering }
.desc = { ent-ClothingBackpackEngineering.desc }
ent-ClothingBackpackScienceFilled = { ent-ClothingBackpackScience }
.desc = { ent-ClothingBackpackScience.desc }
ent-ClothingBackpackHydroponicsFilled = { ent-ClothingBackpackHydroponics }
.desc = { ent-ClothingBackpackHydroponics.desc }
ent-ClothingBackpackMimeFilled = { ent-ClothingBackpackMime }
.desc = { ent-ClothingBackpackMime.desc }
ent-ClothingBackpackChemistryFilled = { ent-ClothingBackpackChemistry }
.desc = { ent-ClothingBackpackChemistry.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ent-ClothingBackpackDuffelFilled = { ent-ClothingBackpackDuffel }
.desc = { ent-ClothingBackpackDuffel.desc }
ent-ClothingBackpackDuffelClownFilled = { ent-ClothingBackpackDuffelClown }
.desc = { ent-ClothingBackpackDuffelClown.desc }
ent-ClothingBackpackDuffelSecurityFilled = { ent-ClothingBackpackDuffelSecurity }
.desc = { ent-ClothingBackpackDuffelSecurity.desc }
ent-ClothingBackpackDuffelMedicalFilled = { ent-ClothingBackpackDuffelMedical }
.desc = { ent-ClothingBackpackDuffelMedical.desc }
ent-ClothingBackpackDuffelCaptainFilled = { ent-ClothingBackpackDuffelCaptain }
.desc = { ent-ClothingBackpackDuffelCaptain.desc }
ent-ClothingBackpackDuffelEngineeringFilled = { ent-ClothingBackpackDuffelEngineering }
.desc = { ent-ClothingBackpackDuffelEngineering.desc }
ent-ClothingBackpackDuffelScienceFilled = { ent-ClothingBackpackDuffelScience }
.desc = { ent-ClothingBackpackDuffelScience.desc }
ent-ClothingBackpackDuffelMimeFilled = { ent-ClothingBackpackDuffelMime }
.desc = { ent-ClothingBackpackDuffelMime.desc }
ent-ClothingBackpackDuffelChemistryFilled = { ent-ClothingBackpackDuffelChemistry }
.desc = { ent-ClothingBackpackDuffelChemistry.desc }
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ent-ClothingBackpackSatchelFilled = { ent-ClothingBackpackSatchel }
.desc = { ent-ClothingBackpackSatchel.desc }
ent-ClothingBackpackSatchelSecurityFilled = { ent-ClothingBackpackSatchelSecurity }
.desc = { ent-ClothingBackpackSatchelSecurity.desc }
ent-ClothingBackpackSatchelMedicalFilled = { ent-ClothingBackpackSatchelMedical }
.desc = { ent-ClothingBackpackSatchelMedical.desc }
ent-ClothingBackpackSatchelCaptainFilled = { ent-ClothingBackpackSatchelCaptain }
.desc = { ent-ClothingBackpackSatchelCaptain.desc }
ent-ClothingBackpackSatchelEngineeringFilled = { ent-ClothingBackpackSatchelEngineering }
.desc = { ent-ClothingBackpackSatchelEngineering.desc }
ent-ClothingBackpackSatchelScienceFilled = { ent-ClothingBackpackSatchelScience }
.desc = { ent-ClothingBackpackSatchelScience.desc }
ent-ClothingBackpackSatchelHydroponicsFilled = { ent-ClothingBackpackSatchelHydroponics }
.desc = { ent-ClothingBackpackSatchelHydroponics.desc }
ent-ClothingBackpackSatchelChemistryFilled = { ent-ClothingBackpackSatchelChemistry }
.desc = { ent-ClothingBackpackSatchelChemistry.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ ent-CrateHydroponicsSeedsExotic = exotic seeds crate
ent-CrateHydroponicsTools = hydroponics equipment crate
.desc = Supplies for growing a great garden! Contains some spray bottles of plant chemicals, a hatchet, a mini-hoe, scythe, as well as a pair of leather gloves and a botanist's apron.
ent-CrateHydroponicsSeeds = seeds crate
.desc = Big things have small beginnings. Contains nine different seeds.
.desc = Big things have small beginnings. Contains ten different seeds.
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
ent-CrateEmergencyExplosive = bomb suit crate
.desc = { ent-CrateSecgear.desc }
ent-CrateEmergencyFire = firefighting crate
.desc = { ent-CrateGenericSteel.desc }
ent-CrateEmergencyInternals = internals crate
.desc = { ent-CrateInternals.desc }
ent-CrateEmergencyRadiation = radiation protection crate
.desc = { ent-CrateRadiation.desc }
ent-CrateEmergencyInflatablewall = inflatable wall crate
.desc = { ent-CratePlastic.desc }
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
ent-CrateEngineeringGear = engineering gear crate
.desc = { ent-CrateEngineering.desc }
ent-CrateEngineeringToolbox = toolbox crate
.desc = { ent-CrateEngineering.desc }
ent-CrateEngineeringCableLV = LV cable crate
.desc = { ent-CrateElectrical.desc }
ent-CrateEngineeringCableMV = MV cable crate
.desc = { ent-CrateElectrical.desc }
ent-CrateEngineeringCableHV = HV cable crate
.desc = { ent-CrateElectrical.desc }
ent-CrateEngineeringCableBulk = bulk cable crate
.desc = { ent-CrateElectrical.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ ent-CrateEngineeringSingularityGenerator = singularity generator crate
ent-CrateEngineeringParticleAccelerator = PA crate
.desc = Complex to setup, but rewarding as fuck.
ent-CrateEngineeringGenerator = generator crate
.desc = { ent-CrateEngineering.desc }
ent-CrateEngineeringSolar = solar assembly crate
.desc = { ent-CrateEngineering.desc }
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
ent-CrateFunPlushie = plushie crate
.desc = { ent-CrateGenericSteel.desc }
ent-CrateFunInstruments = big band instrument collection
.desc = Get your sad station movin' and groovin' with this fine collection! Contains thirteen different instruments.
ent-CrateFunArtSupplies = art supplies
.desc = { ent-CrateGenericSteel.desc }
ent-CrateFunBoardGames = board game crate
.desc = { ent-CrateGenericSteel.desc }
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
ent-CrateMaterialGlass = glass sheet crate
.desc = { ent-CrateGenericSteel.desc }
ent-CrateMaterialSteel = steel sheet crate
.desc = { ent-CrateGenericSteel.desc }
ent-CrateMaterialPlastic = plastic sheet crate
.desc = { ent-CrateGenericSteel.desc }
ent-CrateMaterialWood = wood crate
.desc = { ent-CrateGenericSteel.desc }
ent-CrateMaterialFuelTank = fueltank crate
.desc = { ent-CrateGenericSteel.desc }
ent-CrateMaterialWaterTank = watertank crate
.desc = { ent-CrateGenericSteel.desc }
ent-CrateMaterialPlasteel = plasteel crate
.desc = { ent-CrateGenericSteel.desc }
ent-CrateMaterialPlasma = solid plasma crate
.desc = { ent-CrateGenericSteel.desc }
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
ent-CrateMedicalDefib = defibrillator crate
.desc = { ent-CrateMedical.desc }
ent-CrateMedicalSupplies = medical supplies crate
.desc = { ent-CrateMedical.desc }
ent-CrateChemistrySupplies = chemistry supplies crate
.desc = { ent-CrateMedical.desc }
ent-CrateMedicalSurgery = surgical supplies crate
.desc = { ent-CrateSurgery.desc }
ent-CrateMedicalScrubs = medical scrubs crate
.desc = { ent-CrateMedical.desc }
Original file line number Diff line number Diff line change
@@ -1,14 +1,28 @@
ent-CrateNPCBee = crate of bees
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCButterflies = crate of butterflies
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCCat = cat crate
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCChicken = chicken crate
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCDuck = duck crate
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCCorgi = corgi crate
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCCow = cow crate
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCGoat = goat crate
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCGoose = goose crate
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCGorilla = gorilla crate
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCMonkeyCube = monkey cube crate
.desc = { ent-CrateGenericSteel.desc }
ent-CrateNPCParrot = parrot crate
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCPenguin = penguin crate
.desc = { ent-CrateLivestock.desc }
ent-CrateNPCSnake = snake crate
.desc = { ent-CrateLivestock.desc }
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
ent-CrateSalvageEquipment = salvage equipment crate
.desc = For the daring.
.suffix = Filled
ent-CrateSalvageAssortedGoodies = { "" }
ent-CrateSalvageAssortedGoodies = { ent-CrateGenericSteel }
.suffix = Filled, Salvage Random
.desc = { ent-CrateGenericSteel.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ ent-CrateSecurityArmor = armor crate
ent-CrateSecurityHelmet = helmet crate
.desc = Contains three standard-issue brain buckets. Requires Security access to open.
ent-CrateSecurityNonlethal = nonlethals crate
.desc = { ent-CrateSecgear.desc }
ent-CrateSecurityLaser = lasers crate
.desc = { ent-CrateSecgear.desc }
ent-CrateSecurityRiot = swat crate
.desc = { ent-CrateSecgear.desc }
ent-CrateSecuritySupplies = security supplies crate
.desc = { ent-CrateSecgear.desc }
ent-CrateRestraints = restraints crate
.desc = { ent-CrateSecgear.desc }
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
ent-MedkitFilled = { "" }
ent-MedkitFilled = { ent-Medkit }
.suffix = Filled
ent-MedkitBurnFilled = { "" }
.desc = { ent-Medkit.desc }
ent-MedkitBurnFilled = { ent-MedkitBurn }
.suffix = Filled
ent-MedkitBruteFilled = { "" }
.desc = { ent-MedkitBurn.desc }
ent-MedkitBruteFilled = { ent-MedkitBrute }
.suffix = Filled
.desc = { ent-MedkitBrute.desc }
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
ent-ClothingBeltUtilityFilled = { "" }
ent-ClothingBeltUtilityFilled = { ent-ClothingBeltUtility }
.suffix = Filled
ent-ClothingBeltChiefEngineerFilled = { "" }
.desc = { ent-ClothingBeltUtility.desc }
ent-ClothingBeltChiefEngineerFilled = { ent-ClothingBeltChiefEngineer }
.suffix = Filled
ent-ClothingBeltSecurityFilled = { "" }
.desc = { ent-ClothingBeltChiefEngineer.desc }
ent-ClothingBeltSecurityFilled = { ent-ClothingBeltSecurity }
.suffix = Filled
ent-ClothingBeltJanitorFilled = { "" }
.desc = { ent-ClothingBeltSecurity.desc }
ent-ClothingBeltJanitorFilled = { ent-ClothingBeltJanitor }
.suffix = Filled
ent-ClothingBeltMedicalFilled = { "" }
.desc = { ent-ClothingBeltJanitor.desc }
ent-ClothingBeltMedicalFilled = { ent-ClothingBeltMedical }
.suffix = Filled
.desc = { ent-ClothingBeltMedical.desc }
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
ent-OxygenTankFilled = { "" }
ent-OxygenTankFilled = { ent-OxygenTank }
.suffix = Filled
ent-YellowOxygenTankFilled = { "" }
.desc = { ent-OxygenTank.desc }
ent-YellowOxygenTankFilled = { ent-YellowOxygenTank }
.suffix = Filled
ent-RedOxygenTankFilled = { "" }
.desc = { ent-YellowOxygenTank.desc }
ent-RedOxygenTankFilled = { ent-RedOxygenTank }
.suffix = Filled
ent-EmergencyOxygenTankFilled = { "" }
.desc = { ent-RedOxygenTank.desc }
ent-EmergencyOxygenTankFilled = { ent-EmergencyOxygenTank }
.suffix = Filled
ent-ExtendedEmergencyOxygenTankFilled = { "" }
.desc = { ent-EmergencyOxygenTank.desc }
ent-ExtendedEmergencyOxygenTankFilled = { ent-ExtendedEmergencyOxygenTank }
.suffix = Filled
ent-DoubleEmergencyOxygenTankFilled = { "" }
.desc = { ent-ExtendedEmergencyOxygenTank.desc }
ent-DoubleEmergencyOxygenTankFilled = { ent-DoubleEmergencyOxygenTank }
.suffix = Filled
ent-AirTankFilled = { "" }
.desc = { ent-DoubleEmergencyOxygenTank.desc }
ent-AirTankFilled = { ent-AirTank }
.suffix = Filled
.desc = { ent-AirTank.desc }
ent-PlasmaTankFilled = plasma tank
.desc = Contains dangerous plasma. Do not inhale. Warning: extremely flammable.
.suffix = Filled
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
ent-ToolboxEmergencyFilled = emergency toolbox
.suffix = Filled
.desc = { ent-ToolboxEmergency.desc }
ent-ToolboxElectricalFilled = electrical toolbox
.suffix = Filled
.desc = { ent-ToolboxElectrical.desc }
ent-ToolboxMechanicalFilled = mechanical toolbox
.suffix = Filled
.desc = { ent-ToolboxMechanical.desc }
ent-ToolboxSyndicateFilled = suspicious toolbox
.suffix = Filled
.desc = { ent-ToolboxSyndicate.desc }
ent-ToolboxGoldFilled = golden toolbox
.suffix = Filled
.desc = { ent-ToolboxGolden.desc }
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
ent-ClosetL3Filled = { "" }
ent-ClosetL3Filled = { ent-ClosetL3 }
.suffix = Filled, Generic
ent-ClosetL3VirologyFilled = { "" }
.desc = { ent-ClosetL3.desc }
ent-ClosetL3VirologyFilled = { ent-ClosetL3Virology }
.suffix = Filled, Virology
ent-ClosetL3SecurityFilled = { "" }
.desc = { ent-ClosetL3Virology.desc }
ent-ClosetL3SecurityFilled = { ent-ClosetL3Security }
.suffix = Filled, Security
ent-ClosetL3JanitorFilled = { "" }
.desc = { ent-ClosetL3Security.desc }
ent-ClosetL3JanitorFilled = { ent-ClosetL3Janitor }
.suffix = Filled, Janitor
ent-ClosetL3ScienceFilled = { "" }
.desc = { ent-ClosetL3Janitor.desc }
ent-ClosetL3ScienceFilled = { ent-ClosetL3Virology }
.suffix = Filled, Science
.desc = { ent-ClosetL3Virology.desc }
Loading

0 comments on commit ee1d0cc

Please sign in to comment.