From: Hitlinemoss <209321380+Hitlinemoss@users.noreply.github.com> Date: Thu, 4 Dec 2025 07:55:35 +0000 (-0500) Subject: Cleanup of prototypes in Resources/Prototypes/Catalog/Fills/Crates/ + fixed light... X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0e0aec29636330bb5ffeeef4fddf73b7c7a50e42;p=space-station-14.git Cleanup of prototypes in Resources/Prototypes/Catalog/Fills/Crates/ + fixed light crate descriptions (#41697) * Fix prototype string order * Fix replacement lights crate description * Clearer light descriptions in general * Suffix fix * Updated internals crate descriptions --- diff --git a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml index 352b33a3d0..8b397bd31c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml @@ -1,8 +1,8 @@ - type: entity + parent: CratePirate id: CratePirateChestCaptain name: captains pirate chest suffix: Filled - parent: CratePirate components: - type: EntityTableContainerFill containers: @@ -13,10 +13,10 @@ - id: MicroBombImplanter - type: entity + parent: CratePirate id: CratePirateChest name: crews pirate chest suffix: Filled - parent: CratePirate components: - type: EntityTableContainerFill containers: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml index 838158085c..a44c48d419 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateArmorySMG parent: [ CrateWeaponSecure, BaseSecurityContraband ] + id: CrateArmorySMG name: SMG crate description: Contains two SMGs with four mags. Requires Armory access to open. components: @@ -14,8 +14,8 @@ amount: 4 - type: entity - id: CrateArmoryShotgun parent: [ CrateWeaponSecure, BaseSecurityContraband ] + id: CrateArmoryShotgun name: shotgun crate description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. components: @@ -29,8 +29,8 @@ amount: 4 - type: entity - id: CrateTrackingImplants parent: [ CrateWeaponSecure, BaseSecurityContraband ] + id: CrateTrackingImplants name: tracking implants description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of. components: @@ -53,8 +53,8 @@ amount: 3 - type: entity - id: CrateArmoryLaser parent: [ CrateWeaponSecure, BaseSecurityContraband ] + id: CrateArmoryLaser name: lasers crate description: Contains three standard-issue laser rifles. Requires Armory access to open. components: @@ -65,8 +65,8 @@ amount: 3 - type: entity - id: CrateArmoryPistols parent: [ CrateWeaponSecure, BaseSecurityContraband ] + id: CrateArmoryPistols name: pistols crate description: Contains two standard NT pistols with four mags. Requires Armory access to open. components: @@ -80,8 +80,8 @@ amount: 4 - type: entity - id: CrateSecurityRiot parent: [ CrateWeaponSecure, BaseSecurityContraband ] + id: CrateSecurityRiot name: swat crate description: Contains two sets of riot armor, helmets, shields, and enforcers loaded with beanbags. Extra ammo is included. Requires Armory access to open. components: @@ -101,8 +101,8 @@ amount: 2 - type: entity - id: CrateArmoryRifle parent: [ CrateWeaponSecure, BaseSecurityContraband ] + id: CrateArmoryRifle name: rifle crate description: Contains two high-powered assault rifles with four mags. Requires Armory access to open. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 7f95f57d73..99702bc018 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateHydroponicsSeedsExotic parent: CrateHydroSecure + id: CrateHydroponicsSeedsExotic name: exotic seeds crate description: Any entrepreneuring botanist's dream. Contains many different exotic seeds. Requires Hydroponics access to open. components: @@ -24,8 +24,8 @@ amount: 2 - type: entity - id: CrateHydroponicsSeedsMedicinal parent: CrateHydroSecure + id: CrateHydroponicsSeedsMedicinal name: medicinal seeds crate description: The wannabe chemist's dream. The power of medicine is at your fingertips! Requires Hydroponics access to open. components: @@ -45,8 +45,8 @@ amount: 3 - type: entity - id: CrateHydroponicsTools parent: CrateHydroponics + id: CrateHydroponicsTools name: hydroponics equipment crate description: 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. components: @@ -68,8 +68,8 @@ amount: 2 - type: entity - id: CrateHydroponicsSeeds parent: CrateHydroponics + id: CrateHydroponicsSeeds name: seeds crate description: Big things have small beginnings. Contains twenty-four different seeds. components: @@ -103,8 +103,8 @@ - id: CottonSeeds - type: entity - id: CrateHydroponicsTray parent: CrateHydroponics + id: CrateHydroponicsTray name: hydroponics tray crate description: Contains a hydroponics tray flatpack. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index 734f7fee59..0cef9777ef 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateCargoLuxuryHardsuit parent: CratePirate + id: CrateCargoLuxuryHardsuit name: luxury mining hardsuit crate description: Finally, a hardsuit Quartermasters could call their own. Centcomm has heard you, now stop asking. components: @@ -10,8 +10,8 @@ id: ClothingOuterHardsuitLuxury - type: entity - id: CrateCargoParcelWrap parent: CrateGenericSteel + id: CrateCargoParcelWrap name: parcel wrap crate description: All your parcel wrapping needs in one crate, containing three rolls of parcel wrap. components: @@ -22,10 +22,10 @@ amount: 3 - type: entity + parent: CratePrivateSecure id: CrateCargoGambling name: the grand lottery $$$ description: A box containing treasure beyond your greatest imaginations! - parent: CratePrivateSecure components: - type: EntityTableContainerFill containers: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/chemistry.yml b/Resources/Prototypes/Catalog/Fills/Crates/chemistry.yml index 45fb81f1b5..01d05cd359 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/chemistry.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/chemistry.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateChemistryP parent: CrateChemistrySecure + id: CrateChemistryP name: chemicals crate (P) description: Contains chemicals from the P-Block of elements. Requires Chemistry access to open. components: @@ -20,8 +20,8 @@ - id: JugNitrogen - type: entity - id: CrateChemistryS parent: CrateChemistrySecure + id: CrateChemistryS name: chemicals crate (S) description: Contains chemicals from the S-Block of elements. Requires Chemistry access to open. components: @@ -36,8 +36,8 @@ - id: JugRadium - type: entity - id: CrateChemistryD parent: CrateChemistrySecure + id: CrateChemistryD name: chemicals crate (D) description: Contains chemicals from the D-Block of elements. Requires Chemistry access to open. components: @@ -52,8 +52,8 @@ - id: JugSilver - type: entity - id: CratePlantBGone parent: CrateGenericSteel + id: CratePlantBGone name: bulk Plant-B-Gone crate description: From Monstano. "Unwanted Weeds, Meet Your Celestial Roundup!" components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml index bf47d3f271..dd82c2208f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateEmergencyExplosive parent: CrateSecgear + id: CrateEmergencyExplosive name: bomb suit crate description: Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (time not included) components: @@ -16,8 +16,8 @@ - id: ClothingOuterSuitBomb - type: entity - id: CrateEmergencyFire parent: CrateGenericSteel + id: CrateEmergencyFire name: firefighting crate description: Only you can prevent station fires. Partner up with two firefighter suits, gas masks, flashlights, large oxygen tanks, extinguishers, and hardhats! components: @@ -39,10 +39,10 @@ amount: 2 - type: entity - id: CrateEmergencyInternals parent: CrateInternals + id: CrateEmergencyInternals name: internals crate - description: Master your life energy and control your breathing with 3 breath masks, emergency suits and large air tanks. + description: Master your life energy and control your breathing with three breath masks, three gas masks, three emergency EVA suits, three oxygen tanks, and three nitrogen tanks. components: - type: EntityTableContainerFill containers: @@ -60,10 +60,10 @@ amount: 3 - type: entity - id: CrateEmergencyInternalsLarge parent: CrateInternals + id: CrateEmergencyInternalsLarge name: internals crate (large) - description: Master your life energy and control your breathing with 6 breath masks, emergency suits and large air tanks. + description: Master your life energy and control your breathing with six breath masks, six gas masks, six emergency EVA suits, six oxygen tanks, and six nitrogen tanks. components: - type: EntityTableContainerFill containers: @@ -81,10 +81,10 @@ amount: 6 - type: entity - id: CrateNitrogenInternals parent: CrateInternals + id: CrateNitrogenInternals name: internals crate (nitrogen) - description: Contains four breath masks and four large nitrogen tanks. Intended for Slimepeople and Vox. + description: Contains two breath masks, two gas masks, and four nitrogen tanks. Intended for nitrogen-breathing species. components: - type: EntityTableContainerFill containers: @@ -98,8 +98,8 @@ amount: 4 - type: entity - id: CrateEmergencyRadiation parent: CrateRadiation + id: CrateEmergencyRadiation name: radiation protection crate description: Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a bottle of vodka and some glasses too, considering the life-expectancy of people who order this. components: @@ -116,8 +116,8 @@ amount: 2 - type: entity - id: CrateEmergencyInflatablewall parent: CratePlastic + id: CrateEmergencyInflatablewall name: inflatable wall crate description: Three stacks of inflatable walls for when the stations metal walls don't want to hold atmosphere anymore. components: @@ -127,8 +127,8 @@ id: BoxInflatable - type: entity - id: CrateGenericBiosuit parent: CratePlastic + id: CrateGenericBiosuit name: emergency bio suit crate description: Contains 2 biohazard suits to ensure that no disease will distract you from what you're doing there. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml index bcf73a2c4d..27ade67868 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateEngineeringGear parent: CrateEngineering + id: CrateEngineeringGear name: engineering gear crate description: Various engineering gear parts. components: @@ -22,8 +22,8 @@ amount: 2 - type: entity - id: CrateEngineeringToolbox parent: CrateEngineering + id: CrateEngineeringToolbox name: toolbox crate description: Two mechanical and two electrical toolboxes. components: @@ -37,8 +37,8 @@ amount: 2 #- type: entity -# id: CrateEngineeringPowercell # parent: CrateElectrical +# id: CrateEngineeringPowercell # name: AME crate # description: Three microcreactor powercells. # components: @@ -49,8 +49,8 @@ # amount: 3 - type: entity - id: CrateEngineeringCableLV parent: CrateElectrical + id: CrateEngineeringCableLV name: LV cable crate description: 3 coils of LV cables. components: @@ -61,8 +61,8 @@ amount: 3 - type: entity - id: CrateEngineeringCableMV parent: CrateElectrical + id: CrateEngineeringCableMV name: MV cable crate description: 3 coils of MV cables. components: @@ -73,8 +73,8 @@ amount: 3 - type: entity - id: CrateEngineeringCableHV parent: CrateElectrical + id: CrateEngineeringCableHV name: HV cable crate description: 3 coils of HV cables. components: @@ -85,8 +85,8 @@ amount: 3 - type: entity - id: CrateEngineeringFoamGrenade parent: CrateEngineeringSecure + id: CrateEngineeringFoamGrenade name: sealant grenade crate description: 5 metal foam sealant grenades. components: @@ -97,8 +97,8 @@ amount: 5 - type: entity - id: CrateEngineeringCableBulk parent: CrateElectrical + id: CrateEngineeringCableBulk name: bulk cable crate description: 2 coils each for every cable type. components: @@ -114,8 +114,8 @@ amount: 2 - type: entity - id: CrateEngineeringElectricalSupplies parent: CrateElectrical + id: CrateEngineeringElectricalSupplies name: electrical supplies crate description: NT is not responsible for any workplace infighting relating to the insulated gloves included within these crates. components: @@ -129,8 +129,8 @@ amount: 2 - type: entity - id: CrateEngineeringStationBeaconBundle parent: CratePlastic + id: CrateEngineeringStationBeaconBundle name: station beacon bundle description: A crate containing 5 station beacon assemblies for modifying the station map. components: @@ -141,8 +141,8 @@ amount: 5 - type: entity - id: CrateEngineeringJetpack parent: CrateGenericSteel + id: CrateEngineeringJetpack name: jetpack crate description: Two jetpacks for those who don't know how to use fire extinguishers. components: @@ -153,8 +153,8 @@ amount: 2 - type: entity - id: CrateEngineeringMiniJetpack parent: CrateGenericSteel + id: CrateEngineeringMiniJetpack name: mini jetpack crate description: Two mini jetpacks for those who want an extra challenge. components: @@ -165,8 +165,8 @@ amount: 2 - type: entity - id: CrateAirlockKit parent: CrateEngineering + id: CrateAirlockKit name: airlock kit description: A kit for building 6 airlocks, doesn't include tools. components: @@ -180,8 +180,8 @@ amount: 6 - type: entity - id: CrateEvaKit parent: CrateCommandSecure + id: CrateEvaKit name: EVA kit description: A set consisting of two prestigious EVA suits and helmets. components: @@ -195,8 +195,8 @@ amount: 2 - type: entity - id: CrateRCDAmmo parent: CrateEngineering + id: CrateRCDAmmo name: compressed matter crate description: Contains three compressed matter cartridges. components: @@ -207,8 +207,8 @@ amount: 3 - type: entity - id: CrateRCD parent: CrateEngineeringSecure + id: CrateRCD name: RCD crate description: A crate containing a single rapid construction device. components: @@ -218,8 +218,8 @@ id: RCD - type: entity - id: CrateParticleDecelerators parent: CrateEngineeringSecure + id: CrateParticleDecelerators name: particle decelerators crate description: A crate containing 3 Particle Decelerators. components: @@ -230,8 +230,8 @@ amount: 3 - type: entity - id: CrateEngineeringSpaceHeater parent: CrateEngineering + id: CrateEngineeringSpaceHeater name: space heater crate description: Contains a space heater for climate control. components: @@ -258,8 +258,8 @@ - id: BlockGameArcadeComputerCircuitboard - type: entity - id: CrateTechBoardRandom parent: ToteBase + id: CrateTechBoardRandom name: surplus boards description: Surplus boards from somewhere. components: @@ -271,8 +271,8 @@ range: 6, 8 - type: entity - id: CrateAirGrenade parent: CrateEngineering + id: CrateAirGrenade name: air grenade crate description: A crate containing 3 air grenades. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml index e81b6135ec..92a3eabe08 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engines.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml @@ -1,8 +1,8 @@ # AME - type: entity - id: CrateEngineeringAMEShielding parent: CrateEngineeringSecure + id: CrateEngineeringAMEShielding name: packaged antimatter reactor crate description: 9 parts for the main body of an antimatter reactor, or for expanding an existing one. components: @@ -13,8 +13,8 @@ amount: 9 - type: entity - id: CrateEngineeringAMEJar parent: CrateEngineeringSecure + id: CrateEngineeringAMEJar name: antimatter containment jar crate description: 3 antimatter jars, for fuelling an antimatter reactor. components: @@ -25,8 +25,8 @@ amount: 3 - type: entity - id: CrateEngineeringAMEControl parent: CrateEngineeringSecure + id: CrateEngineeringAMEControl name: antimatter control unit crate description: The control unit of an antimatter reactor. components: @@ -38,8 +38,8 @@ # Singularity - type: entity - id: CrateEngineeringSingularityEmitter parent: CrateEngineeringSecure + id: CrateEngineeringSingularityEmitter name: emitter crate description: An emitter, best used for singularity engines. components: @@ -49,8 +49,8 @@ id: EmitterFlatpack - type: entity - id: CrateEngineeringSingularityCollector parent: CrateEngineeringSecure + id: CrateEngineeringSingularityCollector name: radiation collector crate description: A radiation collector, best used for singularity engines. Plasma is included. components: @@ -62,8 +62,8 @@ - id: PlasmaTankFilled - type: entity - id: CrateEngineeringSingularityContainment parent: CrateEngineeringSecure + id: CrateEngineeringSingularityContainment name: containment field generator crate description: A containment field generator, keeps the singulo in submission. components: @@ -73,8 +73,8 @@ id: ContainmentFieldGeneratorFlatpack - type: entity - id: CrateEngineeringSingularityGenerator parent: CrateEngineeringSecure + id: CrateEngineeringSingularityGenerator name: singularity generator crate description: A singularity generator, the mother of the beast. components: @@ -86,8 +86,8 @@ # Particle Accelerator - type: entity - id: CrateEngineeringParticleAccelerator parent: CrateEngineeringSecure + id: CrateEngineeringParticleAccelerator name: PA board crate description: Complex to setup, but rewarding as fuck. Contains boards for all particle accelerator components. components: @@ -106,10 +106,10 @@ # Non-functional for some reason #- type: entity +# parent: CrateEngineeringSecure # id: CrateEngineeringSingularity # name: singularity crate # description: "Prank the station!" -# parent: CrateEngineeringSecure # components: # - type: EntityTableContainerFill # containers: @@ -117,8 +117,8 @@ # id: Singularity - type: entity - id: CrateEngineeringGenerator parent: CrateEngineering + id: CrateEngineeringGenerator name: generator crate suffix: DEBUG components: @@ -128,8 +128,8 @@ id: DebugGenerator # TODO change to flatpack - type: entity - id: CrateEngineeringSolar parent: CrateEngineering + id: CrateEngineeringSolar name: solar assembly crate description: A kit with solar flatpacks and glass to construct ten solar panels. components: @@ -143,8 +143,8 @@ amount: 2 - type: entity - id: CrateEngineeringShuttle parent: CrateEngineeringSecure + id: CrateEngineeringShuttle name: shuttle powering crate description: A crate containing all needs for shuttle powering. components: @@ -158,8 +158,8 @@ - id: InflatableDoorStack1 - type: entity - id: CrateEngineeringTeslaGenerator parent: CrateEngineeringSecure + id: CrateEngineeringTeslaGenerator name: tesla generator crate description: A tesla generator. God save you. components: @@ -169,8 +169,8 @@ id: TeslaGeneratorFlatpack - type: entity - id: CrateEngineeringTeslaCoil parent: CrateEngineeringSecure + id: CrateEngineeringTeslaCoil name: tesla coil crate description: Tesla coil. Attracts lightning and generates energy from it. components: @@ -180,8 +180,8 @@ id: TeslaCoilFlatpack - type: entity - id: CrateEngineeringTeslaGroundingRod parent: CrateEngineeringSecure + id: CrateEngineeringTeslaGroundingRod name: tesla grounding rod crate description: Grounding rod, best for lightning protection. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 17f07b36b8..52263a2001 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateFoodPizza parent: CratePlastic + id: CrateFoodPizza name: emergency pizza delivery description: Help do your part to end station hunger by distributing pizza to underfunded departments! Includes 4 pizzas. components: @@ -15,8 +15,8 @@ prob: 0.01 - type: entity - id: CrateFoodMRE parent: CratePlastic + id: CrateFoodMRE name: MRE crate description: A military style meal fit to feed a whole department. components: @@ -27,8 +27,8 @@ amount: 6 - type: entity - id: CrateFoodCooking parent: CrateFreezer + id: CrateFoodCooking name: kitchen supplies crate description: Extra kitchen supplies, in case the botanists are absent. components: @@ -55,8 +55,8 @@ amount: 2 - type: entity - id: CrateFoodDinnerware parent: CratePlastic + id: CrateFoodDinnerware name: kitchen dinnerware crate description: Extra kitchen supplies, in case the clown was allowed in the cafeteria unsupervised. components: @@ -82,8 +82,8 @@ - id: BoxUtensil - type: entity - id: CrateFoodBarSupply parent: CrateFreezer + id: CrateFoodBarSupply name: bartending supplies crate description: Extra Bar supplies, in case the clown was allowed in the bar unsupervised. components: @@ -111,8 +111,8 @@ amount: 2 - type: entity - id: CrateFoodSoftdrinks parent: CrateFreezer + id: CrateFoodSoftdrinks name: softdrinks crate description: A variety of sodas to complement a small party, without having to empty the soda machines. Includes 14 sodas. components: @@ -136,8 +136,8 @@ amount: 2 - type: entity - id: CrateFoodGetMore parent: CrateFreezer + id: CrateFoodGetMore name: Getmore Bakemore crate description: Getmore branded snacks and baking supplies for the creative chef, all without the need of emptying your station's Getmore machines! components: @@ -164,8 +164,8 @@ - id: FoodBoxCloth - type: entity - id: CrateFoodIceCream parent: CrateFreezer + id: CrateFoodIceCream name: ice cream delivery description: An assortment of ice cream delights for any occasion! Includes 16 frozen treats. components: @@ -189,8 +189,8 @@ amount: 2 - type: entity - id: CrateFoodSnowcone parent: CrateFreezer + id: CrateFoodSnowcone name: snowcone delivery description: A freezer packed with refreshing snowcones for a hard working crew, or even a lazy one! Includes 16 snowcones. components: @@ -212,8 +212,8 @@ amount: 2 - type: entity - id: CrateFoodHappyHonkBigBite parent: CratePlastic + id: CrateFoodHappyHonkBigBite name: Happy Honk meal delivery description: Two fully loaded Happy Honk Big Bite burger meals, complete with cheesy fries, a bottle of Space Cola, a slice of apple pie and a toy! components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index dc7d8f952a..df972422d7 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -142,8 +142,8 @@ - id: PottedPlant26 - type: entity - id: CratePlants parent: CrateGenericSteel + id: CratePlants name: plant crate description: A variety pack of potted plants to spruce up your station! components: @@ -155,8 +155,8 @@ value: 5 - type: entity - id: CrateFunPlushie parent: CrateGenericSteel + id: CrateFunPlushie name: plushie crate description: A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT. components: @@ -168,8 +168,8 @@ value: 10 - type: entity - id: CrateFunLizardPlushieBulk parent: CrateGenericSteel + id: CrateFunLizardPlushieBulk name: bulk lizard plushie crate description: A buncha soft lizard plushies. Throw them around and then wonder how you're gonna explain this purchase to NT. components: @@ -181,8 +181,8 @@ value: 6 - type: entity - id: CrateFunSharkPlushieBulk parent: CrateGenericSteel + id: CrateFunSharkPlushieBulk name: bulk soft toy shark crate description: A crate filled with a variety of everyone's favorite finned friend. Rawr! components: @@ -201,8 +201,8 @@ value: 2 - type: entity - id: CrateFunInstrumentsVariety parent: CrateGenericSteel + id: CrateFunInstrumentsVariety name: variety instrument collection description: Get your sad station movin' and groovin' with this catch-all variety pack! Contains seven different instruments. components: @@ -219,8 +219,8 @@ - id: GlockenspielInstrument - type: entity - id: CrateFunInstrumentsBrass parent: CrateGenericSteel + id: CrateFunInstrumentsBrass name: brass instrument ensemble crate description: Bring some jazz to the station with the brass ensemble. Contains a variety of brass instruments for the whole station to play. components: @@ -238,8 +238,8 @@ - id: TubaInstrument - type: entity - id: CrateFunInstrumentsString parent: CrateGenericSteel + id: CrateFunInstrumentsString name: string instrument ensemble crate description: Pluck or pick, slap or shred! Play a smooth melody or melt peoples' faces with this package of stringed instruments. components: @@ -258,8 +258,8 @@ - id: HarpInstrument - type: entity - id: CrateFunInstrumentsWoodwind parent: CrateGenericSteel + id: CrateFunInstrumentsWoodwind name: woodwind instrument ensemble crate description: If atmos is good at their job, use air to play music with these woodwind instruments! Real wood not guaranteed with every item. components: @@ -280,8 +280,8 @@ - id: PanFluteInstrument - type: entity - id: CrateFunInstrumentsKeyedPercussion parent: CrateGenericSteel + id: CrateFunInstrumentsKeyedPercussion name: keyed/percussion instrument ensemble crate description: Hit some keys with some sticks or your hands, with this Keyed and Percussion instrument ensemble crate. components: @@ -301,8 +301,8 @@ - id: VibraphoneInstrument - type: entity - id: CrateFunInstrumentsSpecial parent: CrateGenericSteel + id: CrateFunInstrumentsSpecial name: special instrument collector's crate description: Create some noise with this special collection of arguably-instruments! Centcomm is not responsible for any trauma caused by the contents. components: @@ -322,8 +322,8 @@ - id: ReverseCymbalsInstrument - type: entity - id: CrateFunInstrumentsRandom parent: CrateGenericSteel + id: CrateFunInstrumentsRandom name: random instrument collection description: A box containing several randomly curated instruments, hand picked by Centcomm's top musicians! components: @@ -346,8 +346,8 @@ rolls: 2 - type: entity - id: CrateFunArtSupplies parent: CrateGenericSteel + id: CrateFunArtSupplies name: art supplies description: Make some happy little accidents with lots of crayons! components: @@ -357,8 +357,8 @@ id: CrayonBox - type: entity - id: CrateFunBoardGames parent: CrateGenericSteel + id: CrateFunBoardGames name: board game crate description: Game nights have been proven to either decrease boredom or increase murderous rage depending on the game. components: @@ -381,8 +381,8 @@ amount: 6 - type: entity - id: CrateFunSadTromboneImplants parent: CrateGenericSteel + id: CrateFunSadTromboneImplants name: sad trombone implants description: Death's never been so fun before! Implant these to make dying a bit more happy. components: @@ -393,8 +393,8 @@ amount: 3 - type: entity - id: CrateFunLightImplants parent: CrateGenericSteel + id: CrateFunLightImplants name: light implants description: Light up your skin with these implants! components: @@ -405,8 +405,8 @@ amount: 3 - type: entity - id: CrateFunParty parent: CrateGenericSteel + id: CrateFunParty name: party crate description: An entire party just waiting for you to open it. Includes party favors, party beverages, and even a cake. components: @@ -438,8 +438,8 @@ amount: 2 - type: entity - id: CrateFunWaterGuns parent: CratePlastic + id: CrateFunWaterGuns name: water gun crate description: A summer special with a variety of brightly colored water guns. Water not included. components: @@ -453,8 +453,8 @@ amount: 4 - type: entity - id: CrateFunFoamGuns parent: CratePlastic + id: CrateFunFoamGuns name: Foam Force crate description: Contains four Foam Force rifles, some grenades, and extra ammo. It's [REDACTED] or nothing! components: @@ -470,8 +470,8 @@ amount: 4 - type: entity - id: CrateFunBoxing parent: CrateGenericSteel + id: CrateFunBoxing name: boxing crate description: Want to set up an underground fight club or host a tournament amongst station crew? This crate is for you! components: @@ -489,8 +489,8 @@ amount: 3 - type: entity - id: CrateFunPirate parent: CratePirate + id: CrateFunPirate suffix: Filled components: - type: EntityTableContainerFill @@ -508,8 +508,8 @@ amount: 2 - type: entity - id: CrateFunToyBox parent: CrateToyBox + id: CrateFunToyBox suffix: Filled components: - type: EntityTableContainerFill @@ -537,8 +537,8 @@ - id: RubberChicken - type: entity - id: CrateFunBikeHornImplants parent: CrateGenericSteel + id: CrateFunBikeHornImplants name: bike horn implants description: A thousand honks a day keeps security officers away! components: @@ -549,8 +549,8 @@ amount: 3 - type: entity - id: CrateFunMysteryFigurines parent: CratePlastic + id: CrateFunMysteryFigurines name: mystery figure crate description: A collection of 10 Mystery Figurine boxes. Duplicates non refundable. components: @@ -565,10 +565,10 @@ prob: 0.05 - type: entity + parent: CratePlastic + id: CrateFunDartsSet name: dartboard box set description: A box with everything you need for a fun game of darts. - id: CrateFunDartsSet - parent: CratePlastic components: - type: EntityTableContainerFill containers: @@ -581,10 +581,10 @@ prob: 0.05 - type: entity + parent: CrateLivestock + id: CrateFunScurret name: hydrated scurret description: Wait, what? - id: CrateFunScurret - parent: CrateLivestock components: - type: EntityTableContainerFill containers: @@ -600,4 +600,3 @@ - id: ClothingHeadHatHardhatYellow - id: ClothingNeckMantleQM - id: ClothingHeadsetCargo - diff --git a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml index cb8a690f2b..ebf1a4a584 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/materials.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateMaterialGlass parent: CrateGenericSteel + id: CrateMaterialGlass name: glass sheet crate description: 90 sheets of glass, packed with care. components: @@ -11,8 +11,8 @@ amount: 3 - type: entity - id: CrateMaterialSteel parent: CrateGenericSteel + id: CrateMaterialSteel name: steel sheet crate description: 90 sheets of steel. components: @@ -23,8 +23,8 @@ amount: 3 - type: entity - id: CrateMaterialTextiles parent: CrateGenericSteel + id: CrateMaterialTextiles name: textiles crate description: 60 pieces of cloth and 30 pieces of durathread. components: @@ -37,8 +37,8 @@ - id: MaterialDurathread - type: entity - id: CrateMaterialPlastic parent: CrateGenericSteel + id: CrateMaterialPlastic name: plastic sheet crate description: 90 sheets of plastic. components: @@ -49,8 +49,8 @@ amount: 3 - type: entity - id: CrateMaterialWood parent: CrateGenericSteel + id: CrateMaterialWood name: wood crate description: Bunch of wood planks. components: @@ -60,8 +60,8 @@ id: MaterialWoodPlank - type: entity - id: CrateMaterialBrass parent: CrateGenericSteel + id: CrateMaterialBrass name: brass crate description: 90 sheets of brass. components: @@ -72,8 +72,8 @@ amount: 3 - type: entity - id: CrateMaterialPlasteel parent: CrateGenericSteel + id: CrateMaterialPlasteel name: plasteel crate description: 30 sheets of plasteel. components: @@ -83,8 +83,8 @@ id: SheetPlasteel - type: entity - id: CrateMaterialPlasma parent: CratePlasma + id: CrateMaterialPlasma name: solid plasma crate description: 30 sheets of plasma. components: @@ -94,8 +94,8 @@ id: SheetPlasma - type: entity - id: CrateMaterialGold parent: CrateGenericSteel + id: CrateMaterialGold name: gold crate description: 30 bars of gold. components: @@ -105,8 +105,8 @@ id: IngotGold - type: entity - id: CrateMaterialSilver parent: CrateGenericSteel + id: CrateMaterialSilver name: silver crate description: 30 bars of silver. components: @@ -116,8 +116,8 @@ id: IngotSilver - type: entity - id: CrateMaterialCardboard parent: CrateGenericSteel + id: CrateMaterialCardboard name: cardboard crate description: 90 pieces of cardboard. components: @@ -128,8 +128,8 @@ amount: 3 - type: entity - id: CrateMaterialPaper parent: CrateGenericSteel + id: CrateMaterialPaper name: paper crate description: 90 sheets of paper. components: @@ -171,8 +171,8 @@ - id: IngotSilver1 - type: entity - id: CrateMaterialRandom parent: CrateGenericSteel + id: CrateMaterialRandom name: surplus materials description: Surplus materials from somewhere. components: @@ -184,8 +184,8 @@ range: 2, 4 - type: entity - id: CrateMaterialSilo parent: CrateGenericSteel + id: CrateMaterialSilo name: material silo crate description: A package including all the materials to create a material silo. components: @@ -202,8 +202,8 @@ amount: 2 - type: entity - id: CrateMaterialBasicResource parent: CrateGenericSteel + id: CrateMaterialBasicResource name: basic sheet crate description: 30 sheets of steel, glass, and plastic. components: @@ -216,9 +216,9 @@ - id: SheetPlastic #- type: entity +# parent: CrateGenericSteel # id: CrateMaterialHFuelTank # name: fueltank crate -# parent: CrateGenericSteel # components: # - type: EntityTableContainerFill # containers: @@ -226,9 +226,9 @@ # id: WeldingFuelTank #- type: entity +# parent: CrateGenericSteel # id: CrateMaterialHWaterTank # name: watertank crate -# parent: CrateGenericSteel # components: # - type: EntityTableContainerFill # containers: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml index d8a98fe5e9..a405b8e128 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateMedicalSupplies parent: CrateMedical + id: CrateMedicalSupplies name: medical supplies crate description: Basic medical supplies. components: @@ -19,8 +19,8 @@ - id: BoxMouthSwab - type: entity - id: CrateChemistrySupplies parent: CrateMedical + id: CrateChemistrySupplies name: chemistry supplies crate description: Basic chemistry supplies. components: @@ -37,8 +37,8 @@ amount: 2 - type: entity - id: CrateChemistryVials parent: CrateMedical + id: CrateChemistryVials name: vial supply crate description: Crate filled with a box of vials. components: @@ -48,8 +48,8 @@ id: BoxVial - type: entity - id: CrateMindShieldImplants parent: CrateMedical + id: CrateMindShieldImplants name: MindShield implant crate description: Crate filled with 3 MindShield implants. components: @@ -60,8 +60,8 @@ amount: 3 - type: entity - id: CrateMedicalSurgery parent: CrateSurgery + id: CrateMedicalSurgery name: surgical supplies crate description: Surgical instruments. components: @@ -78,8 +78,8 @@ - id: ClothingMaskSterile - type: entity - id: CrateMedicalScrubs parent: CrateMedical + id: CrateMedicalScrubs name: medical scrubs crate description: Medical clothings. components: @@ -97,8 +97,8 @@ amount: 3 - type: entity - id: CrateEmergencyBurnKit parent: CrateMedical + id: CrateEmergencyBurnKit name: emergency burn kit description: Crate filled with a burn treatment kit. components: @@ -108,8 +108,8 @@ id: MedkitBurnFilled - type: entity - id: CrateEmergencyToxinKit parent: CrateMedical + id: CrateEmergencyToxinKit name: emergency toxin kit description: Crate filled with a toxin treatment kit. components: @@ -119,8 +119,8 @@ id: MedkitToxinFilled - type: entity - id: CrateEmergencyO2Kit parent: CrateMedical + id: CrateEmergencyO2Kit name: emergency O2 kit description: Crate filled with an O2 treatment kit. components: @@ -130,8 +130,8 @@ id: MedkitOxygenFilled - type: entity - id: CrateEmergencyBruteKit parent: CrateMedical + id: CrateEmergencyBruteKit name: emergency brute kit description: Crate filled with a brute treatment kit. components: @@ -141,8 +141,8 @@ id: MedkitBruteFilled - type: entity - id: CrateEmergencyAdvancedKit parent: CrateMedical + id: CrateEmergencyAdvancedKit name: emergency advanced kit description: Crate filled with an advanced treatment kit. components: @@ -152,8 +152,8 @@ id: MedkitAdvancedFilled - type: entity - id: CrateEmergencyRadiationKit parent: CrateMedical + id: CrateEmergencyRadiationKit name: emergency radiation kit description: Crate filled with a radiation treatment kit. components: @@ -163,8 +163,8 @@ id: MedkitRadiationFilled - type: entity - id: CrateBodyBags parent: CrateMedical + id: CrateBodyBags name: body bags crate description: Contains ten body bags. components: @@ -175,8 +175,8 @@ amount: 2 - type: entity - id: CrateVirologyBiosuit parent: CrateMedicalSecure + id: CrateVirologyBiosuit name: virology bio suit crate description: Contains 2 biohazard suits to ensure that no disease will distract you from treating the crew. Requires Medical access to open. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml index 625a890d8b..84a58e67ce 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateNPCBee parent: CrateLivestock + id: CrateNPCBee name: crate of bees description: A crate containing a swarm of eight bees. components: @@ -11,8 +11,8 @@ amount: 8 - type: entity - id: CrateNPCButterflies parent: CrateLivestock + id: CrateNPCButterflies name: crate of butterflies description: A crate containing five butterflies. components: @@ -23,8 +23,8 @@ amount: 5 - type: entity - id: CrateNPCCat parent: CrateLivestock + id: CrateNPCCat name: cat crate description: A crate containing a single cat. components: @@ -42,8 +42,8 @@ weight: 0.005 - type: entity - id: CrateNPCChicken parent: CrateLivestock + id: CrateNPCChicken name: chicken crate description: A crate containing four fully grown chickens. components: @@ -54,8 +54,8 @@ amount: 4 - type: entity - id: CrateNPCCrab parent: CrateLivestock + id: CrateNPCCrab name: crab crate description: A crate containing three huge crabs. components: @@ -66,8 +66,8 @@ amount: 3 - type: entity - id: CrateNPCDuck parent: CrateLivestock + id: CrateNPCDuck name: duck crate description: A crate containing six fully grown ducks. components: @@ -81,8 +81,8 @@ amount: 2 - type: entity - id: CrateNPCCorgi parent: CrateLivestock + id: CrateNPCCorgi name: corgi crate description: A crate containing a single corgi. components: @@ -92,8 +92,8 @@ id: MobCorgi - type: entity - id: CrateNPCPuppyCorgi parent: CrateLivestock + id: CrateNPCPuppyCorgi name: puppy corgi crate description: A crate containing a single puppy corgi. Awww. components: @@ -103,8 +103,8 @@ id: MobCorgiPuppy - type: entity - id: CrateNPCCow parent: CrateLivestock + id: CrateNPCCow name: cow crate description: A crate containing a single cow. components: @@ -114,8 +114,8 @@ id: MobCow - type: entity - id: CrateNPCGoat parent: CrateLivestock + id: CrateNPCGoat name: goat crate description: A crate containing a single goat. components: @@ -125,8 +125,8 @@ id: MobGoat - type: entity - id: CrateNPCGoose parent: CrateLivestock + id: CrateNPCGoose name: goose crate description: A crate containing two geese. components: @@ -137,8 +137,8 @@ amount: 2 - type: entity - id: CrateNPCGorilla parent: CrateLivestock + id: CrateNPCGorilla name: gorilla crate description: A crate containing a single gorilla. components: @@ -148,8 +148,8 @@ id: MobGorilla - type: entity - id: CrateNPCMonkeyCube parent: CrateGenericSteel + id: CrateNPCMonkeyCube name: monkey cube crate description: A crate containing single box of monkey cubes. components: @@ -159,8 +159,8 @@ id: MonkeyCubeBox - type: entity - id: CrateNPCKoboldCube parent: CrateGenericSteel + id: CrateNPCKoboldCube name: kobold cube crate description: A crate containing single box of kobold cubes. components: @@ -170,8 +170,8 @@ id: KoboldCubeBox - type: entity - id: CrateNPCMouse parent: CrateLivestock + id: CrateNPCMouse name: mice crate description: A crate containing five mice. components: @@ -182,8 +182,8 @@ amount: 5 - type: entity - id: CrateNPCParrot parent: CrateLivestock + id: CrateNPCParrot name: parrot crate description: A crate containing three parrots. components: @@ -194,8 +194,8 @@ amount: 3 - type: entity - id: CrateNPCPenguin parent: CrateLivestock + id: CrateNPCPenguin name: penguin crate description: A crate containing two penguins. components: @@ -206,8 +206,8 @@ amount: 2 - type: entity - id: CrateNPCPig parent: CrateLivestock + id: CrateNPCPig name: pig crate description: A crate containing a single pig. components: @@ -217,8 +217,8 @@ id: MobPig - type: entity - id: CrateNPCSnake parent: CrateLivestock + id: CrateNPCSnake name: snake crate description: A crate containing three snakes. components: @@ -229,8 +229,8 @@ amount: 3 - type: entity - id: CrateNPCHamster parent: CrateRodentCage + id: CrateNPCHamster suffix: Filled components: - type: EntityTableContainerFill @@ -239,8 +239,8 @@ id: MobHamster - type: entity - id: CrateNPCHamlet parent: CrateRodentCage + id: CrateNPCHamlet suffix: Hamlet components: - type: EntityTableContainerFill @@ -252,8 +252,8 @@ weight: 0.001 - type: entity - id: CrateNPCLizard parent: CrateLivestock + id: CrateNPCLizard name: lizard crate description: A crate containing a lizard. components: @@ -263,8 +263,8 @@ id: MobLizard - type: entity - id: CrateNPCKangaroo parent: CrateLivestock + id: CrateNPCKangaroo name: kangaroo crate description: A crate containing a kangaroo. components: @@ -274,8 +274,8 @@ id: MobKangaroo - type: entity - id: CrateNPCMothroach parent: CrateLivestock + id: CrateNPCMothroach name: crate of mothroaches description: A crate containing four mothroaches. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml index e81d340bb0..3cf7e72eb0 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/permaescape.yml @@ -1,31 +1,31 @@ - type: entity - name: Perma Escape Crate Spawner - id: CratePermaEscapeSpawner parent: CrateEmptySpawner + id: CratePermaEscapeSpawner + name: Perma Escape Crate Spawner components: - type: RandomSpawner prototypes: # Please note any duplicates & alphabetize <3 + - ClosetMaintenanceFilledRandom # x3 + - ClosetMaintenanceFilledRandom + - ClosetMaintenanceFilledRandom - CrateEngineeringMiniJetpack - CratePermaEscapeBureaucracy - - CratePermaEscapeEVA - - CratePermaEscapeGiftsFromSyndicate - - CratePermaEscapeGun - - CratePermaEscapeLights - - CratePermaEscapeMerc - - CrateServiceCustomSmokable - - CrateTrashCartFilled - CratePermaEscapeComs # x2 - CratePermaEscapeComs - CratePermaEscapeDigging # x2 - CratePermaEscapeDigging + - CratePermaEscapeEVA + - CratePermaEscapeGiftsFromSyndicate + - CratePermaEscapeGun + - CratePermaEscapeLights - CratePermaEscapeMats #x2 - CratePermaEscapeMats + - CratePermaEscapeMerc - CratePermaEscapeTowercap # x2 - CratePermaEscapeTowercap - - ClosetMaintenanceFilledRandom # x3 - - ClosetMaintenanceFilledRandom - - ClosetMaintenanceFilledRandom + - CrateTrashCartFilled + - CrateServiceCustomSmokable rarePrototypes: - MobTick # These need to be killable by one dude with a shovel. rareChance: .30 @@ -33,8 +33,8 @@ offset: 0.0 - type: entity - id: CratePermaEscapeDigging parent: CrateGenericSteel + id: CratePermaEscapeDigging suffix: Digging components: - type: EntityTableContainerFill @@ -58,9 +58,9 @@ prob: 0.05 - type: entity - id: CratePermaEscapeEVA parent: CrateGenericSteel - suffix: EVAs + id: CratePermaEscapeEVA + suffix: EVA components: - type: EntityTableContainerFill containers: @@ -88,8 +88,8 @@ prob: 0.05 - type: entity - id: CratePermaEscapeGun parent: CrateGenericSteel + id: CratePermaEscapeGun suffix: Gun components: - type: EntityTableContainerFill @@ -112,9 +112,9 @@ weight: 2 - type: entity - id: CratePermaEscapeBureaucracy parent: CrateGenericSteel - suffix: Writing + id: CratePermaEscapeBureaucracy + suffix: Bureaucracy components: - type: EntityTableContainerFill containers: @@ -145,8 +145,8 @@ - id: PersonalAI - type: entity - id: CratePermaEscapeLights parent: CrateGenericSteel + id: CratePermaEscapeLights suffix: Glowsticks components: - type: EntityTableContainerFill @@ -185,9 +185,9 @@ prob: 0.05 - type: entity - id: CratePermaEscapeMats parent: CrateGenericSteel - suffix: Mats + id: CratePermaEscapeMats + suffix: Materials components: - type: EntityTableContainerFill containers: @@ -198,9 +198,9 @@ - id: PartRodMetal - type: entity - id: CratePermaEscapeGiftsFromSyndicate parent: CrateGenericSteel - suffix: Syndi Gifts + id: CratePermaEscapeGiftsFromSyndicate + suffix: Syndicate gifts components: - type: EntityTableContainerFill containers: @@ -240,9 +240,9 @@ prob: 0.005 - type: entity - id: CratePermaEscapeMerc parent: CrateGenericSteel - suffix: Merc + id: CratePermaEscapeMerc + suffix: Mercenary components: - type: EntityTableContainerFill containers: @@ -273,9 +273,9 @@ prob: 0.05 - type: entity - id: CratePermaEscapeComs parent: CrateGenericSteel - suffix: Coms + id: CratePermaEscapeComs + suffix: Comms components: - type: EntityTableContainerFill containers: @@ -305,8 +305,8 @@ prob: 0.01 - type: entity - id: CratePermaEscapeTowercap parent: CrateGenericSteel + id: CratePermaEscapeTowercap suffix: Towercap components: - type: EntityTableContainerFill diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 6bfd0019de..97d45ef742 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -1,9 +1,9 @@ - type: entity + parent: CrateGenericSteel id: CrateSalvageEquipment name: "salvage equipment crate" - description: For the daring. suffix: Filled - parent: CrateGenericSteel + description: For the daring. components: - type: EntityTableContainerFill containers: @@ -26,10 +26,10 @@ - id: ClothingBeltSalvageWebbing - type: entity + parent: CrateGenericSteel id: CrateSalvageAssortedGoodies - suffix: Filled, Salvage Random categories: [ HideSpawnMenu ] # You should use SalvageMaterialCrateSpawner instead - parent: CrateGenericSteel + suffix: Filled, Salvage Random components: - type: EntityTableContainerFill containers: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/science.yml b/Resources/Prototypes/Catalog/Fills/Crates/science.yml index 1a5bd028ad..ab8cdc90e8 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/science.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/science.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateScienceBiosuit parent: CrateScienceSecure + id: CrateScienceBiosuit name: scientist bio suit crate description: Contains 2 biohazard suits to ensure that no disease will distract you from doing science. Requires Science access to open. components: @@ -15,8 +15,8 @@ amount: 2 - type: entity - id: CrateCrewMonitoring parent: CrateScienceSecure + id: CrateCrewMonitoring name: crew monitoring crate description: Contains a flatpack of a crew monitoring server and a few crew monitoring computers. Requires Science access to open. components: @@ -29,8 +29,8 @@ amount: 3 - type: entity - id: CrateStationAiCore parent: CrateScienceSecure + id: CrateStationAiCore name: station AI core crate description: Contains the components for constructing a station AI core. Positronic brain not included. Requires Science access to open. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index a254749e6a..466909dbe9 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateSecurityArmor parent: CrateSecgear + id: CrateSecurityArmor name: armor crate description: Contains three bulletproof vests. Requires Security access to open. components: @@ -11,8 +11,8 @@ amount: 3 - type: entity - id: CrateSecurityHelmet parent: CrateSecgear + id: CrateSecurityHelmet name: helmet crate description: Contains three standard-issue brain buckets. Requires Security access to open. components: @@ -23,8 +23,8 @@ amount: 3 - type: entity - id: CrateSecurityNonlethal parent: CrateSecgear + id: CrateSecurityNonlethal name: nonlethals crate description: Contains a mix of disablers, stun batons, and flashes. Requires Security access to open. components: @@ -43,8 +43,8 @@ # - GrenadeTeargas - type: entity - id: CrateSecuritySupplies parent: CrateSecgear + id: CrateSecuritySupplies name: security supplies crate description: Contains various supplies for the station's Security team. Requires Security access to open. components: @@ -59,8 +59,8 @@ # - SpacelawBook - type: entity - id: CrateRestraints parent: CrateSecgear + id: CrateRestraints name: restraints crate description: Contains two boxes each of handcuffs and zipties. Requires Security access to open. components: @@ -74,8 +74,8 @@ amount: 2 - type: entity - id: CrateSecurityBiosuit parent: CrateSecgear + id: CrateSecurityBiosuit name: security bio suit crate description: Contains 2 biohazard suits to ensure that no disease will distract you from your duties. Requires Security access to open. components: @@ -90,10 +90,10 @@ amount: 2 - type: entity + parent: CrateSecgear id: CrateSecurityTrackingMindshieldImplants name: implanter crate description: Contains 4 MindShield implants and 4 tracking implant. Requires Security access to open. - parent: CrateSecgear components: - type: EntityTableContainerFill containers: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index cfe3b316c5..e2547dbda0 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateServiceJanitorialSupplies parent: CratePlastic + id: CrateServiceJanitorialSupplies name: janitorial supplies crate description: Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, broom, spray cleaner, wire brush, rag, and trash bag. components: @@ -26,8 +26,8 @@ amount: 2 - type: entity - id: CrateServiceCleanerGrenades parent: CratePlastic + id: CrateServiceCleanerGrenades name: bulk cleanades crate description: Contains two boxes of cleaner grenades, for those deeply-entrenched stains. components: @@ -38,10 +38,10 @@ amount: 2 - type: entity - id: CrateServiceReplacementLights parent: CrateGenericSteel + id: CrateServiceReplacementLights name: replacement lights crate - description: May the light of Aether shine upon this station! Or at least, the light of forty two light tubes and twenty one light bulbs. + description: May the light of Aether shine upon this station! Or at least, the light of twelve fluorescent light tubes and twelve incandescent light bulbs. components: - type: EntityTableContainerFill containers: @@ -51,10 +51,23 @@ - id: BoxLightbulb - type: entity - id: CrateServiceHolidayLights parent: CrateGenericSteel + id: CrateServiceColorfulLights + name: colorful lights crate + description: It's not a party until it's hard to see, a little disorienting, and your ears hurt. Contains twelve light tubes and twelve light bulbs in a variety of colors. + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - id: BoxLightbulbColorfulMixed + - id: BoxLighttubeColorfulMixed + +- type: entity + parent: CrateGenericSteel + id: CrateServiceHolidayLights name: holiday lights crate - description: Deck the halls with these festive holiday lights! + description: Deck the halls with these festive holiday lights! Contains twelve red light tubes and twelve green light tubes. components: - type: EntityTableContainerFill containers: @@ -63,8 +76,8 @@ amount: 2 - type: entity - id: CrateMousetrapBoxes parent: CrateGenericSteel + id: CrateMousetrapBoxes name: mousetraps crate description: Mousetraps, for when all of service is being haunted by an entire horde of rats. Use sparingly... or not. components: @@ -74,8 +87,8 @@ id: BoxMousetrap - type: entity - id: CrateServiceSmokeables parent: CrateGenericSteel + id: CrateServiceSmokeables name: smokeables crate description: Tired of a quick death on the station? Order this crate and chain-smoke your way to a coughy demise! components: @@ -102,8 +115,8 @@ amount: 2 - type: entity - id: CrateServiceTheatre parent: CrateGenericSteel + id: CrateServiceTheatre name: theatrical performances crate description: Contains a moth cloak, barber scissors, maid uniform, clown and mime attributes, and other performance charms. components: @@ -131,8 +144,8 @@ - id: ClothingBeltSuspendersBlack - type: entity - id: CrateServiceCustomSmokable parent: CrateGenericSteel + id: CrateServiceCustomSmokable name: DIY smokeables crate description: Want to get a little creative with what you use to destroy your lungs? Then this crate is for you! Has everything you need to roll your own cigarettes. components: @@ -149,8 +162,8 @@ - id: Matchbox - type: entity - id: CrateServiceBureaucracy parent: CrateGenericSteel + id: CrateServiceBureaucracy name: bureaucracy crate description: Several stacks of paper, a few pens and an office toy. What more could you ask for? components: @@ -175,8 +188,8 @@ - id: BrbSign - type: entity - id: CrateServiceFaxMachine parent: CrateGenericSteel + id: CrateServiceFaxMachine name: fax machine crate description: A fax machine and a screwdriver to set the name with. components: @@ -188,8 +201,8 @@ - id: FaxMachineFlatpack - type: entity - id: CrateServicePersonnel parent: CrateCommandSecure + id: CrateServicePersonnel name: personnel crate description: Contains a box of blank ID cards and PDAs. components: @@ -201,8 +214,8 @@ - id: BoxID - type: entity - id: CrateServiceBooks parent: CrateGenericSteel + id: CrateServiceBooks name: books crate description: Contains 10 empty books of random appearance. components: @@ -213,8 +226,8 @@ amount: 10 - type: entity - id: CrateServiceGuidebooks parent: CrateGenericSteel + id: CrateServiceGuidebooks name: guidebooks crate description: Contains guidebooks. components: @@ -238,8 +251,8 @@ - id: BookSpaceLaw - type: entity - id: CrateServiceSodaDispenser parent: CrateFreezer + id: CrateServiceSodaDispenser name: soda dispenser refill crate description: Contains refills for soda dispensers. components: @@ -267,8 +280,8 @@ - id: DrinkWaterMelonJuiceJug - type: entity - id: CrateServiceBoozeDispenser parent: CrateFreezer + id: CrateServiceBoozeDispenser name: booze dispenser refill crate description: Contains refills for booze dispensers. components: @@ -290,8 +303,8 @@ - id: DrinkWineBottleFull - type: entity - id: CrateServiceBox parent: CratePlastic + id: CrateServiceBox name: boxes crate description: Contains 6 empty multipurpose boxes. components: @@ -302,8 +315,8 @@ amount: 6 - type: entity - id: CrateJanitorBiosuit parent: CratePlastic + id: CrateJanitorBiosuit name: janitor bio suit crate description: Contains 2 biohazard suits to ensure that no disease will distract you from cleaning. components: @@ -318,9 +331,9 @@ amount: 2 - type: entity + parent: CrateTrashCart id: CrateTrashCartFilled suffix: Filled - parent: CrateTrashCart components: - type: EntityTableContainerFill containers: @@ -395,8 +408,8 @@ prob: 0.1 - type: entity - id: CrateCandles parent: CrateGenericSteel + id: CrateCandles name: candles crate description: Contains 4 boxes of candles, 2 large and 2 small. For atmosphere or something. components: @@ -408,16 +421,3 @@ amount: 2 - id: BoxCandleSmall amount: 2 - -- type: entity - parent: CrateGenericSteel - id: CrateServiceColorfulLights - name: colorful lights crate - description: It's not a party until it's hard to see, a little disorienting, and your ears hurt. - components: - - type: EntityTableContainerFill - containers: - entity_storage: !type:AllSelector - children: - - id: BoxLightbulbColorfulMixed - - id: BoxLighttubeColorfulMixed diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index 4e48f6cc47..403afaaf74 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateSyndicateSurplusBundle parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] + id: CrateSyndicateSurplusBundle name: Syndicate surplus crate description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good. components: @@ -8,10 +8,10 @@ totalPrice: 50 - type: entity - id: CrateCybersunJuggernautBundle - suffix: Filled parent: CrateSyndicate + id: CrateCybersunJuggernautBundle name: Cybersun juggernaut bundle + suffix: Filled description: Contains everything except a big gun to go postal. components: - type: EntityTableContainerFill @@ -23,8 +23,8 @@ tableId: SyndicateHardsuitExtrasEntityTable - type: entity - id: CrateSyndicateSuperSurplusBundle parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] + id: CrateSyndicateSuperSurplusBundle name: Syndicate super surplus crate description: Contains 125 telecrystals worth of completely random Syndicate items. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml index f59fed6ebf..cbf1a54456 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml @@ -1,6 +1,6 @@ - type: entity - id: CrateVendingMachineRestockBoozeFilled parent: CratePlastic + id: CrateVendingMachineRestockBoozeFilled name: Booze-O-Mat restock crate description: Contains a restock box for the Booze-O-Mat. components: @@ -10,8 +10,8 @@ id: VendingMachineRestockBooze - type: entity - id: CrateVendingMachineRestockChefvendFilled parent: CratePlastic + id: CrateVendingMachineRestockChefvendFilled name: ChefVend restock crate description: Contains a restock box for the ChefVend. components: @@ -21,8 +21,8 @@ id: VendingMachineRestockChefvend - type: entity - id: CrateVendingMachineRestockClothesFilled parent: CratePlastic + id: CrateVendingMachineRestockClothesFilled name: clothing restock crate description: Contains a restock box for the clothes vending machines. components: @@ -32,8 +32,8 @@ id: VendingMachineRestockClothes - type: entity - id: CrateVendingMachineRestockAutoDrobeFilled parent: CratePlastic + id: CrateVendingMachineRestockAutoDrobeFilled name: AutoDrobe restock crate description: Contains a restock box for the AutoDrobe. components: @@ -43,8 +43,8 @@ id: VendingMachineRestockCostumes - type: entity - id: CrateVendingMachineRestockCondimentStationFilled parent: CratePlastic + id: CrateVendingMachineRestockCondimentStationFilled name: condiment station restock crate description: Contains a restock box for the condiment station. components: @@ -54,8 +54,8 @@ id: VendingMachineRestockCondimentStation - type: entity - id: CrateVendingMachineRestockDinnerwareFilled parent: CratePlastic + id: CrateVendingMachineRestockDinnerwareFilled name: Plasteel Chef restock crate description: Contains a restock box for the Plasteel Chef vending machine. components: @@ -65,8 +65,8 @@ id: VendingMachineRestockDinnerware - type: entity - id: CrateVendingMachineRestockEngineeringFilled parent: CrateEngineeringSecure + id: CrateVendingMachineRestockEngineeringFilled name: EngiVend restock crate description: Contains a restock box for the EngiVend. Also supports the YouTool. components: @@ -76,8 +76,8 @@ id: VendingMachineRestockEngineering - type: entity - id: CrateVendingMachineRestockGamesFilled parent: CratePlastic + id: CrateVendingMachineRestockGamesFilled name: Good Clean Fun restock crate description: Contains a restock box for the Good Clean Fun vending machine. components: @@ -87,8 +87,8 @@ id: VendingMachineRestockGames - type: entity - id: CrateVendingMachineRestockHotDrinksFilled parent: CratePlastic + id: CrateVendingMachineRestockHotDrinksFilled name: Solar's Best restock crate description: Contains two restock boxes for Solar's Best Hot Drinks vending machine. components: @@ -99,8 +99,8 @@ amount: 2 - type: entity - id: CrateVendingMachineRestockMedicalFilled parent: CrateMedicalSecure + id: CrateVendingMachineRestockMedicalFilled name: NanoMed restock crate description: Contains a restock box, compatible with the NanoMed and NanoMedPlus. components: @@ -110,8 +110,8 @@ id: VendingMachineRestockMedical - type: entity - id: CrateVendingMachineRestockChemVendFilled parent: CrateMedicalSecure + id: CrateVendingMachineRestockChemVendFilled name: ChemVend restock crate description: Contains a restock box for the ChemVend. components: @@ -121,8 +121,8 @@ id: VendingMachineRestockChemVend - type: entity - id: CrateVendingMachineRestockNutriMaxFilled parent: CrateHydroSecure + id: CrateVendingMachineRestockNutriMaxFilled name: NutriMax restock crate description: Contains a restock box for the NutriMax vending machine. components: @@ -132,8 +132,8 @@ id: VendingMachineRestockNutriMax - type: entity - id: CrateVendingMachineRestockPTechFilled parent: CratePlastic + id: CrateVendingMachineRestockPTechFilled name: PTech restock crate description: Contains a restock box for the PTech bureaucracy dispenser. components: @@ -143,8 +143,8 @@ id: VendingMachineRestockPTech - type: entity - id: CrateVendingMachineRestockRobustSoftdrinksFilled parent: CratePlastic + id: CrateVendingMachineRestockRobustSoftdrinksFilled name: beverage vendor restock crate description: Contains restock boxes for beverage vending machines. components: @@ -155,8 +155,8 @@ amount: 2 - type: entity - id: CrateVendingMachineRestockSalvageEquipmentFilled parent: CrateGenericSteel + id: CrateVendingMachineRestockSalvageEquipmentFilled name: Salvage restock crate description: Contains a restock box for the salvage vendor. components: @@ -166,8 +166,8 @@ id: VendingMachineRestockSalvageEquipment - type: entity - id: CrateVendingMachineRestockSecTechFilled parent: CrateSecgear + id: CrateVendingMachineRestockSecTechFilled name: SecTech restock crate description: Contains a restock box for the SecTech vending machine. components: @@ -177,8 +177,8 @@ id: VendingMachineRestockSecTech - type: entity - id: CrateVendingMachineRestockSeedsFilled parent: CrateHydroSecure + id: CrateVendingMachineRestockSeedsFilled name: MegaSeed restock crate description: Contains a restock box for the MegaSeed vending machine. components: @@ -188,8 +188,8 @@ id: VendingMachineRestockSeeds - type: entity - id: CrateVendingMachineRestockSmokesFilled parent: CratePlastic + id: CrateVendingMachineRestockSmokesFilled name: ShadyCigs restock crate description: Contains two restock boxes for the ShadyCigs vending machine. components: @@ -200,8 +200,8 @@ amount: 2 - type: entity - id: CrateVendingMachineRestockVendomatFilled parent: CratePlastic + id: CrateVendingMachineRestockVendomatFilled name: Vendomat restock crate description: Contains a restock box for a Vendomat vending machine. components: @@ -211,8 +211,8 @@ id: VendingMachineRestockVendomat - type: entity - id: CrateVendingMachineRestockRoboticsFilled parent: CrateScienceSecure + id: CrateVendingMachineRestockRoboticsFilled name: Robotech Deluxe restock crate description: Contains a restock box for a Robotech Deluxe vending machine. components: @@ -222,8 +222,8 @@ id: VendingMachineRestockRobotics - type: entity - id: CrateVendingMachineRestockTankDispenserFilled parent: CratePlastic + id: CrateVendingMachineRestockTankDispenserFilled name: tank dispenser restock crate description: Contains a restock box for an Engineering or Atmospherics tank dispenser. components: @@ -233,8 +233,8 @@ id: VendingMachineRestockTankDispenser - type: entity - id: CrateVendingMachineRestockHappyHonkFilled parent: CratePlastic + id: CrateVendingMachineRestockHappyHonkFilled name: Happy Honk restock crate description: Contains a restock box for a happy honk dispenser. components: @@ -245,8 +245,8 @@ amount: 2 - type: entity - id: CrateVendingMachineRestockGetmoreChocolateCorpFilled parent: CratePlastic + id: CrateVendingMachineRestockGetmoreChocolateCorpFilled name: Getmore Chocolate Corp restock crate description: Contains a restock box for a Getmore Chocolate Corp dispenser. components: @@ -257,8 +257,8 @@ amount: 2 - type: entity - id: CrateVendingMachineRestockChangFilled parent: CratePlastic + id: CrateVendingMachineRestockChangFilled name: Chang restock crate description: Contains a restock box for a Mr. Chang dispenser. components: @@ -269,8 +269,8 @@ amount: 2 - type: entity - id: CrateVendingMachineRestockDiscountDansFilled parent: CratePlastic + id: CrateVendingMachineRestockDiscountDansFilled name: Discount Dans restock crate description: Contains a restock box for a Discount Dan's dispenser. components: @@ -281,8 +281,8 @@ amount: 2 - type: entity - id: CrateVendingMachineRestockDonutFilled parent: CratePlastic + id: CrateVendingMachineRestockDonutFilled name: Donut restock crate description: Contains a restock box for a Monkin' Donuts dispenser. components: