Update spawners (DeltaV-Station#579)

Co-authored-by: Jeff <> (cherry picked from commit 7a2f304)
DebugOk · Jan 20, 2024 · 3c382bb · 3c382bb
1 parent a1d931d
commit 3c382bb
Show file tree

Hide file tree

Showing 11 changed files with 146 additions and 4 deletions.
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_single.yml
@@ -60,6 +60,7 @@
       - FoodTacoFish
       - FoodTacoBeefSupreme
       - FoodTacoChickenSupreme
+      - FoodMealGrilledCheese  # Delta V
     chance: 0.8
     offset: 0.0
     #rare

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
@@ -45,5 +45,8 @@
       - FoodFrozenSnowconeRainbow
       - FoodSnackPistachios
       - FoodSnackSemki
+      - FoodPSB # Delta V
+      - FoodLollipop # Delta V
+      - FoodGumball # Delta V
     chance: 0.8
     offset: 0.0
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/techboard.yml
@@ -21,12 +21,24 @@
     - SMESMachineCircuitboard
     - SubstationMachineCircuitboard
     - TelecomServerCircuitboard
+    - PortableGeneratorPacmanMachineCircuitboard # Delta V - Add additional boards
+    - CellRechargerCircuitboard # Delta V - Add additional boards
+    - BorgChargerCircuitboard # Delta V - Add additional boards
+    - WeaponCapacitorRechargerCircuitboard # Delta V - Add additional boards
+    - StationMapCircuitboard # Delta V - Add additional boards
+    - DeepFryerMachineCircuitboard # Delta V - Add additional boards
     chance: 0.95
     rarePrototypes:
     - CommsComputerCircuitboard
-    - ShuttleConsoleCircuitboard
+    #- ShuttleConsoleCircuitboard # Delta V - Remove shuttle boards
     - ComputerMassMediaCircuitboard
     - AutolatheMachineCircuitboard
     - ProtolatheMachineCircuitboard
     - SalvageMagnetMachineCircuitboard
+    - PortableGeneratorSuperPacmanMachineCircuitboard # Delta V - Add additional boards
+    - PortableGeneratorJrPacmanMachineCircuitboard # Delta V - Add additional boards
+    - MedicalTechFabCircuitboard # Delta V - Add additional boards
+    - ResearchAndDevelopmentServerMachineCircuitboard # Delta V - Add additional boards
+    - UniformPrinterMachineCircuitboard # Delta V - Add additional boards
+    - ArtifactAnalyzerMachineCircuitboard # Delta V - Add additional boards
     rareChance: 0.05
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/animals.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/animals.yml
@@ -23,6 +23,7 @@
       - MobParrot
       - MobPenguin
       - MobPossum
+      - MobPossumOld
       - MobRaccoon
       - MobFox
       - MobArcticFox
@@ -38,10 +39,13 @@
       - MobGiantSpiderAngry
       - MobCorgi
       - MobCorgiNarsi
+      - MobCorgiPuppy
       - MobCrab
       - MobCatSpace
+      - MobCatKitten
       - MobSloth
       - MobFerret
+      - MobFerretWhite
       - MobLizard
       - MobSlug
       - MobFrog

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boardgames.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boardgames.yml
@@ -14,6 +14,27 @@
         - CheckerBoard
         - ChessBoard
         - ParchisBoard
-        # - ShogiBoard
+        - BattlemapBoardSpawner
+        # - ShogiBoard # Needs to be ported from Nyano
+      chance: 1
+      offset: 0.0
+
+- type: entity
+  name: Battlemap Board Spawner
+  id: BattlemapBoardSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: red
+        - sprite: Objects/Fun/Tabletop/Battlemaps/grassbm.rsi
+          state: icon
+    - type: RandomSpawner
+      prototypes:
+        - GrassBattlemap
+        - MoonBattlemap
+        - SandBattlemap
+        - SnowBattlemap
+        - ShipBattlemap
       chance: 1
       offset: 0.0
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml
@@ -2,10 +2,11 @@
   parent: MarkerBase
   id: RandomBook
   name: random book spawner
+  placement:
+    mode: PlaceFree # want to be able to free place books for stacks, etc.
   components:
   - type: Sprite
     layers:
-      - state: red
       - sprite: Objects/Misc/books.rsi
         state: book6
   - type: RandomSpawner

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml
@@ -32,16 +32,23 @@
       - BoxLatexGloves
       - BoxBodyBag
       - BoxBeaker
+      - BoxVial
+      - BoxCandle
+      - BoxCandleSmall
+      - BoxDarts
     chance: 0.7
     rarePrototypes:
       - BoxHugHealing
       - BoxSurvivalMedical
       - BoxNitrileGloves
       - BoxMouthSwab
       - BoxHandcuff
+      - BoxHeadset
       - BoxFlashbang
       - BoxZiptie
       - PresentRandom
+      - BoxHolyWater
+      - MysteryFigureBox
     rareChance: 0.05
 
 
@@ -91,6 +98,8 @@
       - BoxMagazineCaselessRifleRubber
       - BoxMagazinePistolCaselessRiflePractice
       - BoxMagazineCaselessRifleRubber
+      - BoxMagazineUniversalMagnumPractice
+      - BoxMagazineUniversalMagnumRubber
     chance: 0.15
     rarePrototypes:
       - BoxMagazinePistolCaselessRifle
@@ -109,4 +118,7 @@
       - BoxShotgunIncendiary
       - BoxMagazineRifle
       - BoxMagazineCaselessRifleRubber
+      - BoxShellSoulbreaker
+      - BoxMagazineUniversalMagnum
+      - BoxSpeedLoaderLightRifle
     rareChance: 0.015
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml
@@ -21,10 +21,12 @@
       - SeedExtractorMachineCircuitboard
       - SMESMachineCircuitboard
       - SubstationMachineCircuitboard
+      - PortableGeneratorJrPacmanMachineCircuitboard
       - PortableGeneratorPacmanMachineCircuitboard
       - PortableGeneratorSuperPacmanMachineCircuitboard
       - ReagentGrinderMachineCircuitboard
       - OreProcessorMachineCircuitboard
+      - MaterialReclaimerMachineCircuitboard
       - MicrowaveMachineCircuitboard
       - SurveillanceWirelessCameraMovableCircuitboard
       - PowerComputerCircuitboard
@@ -56,6 +58,19 @@
       - EmitterCircuitboard
       - SurveillanceCameraWirelessRouterCircuitboard
       - SurveillanceWirelessCameraMonitorCircuitboard
+      - SurveillanceWirelessCameraAnchoredCircuitboard
+      - NotekeeperCartridge
+      - NewsReadCartridge
+      - GeigerCounter
+      - Holoprojector
+      - HolofanProjector
+      - StationMapCircuitboard
+      - AnomalyVesselCircuitboard
+      - CellRechargerCircuitboard
+      - BorgChargerCircuitboard
+      - HotplateMachineCircuitboard
+      - ElectricGrillMachineCircuitboard
+      - FatExtractorMachineCircuitboard
     chance: 0.8
     rarePrototypes:
       - TraversalDistorterMachineCircuitboard
@@ -69,4 +84,27 @@
       - CryoPodMachineCircuitboard
       - BodyScannerComputerCircuitboard
       - CloningConsoleComputerCircuitboard
+      - CrewManifestCartridge
+      - NetProbeCartridge
+      - HandTeleporter
+      - HoloprojectorSecurity
+      - HoloprojectorEngineering
+      - HandheldStationMap
+      - ComputerMassMediaCircuitboard
+      - SensorConsoleCircuitboard
+      - AmmoTechFabCircuitboard
+      - ArtifactCrusherMachineCircuitboard
+      - AnomalyVesselExperimentalCircuitboard
+      - CondenserMachineCircuitBoard
+      - CrewMonitoringServerMachineCircuitboard
+      - WeaponCapacitorRechargerCircuitboard
+      - ElectrolysisUnitMachineCircuitboard
+      - CentrifugeMachineCircuitboard
+      - SheetifierMachineCircuitboard
+      - TelecomServerCircuitboard
+      - MiniGravityGeneratorCircuitboard
+      - Portafib
+      - ShockCollar
+      - GlimmerMonitorCartridge
+      - PotatoAIChip
     rareChance: 0.25
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml
@@ -39,6 +39,9 @@
         - ClothingHeadHatWeldingMaskFlame
         - ClothingHeadHatWeldingMaskFlameBlue
         - ClothingHeadHatWeldingMaskPainted
+        - ClothingHeadCage
+        - ClothingHeadHelmetKendoMen
+        - ClothingHeadBandMerc
       rareChance: 0.03
       prototypes:
         - ClothingHeadHatAnimalCat
@@ -93,5 +96,7 @@
         - ClothingHeadHatWelding
         - ClothingHeadHatFlatBlack
         - ClothingHeadHatFlatBrown
+        - ClothingHeadTinfoil
+        - ClothingHeadHatStrawHat
       chance: 0.5
       offset: 0.2
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/randomitems.yml
@@ -35,10 +35,14 @@
       - ShardGlass
       - ShardGlassReinforced
       - ShardGlassPlasma
+      - ShardGlassUranium
       - MaterialCloth1
       - MaterialDurathread1
       - MaterialWoodPlank1
-      - MaterialCotton
+      - MaterialCotton1
+      - MaterialCardboard1
+      - MaterialWebSilk1
+      - MaterialBones1
       - SheetPlastic1
       - SheetSteel1
       - SheetGlass1
@@ -61,6 +65,8 @@
       - ColoredLightTubeFrostyBlue
       - ColoredLightTubeBlackLight
       - LightBulbMaintenanceRed
+      - LightBulbBroken
+      - LightTubeBroken
       - PowerCellPotato
       - PowerCellSmallPrinted
       - ChemistryEmptyBottle03
@@ -114,6 +120,23 @@
       - ClothingShoesTourist
       - ClothingUnderSocksBee
       - ClothingUnderSocksCoder
+      - CarvedPumpkinSmall
+      - CarvedPumpkinLarge
+      - DartBlue
+      - DartPurple
+      - DartYellow
+      - CandleRed
+      - CandleBlue
+      - CandleBlack
+      - CandleGreen
+      - CandlePurple
+      - BlankHandyFlag
+      - LGBTQHandyFlag
+      - PirateHandyFlag
+      - Fork
+      - Spoon
+      - KnifePlastic
+      - FishLabeler
     chance: 0.75
     rarePrototypes:
       - CigCartonGreen
@@ -127,19 +150,27 @@
       - SmokingPipeFilledCannabis
       - DiceBag
       - PersonalAI
+      - PotatoAI
       - PartRodMetal
       - IngotSilver1
       - CigarGold
       - IngotGold1
       - GoldOre1
+      - SilverOre1
       - SteelOre1
       - PlasmaOre1
       - SpaceQuartz1
       - UraniumOre1
+      - BananiumOre1
       - SheetUranium1
       - SheetPlasma1
       - SheetPlasteel1
       - SheetPGlass1
+      - SheetUGlass1
+      - MaterialSheetMeat1
+      - MaterialBiomass1
+      - MaterialBananium1
+      - MaterialBluespace1
       - Cablecuffs
       - Zipties
       - MonkeyCubeBox
@@ -148,6 +179,7 @@
       - PowerCellMediumPrinted
       - WoodenBuckler
       - MakeshiftShield
+      - WebShield
       - DehydratedSpaceCarp
       - RobustHarvestChemistryBottle
       - UnstableMutagenChemistryBottle
@@ -158,6 +190,7 @@
       - Brutepack
       - Gauze
       - AloeCream
+      - StrangePill
       # Pills/Syringes???
       - Medkit
       - MedkitBurn
@@ -192,4 +225,8 @@
       - ClothingHandsGlovesNitrile
       - ClothingOuterStraightjacket
       - ClothingShoesGaloshes
+      - HypoDart
+      - MrChips
+      - MrDips
+      - ProximitySensor
     rareChance: 0.05
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml
@@ -44,6 +44,10 @@
         - GrapeSeeds
         - CocoaSeeds
         - BerrySeeds
+        - BungoSeeds
+        - PeaSeeds
+        - PumpkinSeeds
+        - CottonSeeds
       chance: 0.95
       offset: 0.0
       rarePrototypes:
@@ -56,4 +60,8 @@
         - BloodTomatoSeeds
         - BlueTomatoSeeds
         - ChillySeeds
+        - MimanaSeeds
+        - LemoonSeeds
+        - SteelcapSeeds
+        - KoibeanSeeds
       rareChance: 0.05