tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New and Modified Map Spawners (#34424)

Browse Source 
* Added spanwers and modified others

* adjusted values to be more in line with what I want

* this comment may have caused that test fail

* oh my god another typo

* Modified door crate to be engineering flavored

* reduced the pride vendor odds

Webedit lmao
This commit is contained in:
Southbridge
2025-01-15 19:56:12 -05:00
committed by GitHub
parent e094b79ee4
commit 87ff3a2421
7 changed files with 252 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Resources/Prototypes/Catalog/Fills/Crates/engineering.yml
View File

@@ -150,7 +150,7 @@
- type: entity - type: entity
id: CrateAirlockKit id: CrateAirlockKit
parent: CrateGenericSteel parent: CrateEngineering
name: airlock kit name: airlock kit
description: A kit for building 6 airlocks, doesn't include tools. description: A kit for building 6 airlocks, doesn't include tools.
components: components:
@@ -215,3 +215,31 @@
- type: StorageFill - type: StorageFill
contents: contents:
- id: SpaceHeaterFlatpack - id: SpaceHeaterFlatpack
- type: entityTable
id: RandomTechBoardTable
table: !type:GroupSelector
children:
- id: AirAlarmElectronics
- id: FireAlarmElectronics
- id: DoorElectronics
- id: FirelockElectronics
- id: APCElectronics
- id: SignalTimerElectronics
- id: SMESMachineCircuitboard
- id: SubstationMachineCircuitboard
- id: SpaceVillainArcadeComputerCircuitboard
- id: BlockGameArcadeComputerCircuitboard
- type: entity
id: CrateTechBoardRandom
parent: CrateEngineering
name: surplus boards
description: Surplus boards from somewhere.
components:
- type: EntityTableContainerFill
containers:
entity_storage: !type:NestedSelector
tableId: RandomTechBoardTable
rolls: !type:RangeNumberSelector
range: 3, 7

46
Resources/Prototypes/Catalog/Fills/Crates/materials.yml
View File

@@ -107,6 +107,52 @@
- id: SheetPaper - id: SheetPaper
amount: 3 amount: 3
- type: entityTable
id: RandomMaterialCrateTable
table: !type:GroupSelector
children:
- !type:GroupSelector # regular materials, 10
weight: 35
children:
- id: SheetGlass10
- id: SheetSteel10
- id: SheetPlastic10
- !type:GroupSelector # regular materials, stack
weight: 30
children:
- id: SheetGlass
- id: SheetSteel
- id: SheetPlastic
- !type:GroupSelector # secondary materials, stack
weight: 30
children:
- id: MaterialCloth
- id: SheetPlasteel
- id: MaterialWoodPlank
- id: PartRodMetal
- !type:GroupSelector # tertiary materials, singles
weight: 5
children:
- id: SheetPlasma1
- id: SheetUranium1
- id: IngotGold1
- id: IngotSilver1
- type: entity
id: CrateMaterialRandom
parent: CrateGenericSteel
name: surplus materials
description: Surplus materials from somewhere.
components:
- type: EntityTableContainerFill
containers:
entity_storage: !type:NestedSelector
tableId: RandomMaterialCrateTable
rolls: !type:RangeNumberSelector
range: 1, 3
# for some reason, the selector here adds 1 to whatever value it generates,
# so this is actually 2-4
#- type: entity #- type: entity
# id: CrateMaterialHFuelTank # id: CrateMaterialHFuelTank
# name: fueltank crate # name: fueltank crate

3
Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
View File

@@ -159,6 +159,9 @@
- !type:NestedSelector - !type:NestedSelector
tableId: SyndieMaintLoot tableId: SyndieMaintLoot
prob: 0.05 prob: 0.05
# Recursive
- id: ClosetMaintenanceFilledRandom
prob: 0.01
- type: entity - type: entity
id: ClosetMaintenanceFilledRandom id: ClosetMaintenanceFilledRandom

231
Resources/Prototypes/Entities/Markers/Spawners/Random/crates.yml
View File

@@ -3,26 +3,26 @@
id: CrateEmptySpawner id: CrateEmptySpawner
parent: MarkerBase parent: MarkerBase
components: components:
- type: Sprite - type: Sprite
layers: layers:
- state: red - state: red
- sprite: Structures/Storage/Crates/generic.rsi - sprite: Structures/Storage/Crates/generic.rsi
state: icon state: icon
- type: RandomSpawner - type: RandomSpawner
prototypes: prototypes:
- CrateGenericSteel - CrateGenericSteel
- CratePlastic - CratePlastic
- CrateFreezer - CrateFreezer
- CrateHydroponics - CrateHydroponics
- CrateMedical - CrateMedical
- CrateRadiation - CrateRadiation
- CrateInternals - CrateInternals
- CrateElectrical - CrateElectrical
- CrateEngineering - CrateEngineering
- CrateScience - CrateScience
- CrateSurgery - CrateSurgery
chance: 0.7 chance: 0.7
offset: 0.0 offset: 0.0
- type: entity - type: entity
name: Filled Crate Spawner name: Filled Crate Spawner
@@ -30,109 +30,112 @@
suffix: Low Value suffix: Low Value
parent: MarkerBase parent: MarkerBase
components: components:
- type: Sprite - type: Sprite
layers: layers:
- state: red - state: red
- sprite: Structures/Storage/Crates/o2.rsi - sprite: Structures/Storage/Crates/o2.rsi
state: icon state: icon
- type: RandomSpawner - type: RandomSpawner
prototypes: prototypes:
- CrateServiceReplacementLights - CrateServiceReplacementLights
- CrateServiceBureaucracy - CrateServiceBureaucracy
- CrateChemistrySupplies - CrateChemistrySupplies
- CrateMaterialGlass - CrateMaterialGlass
- CrateMaterialSteel - CrateMaterialSteel
- CrateMaterialPlastic - CrateMaterialPlastic
- CrateMaterialWood - CrateMaterialWood
- CrateMaterialPlasteel - CrateMaterialPlasteel
- CrateFunArtSupplies - CrateMaterialRandom
- CrateEngineeringCableLV - CrateFunArtSupplies
- CrateEngineeringCableMV - CrateEngineeringCableLV
- CrateEngineeringCableHV - CrateEngineeringCableMV
- CrateEngineeringCableBulk - CrateEngineeringCableHV
- CrateEmergencyFire - CrateEngineeringCableBulk
- CrateEmergencyInternals - CrateTechBoardRandom
- CrateEmergencyInflatablewall - CrateEmergencyFire
- CrateHydroponicsTools - CrateEmergencyInternals
- CrateHydroponicsSeeds - CrateEmergencyInflatablewall
chance: 0.7 - CrateHydroponicsTools
rarePrototypes: - CrateHydroponicsSeeds
- CrateMaterialPlasma - PetCarrier
- CrateHydroponicsSeedsExotic chance: 0.7
rareChance: 0.1 rarePrototypes:
offset: 0.0 - CrateMaterialPlasma
- CrateHydroponicsSeedsExotic
rareChance: 0.1
offset: 0.0
- type: entity - type: entity
name: random engineering crate spawner name: random engineering crate spawner
id: LootSpawnerRandomCrateEngineering id: LootSpawnerRandomCrateEngineering
parent: MarkerBase parent: MarkerBase
components: components:
- type: Sprite - type: Sprite
layers: layers:
- state: red - state: red
- sprite: Structures/Storage/Crates/engineering.rsi - sprite: Structures/Storage/Crates/engineering.rsi
state: icon state: icon
- type: RandomSpawner - type: RandomSpawner
rarePrototypes: rarePrototypes:
- CrateEngineeringSingularityGenerator - CrateEngineeringSingularityGenerator
- CrateEngineeringTeslaGenerator - CrateEngineeringTeslaGenerator
- CrateEngineeringTeslaGroundingRod - CrateEngineeringTeslaGroundingRod
- CrateEngineeringParticleAccelerator - CrateEngineeringParticleAccelerator
- CrateRCD - CrateRCD
- CrateEngineeringGear - CrateEngineeringGear
rareChance: 0.2 rareChance: 0.2
prototypes: prototypes:
- CrateEngineering - CrateEngineering
- CrateElectrical - CrateElectrical
- CrateEngineeringElectricalSupplies - CrateEngineeringElectricalSupplies
- CrateRCDAmmo - CrateRCDAmmo
- CrateEngineeringCableLV - CrateEngineeringCableLV
- CrateEngineeringCableMV - CrateEngineeringCableMV
- CrateEngineeringCableHV - CrateEngineeringCableHV
- CrateEngineeringCableBulk - CrateEngineeringCableBulk
- CrateEngineeringSingularityContainment - CrateEngineeringSingularityContainment
- CrateEngineeringSingularityCollector - CrateEngineeringSingularityCollector
- CrateEngineeringTeslaCoil - CrateEngineeringTeslaCoil
- CrateEngineeringSingularityEmitter - CrateEngineeringSingularityEmitter
- CrateEngineeringGyroscope - CrateEngineeringGyroscope
- CrateEngineeringThruster - CrateEngineeringThruster
- CrateEngineeringToolbox - CrateEngineeringToolbox
- CrateEngineeringShuttle - CrateEngineeringShuttle
- CrateEngineeringSolar - CrateEngineeringSolar
- CrateEngineeringJetpack - CrateEngineeringJetpack
- CrateEmergencyRadiation - CrateEmergencyRadiation
- CrateRadiation - CrateRadiation
chance: 0.9 chance: 0.9
offset: 0.0 offset: 0.0
- type: entity - type: entity
name: random security crate spawner name: random security crate spawner
id: LootSpawnerRandomCrateSecurity id: LootSpawnerRandomCrateSecurity
parent: MarkerBase parent: MarkerBase
components: components:
- type: Sprite - type: Sprite
layers: layers:
- state: red - state: red
- sprite: Structures/Storage/Crates/sec_gear.rsi - sprite: Structures/Storage/Crates/sec_gear.rsi
state: icon state: icon
- type: RandomSpawner - type: RandomSpawner
rarePrototypes: #Very useful stuff we probably don't want random people getting on space ruins often, even if there are hurdles to open it rarePrototypes: #Very useful stuff we probably don't want random people getting on space ruins often, even if there are hurdles to open it
- CrateArmoryShotgun - CrateArmoryShotgun
- CrateArmorySMG - CrateArmorySMG
- CrateSecurityRiot - CrateSecurityRiot
- CrateSecurityNonlethal - CrateSecurityNonlethal
rareChance: 0.1 rareChance: 0.1
prototypes: prototypes:
- CrateWeaponSecure - CrateWeaponSecure
- CrateArmoryLaser - CrateArmoryLaser
- CrateArmoryPistols - CrateArmoryPistols
- CrateTrainingBombs - CrateTrainingBombs
- CrateTrackingImplants - CrateTrackingImplants
- CrateSecurityTrackingMindshieldImplants - CrateSecurityTrackingMindshieldImplants
- CrateSecurityHelmet - CrateSecurityHelmet
- CrateSecurityArmor - CrateSecurityArmor
- CrateRestraints - CrateRestraints
- CrateEmergencyExplosive - CrateEmergencyExplosive
- CrateSecurityBiosuit - CrateSecurityBiosuit
chance: 0.9 chance: 0.9
offset: 0.0 offset: 0.0

77
Resources/Prototypes/Entities/Markers/Spawners/Random/vending.yml
View File

@@ -6,30 +6,59 @@
components: components:
- type: Sprite - type: Sprite
layers: layers:
- state: red - state: red
- sprite: Structures/Machines/VendingMachines/random.rsi - sprite: Structures/Machines/VendingMachines/random.rsi
state: any state: any
- type: RandomSpawner - type: RandomSpawner
prototypes: prototypes:
- VendingMachineChang - VendingMachineChang
- VendingMachineCigs - VendingMachineCigs
- VendingMachineCoffee - VendingMachineCoffee
- VendingMachineCola #Robust Sofdrinks - VendingMachineCola #Robust Sofdrinks
- VendingMachineColaBlack #Robust Sofdrinks [Black] - VendingMachineColaBlack #Robust Sofdrinks [Black]
- VendingMachineColaRed #Space Cola - VendingMachineColaRed #Space Cola
- VendingMachineDiscount - VendingMachineDiscount
- VendingMachineDonut - VendingMachineDonut
- VendingMachineDrGibb - VendingMachineDrGibb
- VendingMachinePwrGame - VendingMachinePwrGame
- VendingMachineShamblersJuice - VendingMachineShamblersJuice
- VendingMachineSmite - VendingMachineSmite
- VendingMachineSnack - VendingMachineSnack
- VendingMachineSnackBlue - VendingMachineSnackBlue
- VendingMachineSnackGreen - VendingMachineSnackGreen
- VendingMachineSnackOrange - VendingMachineSnackOrange
- VendingMachineSnackTeal - VendingMachineSnackTeal
- VendingMachineSoda #Robust Sofdrinks [Soda] - VendingMachineSoda #Robust Sofdrinks [Soda]
- VendingMachineSovietSoda #Boda - VendingMachineSovietSoda #Boda
- VendingMachineSpaceUp - VendingMachineSpaceUp
- VendingMachineStarkist - VendingMachineStarkist
chance: 1 chance: 1
- type: entityTable
id: ClothingVendorTable
table: !type:GroupSelector
children:
- id: VendingMachineClothing
weight: 40
- id: VendingMachineWinter
weight: 40
- id: VendingMachinePride
weight: 10
- id: VendingMachineTheater
weight: 10
- type: entity
id: RandomVendingClothing
name: random vending machine spawner
suffix: Clothing
parent: MarkerBase
components:
- type: Sprite
layers:
- state: red
- sprite: Structures/Machines/VendingMachines/random.rsi
state: clothing
- type: EntityTableSpawner
table: !type:NestedSelector
tableId: ClothingVendorTable

BIN
Resources/Textures/Structures/Machines/VendingMachines/random.rsi/clothing.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

5
Resources/Textures/Structures/Machines/VendingMachines/random.rsi/meta.json
View File

@@ -1,7 +1,7 @@
{ {
"version": 1, "version": 1,
"license": "CC-BY-SA-3.0", "license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062, cola and any sprite modified by potato1234x (github) for ss14", "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/a879151ef04192ae2a791278ee882c1bce7c5062, cola and any sprite modified by potato1234x (github) for ss14, clothing by Southbridge_fur (github) for SS14",
"size": { "size": {
"x": 32, "x": 32,
"y": 32 "y": 32
@@ -15,6 +15,9 @@
}, },
{ {
"name": "any" "name": "any"
},
{
"name": "clothing"
} }
] ]
} }