From a99f1da647a9fda4a270ae65e34bf71f722156c7 Mon Sep 17 00:00:00 2001 From: Nairod <110078045+Nairodian@users.noreply.github.com> Date: Tue, 8 Aug 2023 19:47:35 -0500 Subject: [PATCH] Add More Fluff To Maintenance Spawners (#18895) * Maintenance fluffing * And the gas analyzer --- .../Markers/Spawners/Random/maintenance.yml | 108 +++++++++++++++++- .../Objects/Materials/Sheets/glass.yml | 13 +++ .../Objects/Materials/Sheets/metal.yml | 28 +++++ .../Objects/Materials/Sheets/other.yml | 13 +++ .../Entities/Objects/Materials/materials.yml | 35 +++++- .../Entities/Objects/Materials/parts.yml | 17 +++ .../Objects/Tools/inflatable_wall.yml | 12 ++ 7 files changed, 221 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index ad5b9c67b4..3b805dda20 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -37,6 +37,21 @@ - CluwneHorn - ClothingMaskRat - MysteryFigureBox + - ClothingHandsGlovesMercFingerless + - ClothingHandsGlovesNitrile + - ClothingHandsGlovesPowerglove + - ClothingHeadHatAnimalHeadslime + - ClothingHeadHatBeretMerc + - ClothingHeadHatOutlawHat + - ClothingHeadHatUshanka + - ClothingHeadHatBunny + - ClothingMaskNeckGaiter + - ClothingNeckScarfStripedZebra + - ClothingOuterRobesCult + - ClothingOuterGhostSheet + - ClothingShoesCult + - ClothingUniformJumpsuitAncient + - ClothingUniformJumpsuitPirate rareChance: 0.01 prototypes: - Lighter @@ -60,6 +75,37 @@ - ClothingMaskRaven - ClothingMaskJackal - ClothingMaskBat + - ClothingBeltSuspenders + - ClothingEyesEyepatch + - ClothingEyesGlasses + - ClothingHandsGlovesLatex + - ClothingHandsGlovesFingerless + - ClothingHandsGlovesColorBlack + - ClothingHeadHatBeret + - ClothingHeadHatBowlerHat + - ClothingHeadHatFedoraBrown + - ClothingHeadHatFedoraGrey + - ClothingHeadHatFez + - ClothingHeadHatPaper + - ClothingHeadHatPirate + - ClothingHeadHatPirateTricord + - ClothingHeadHatTophat + - ClothingMaskSterile + - ClothingNeckHeadphones + - ClothingNeckTieRed + - ClothingOuterCoatGentle + - ClothingOuterCoatJensen + - ClothingOuterCoatLab + - ClothingOuterCoatPirate + - ClothingOuterHoodieBlack + - ClothingOuterHoodieGrey + - ClothingOuterVestHazard + - ClothingShoesBootsJack + - ClothingShoesBootsLaceup + - ClothingShoesLeather + - ClothingShoesBootsSalvage + - ClothingShoesBootsWork + - ClothingShoesTourist chance: 0.6 offset: 0.0 @@ -80,22 +126,59 @@ - LanternFlash - PowerCellHigh - NetProbeCartridge + - WelderIndustrial + - SheetPlasteel10 + - ClothingMaskGasExplorer rareChance: 0.08 prototypes: - FlashlightLantern - YellowOxygenTankFilled - DoubleEmergencyOxygenTankFilled - ToolboxEmergencyFilled + - NitrogenTankFilled - ToolboxElectricalFilled - ToolboxMechanicalFilled - - ClothingBeltUtilityFilled + - ClothingBeltUtility - Shovel - Welder - WeaponFlareGun - - SheetSteel - - SheetPlastic + - SheetSteel10 + - SheetPlastic10 + - SheetGlass10 + - PartRodMetal10 + - MaterialCardboard10 + - MaterialCloth10 + - MaterialWoodPlank10 - ResearchDisk - Plunger + - TechnologyDisk + - PowerCellMedium + - PowerCellSmall + - Wirecutter + - Screwdriver + - Wrench + - Crowbar + - NetworkConfigurator + - trayScanner + - GasAnalyzer + - AirlockPainter + - AppraisalTool + - Flare + - HandheldGPSBasic + - HandLabeler + - GlowstickBase + - Bucket + - RadioHandheld + - GeigerCounter + - Beaker + - ClothingMaskGas + - ClothingMaskBreath + - DoorElectronics + - APCElectronics + - InflatableWallStack5 + - CableHVStack10 + - CableMVStack10 + - CableApcStack10 chance: 0.6 offset: 0.0 @@ -115,6 +198,10 @@ - Machete - BaseBallBat - CombatKnife + - Spear + - RifleStock + - ModularReceiver + - HydroponicsToolScythe rareChance: 0.05 prototypes: - FlashlightLantern @@ -126,9 +213,22 @@ - Shovel - Welder - WeaponFlareGun - - Spear - LidSalami - ClothingEyesBlindfold + - ClothingMaskMuzzle + - ClothingMaskGasSecurity + - ShardGlass + - Syringe + - Mousetrap + - Brutepack1 + - Ointment1 + - Gauze1 + - Bola + - SurvivalKnife + - ScalpelShiv + - Shiv + - SawImprov + - HydroponicsToolMiniHoe chance: 0.6 offset: 0.0 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml index 5c87bc6116..76dc23b69b 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -74,6 +74,19 @@ graph: Glass node: SheetGlass +- type: entity + parent: SheetGlass + id: SheetGlass10 + suffix: 10 + components: + - type: Sprite + state: glass + - type: Stack + stackType: Glass + count: 10 + - type: Item + size: 10 + - type: entity parent: SheetGlass id: SheetGlass1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml index b6f6c93d36..725fb93441 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml @@ -70,6 +70,20 @@ - ReagentId: Lead Quantity: 0.5 +- type: entity + parent: SheetSteel + id: SheetSteel10 + name: steel + suffix: 10 + components: + - type: Item + size: 10 + - type: Sprite + state: steel + - type: Stack + stackType: Steel + count: 10 + - type: entity parent: SheetSteel id: SheetSteel1 @@ -110,6 +124,20 @@ heldPrefix: plasteel - type: Appearance +- type: entity + parent: SheetPlasteel + id: SheetPlasteel10 + name: plasteel + suffix: 10 + components: + - type: Sprite + state: plasteel + - type: Stack + stackType: Plasteel + count: 10 + - type: Item + size: 10 + - type: entity parent: SheetPlasteel id: SheetPlasteel1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml index 500a88918e..85c659378a 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml @@ -142,6 +142,19 @@ size: 30 - type: Appearance +- type: entity + parent: SheetPlastic + id: SheetPlastic10 + name: plastic + suffix: 10 + components: + - type: Sprite + state: plastic + - type: Item + size: 10 + - type: Stack + count: 10 + - type: entity parent: SheetPlastic id: SheetPlastic1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index f777cffdd7..eb28eb5729 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -51,6 +51,18 @@ - type: Item size: 30 +- type: entity + parent: MaterialCardboard + id: MaterialCardboard10 + suffix: 10 + components: + - type: Sprite + state: cardboard + - type: Stack + count: 10 + - type: Item + size: 10 + - type: entity parent: MaterialCardboard id: MaterialCardboard1 @@ -120,7 +132,18 @@ - DroneUsable - Gauze - RawMaterial - + +- type: entity + parent: MaterialCloth + id: MaterialCloth10 + suffix: 10 + components: + - type: Sprite + state: cloth + - type: Stack + count: 10 + - type: Item + size: 10 - type: entity parent: MaterialCloth @@ -213,6 +236,16 @@ - type: Item heldPrefix: wood +- type: entity + parent: MaterialWoodPlank + id: MaterialWoodPlank10 + suffix: 10 + components: + - type: Stack + count: 10 + - type: Item + size: 10 + - type: entity parent: MaterialWoodPlank id: MaterialWoodPlank1 diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml index f5494de815..5606de22b9 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml @@ -60,6 +60,23 @@ - type: StackPrice price: 5 +- type: entity + parent: PartRodMetal + id: PartRodMetal10 + name: metal rod + suffix: 10 + components: + - type: Tag + tags: + - RodMetal1 + - DroneUsable + - type: Sprite + state: rods + - type: Stack + count: 10 + - type: Item + size: 10 + - type: entity parent: PartRodMetal id: PartRodMetal1 diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml index 35cf2f54dc..b3d117dced 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml @@ -50,6 +50,18 @@ - DroneUsable # TODO: Add stack sprites + visuals. +- type: entity + parent: InflatableWallStack + id: InflatableWallStack5 + suffix: 5 + components: + - type: Sprite + state: item_wall + - type: Item + size: 5 + - type: Stack + count: 5 + - type: entity parent: InflatableWallStack id: InflatableWallStack1