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

Changes - name: in StorageFillComponent.cs to - id: (#4051)

Browse Source 
* Changes all - name: fields to - id: fields to make more sense in StorageFillComponent.cs

* Fixes test
This commit is contained in:
Swept
2021-05-21 21:30:03 +00:00
committed by GitHub
parent 9954764c58
commit 4ca854b142
40 changed files with 556 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.IntegrationTests/Tests/StorageFillTest.cs
View File

@@ -26,14 +26,14 @@ namespace Content.IntegrationTests.Tests
foreach (var entry in storage.Contents)
{
var name = entry.PrototypeName;
var id = entry.PrototypeId;
if (name == null)
if (id == null)
{
continue;
}
Assert.That(protoManager.HasIndex<EntityPrototype>(name), $"Unable to find StorageFill prototype of {name} in prototype {proto.ID}");
Assert.That(protoManager.HasIndex<EntityPrototype>(id), $"Unable to find StorageFill prototype of {id} in prototype {proto.ID}");
Assert.That(entry.Amount > 0, $"Specified invalid amount of {entry.Amount} for prototype {proto.ID}");
Assert.That(entry.SpawnProbability > 0, $"Specified invalid probability of {entry.SpawnProbability} for prototype {proto.ID}");
}

29
Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
var alreadySpawnedGroups = new List<string>();
foreach (var storageItem in _contents)
{
if (string.IsNullOrEmpty(storageItem.PrototypeName)) continue;
if (string.IsNullOrEmpty(storageItem.PrototypeId)) continue;
if (!string.IsNullOrEmpty(storageItem.GroupId) && alreadySpawnedGroups.Contains(storageItem.GroupId)) continue;
if (storageItem.SpawnProbability != 1f &&
@@ -51,7 +51,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
for (var i = 0; i < storageItem.Amount; i++)
{
storage.Insert(Owner.EntityManager.SpawnEntity(storageItem.PrototypeName, Owner.Transform.Coordinates));
storage.Insert(Owner.EntityManager.SpawnEntity(storageItem.PrototypeId, Owner.Transform.Coordinates));
}
if (!string.IsNullOrEmpty(storageItem.GroupId)) alreadySpawnedGroups.Add(storageItem.GroupId);
}
@@ -61,35 +61,38 @@ namespace Content.Server.GameObjects.Components.Items.Storage
[DataDefinition]
public struct StorageFillEntry : IPopulateDefaultValues
{
[DataField("name", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string? PrototypeName;
[DataField("id", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string? PrototypeId;
[DataField("prob")]
public float SpawnProbability;
/// <summary>
/// orGroup signifies to pick between multiple entities on spawn.
/// The probability that an item will spawn. Takes decimal form so 0.05 is 5%, 0.50 is 50% etc.
/// </summary>
[DataField("orGroup")]
public string GroupId;
/// <summary>
/// orGroup signifies to pick between entities designated with an ID.
///
/// <example>
/// <para>To define an orGroup in a StorageFill component
/// you need to add it to the entities you want to choose between.
/// <para>To define an orGroup in a StorageFill component you
/// need to add it to the entities you want to choose between and
/// add a prob field. In this example there is a 50% chance the storage
/// spawns with Y or Z.
///
/// </para>
/// <code>
/// - type: StorageFill
/// contents:
/// - name: X
/// - name: Y
/// prob: 0.50
/// orGroup: YOrZ
/// - name: Z
/// orGroup: YOrZ
///
///
///
/// </code>
/// </example>
/// </summary>
[DataField("orGroup")]
public string GroupId;
[DataField("amount")]
public int Amount;

24
Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/backpack.yml
View File

@@ -5,7 +5,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -14,7 +14,7 @@
components:
- type: StorageFill
contents:
- name: BoxHug
- id: BoxHug
- type: entity
abstract: true
@@ -23,8 +23,8 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- name: Flash
- id: BoxSurvival
- id: Flash
- type: entity
abstract: true
@@ -33,8 +33,8 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- name: Medkit
- id: BoxSurvival
- id: Medkit
- type: entity
abstract: true
@@ -43,7 +43,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
#- name: StationCharter
#- name: TelescopicBaton
@@ -54,7 +54,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -63,7 +63,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -72,7 +72,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -81,7 +81,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -90,4 +90,4 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival

22
Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/duffelbag.yml
View File

@@ -5,7 +5,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -14,7 +14,7 @@
components:
- type: StorageFill
contents:
- name: BoxHug
- id: BoxHug
- type: entity
abstract: true
@@ -23,8 +23,8 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- name: Flash
- id: BoxSurvival
- id: Flash
- type: entity
abstract: true
@@ -33,8 +33,8 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- name: Medkit
- id: BoxSurvival
- id: Medkit
- type: entity
abstract: true
@@ -43,7 +43,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
#- name: StationCharter
#- name: TelescopicBaton
@@ -54,7 +54,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -63,7 +63,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -72,7 +72,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
#- type: entity
# abstract: true
@@ -81,4 +81,4 @@
# components:
# - type: StorageFill
# contents:
# - name: BoxSurvival
# - id: BoxSurvival

22
Resources/Prototypes/Catalog/Fills/Backpacks/Starter Gear/satchel.yml
View File

@@ -5,7 +5,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
#- type: entity
# abstract: true
@@ -14,7 +14,7 @@
# components:
# - type: StorageFill
# contents:
# - name: BoxHug
# - id: BoxHug
- type: entity
abstract: true
@@ -23,8 +23,8 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- name: Flash
- id: BoxSurvival
- id: Flash
- type: entity
abstract: true
@@ -33,8 +33,8 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- name: Medkit
- id: BoxSurvival
- id: Medkit
- type: entity
abstract: true
@@ -43,7 +43,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
#- name: StationCharter
#- name: TelescopicBaton
@@ -54,7 +54,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -63,7 +63,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -72,7 +72,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival
- type: entity
abstract: true
@@ -81,4 +81,4 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- id: BoxSurvival

82
Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
View File

@@ -6,12 +6,12 @@
components:
- type: StorageFill
contents:
- name: Hemostat
- name: Saw
- name: Drill
- name: Cautery
- name: Retractor
- name: Scalpel
- id: Hemostat
- id: Saw
- id: Drill
- id: Cautery
- id: Retractor
- id: Scalpel
- type: entity
parent: ClothingBackpackDuffelSyndicateMedical
@@ -21,12 +21,12 @@
components:
- type: StorageFill
contents:
- name: Hemostat
- name: Saw
- name: Drill
- name: Cautery
- name: Retractor
- name: Scalpel
- id: Hemostat
- id: Saw
- id: Drill
- id: Cautery
- id: Retractor
- id: Scalpel
- type: entity
parent: ClothingBackpackDuffelSyndicateAmmo
@@ -36,10 +36,10 @@
components:
- type: StorageFill
contents:
- name: ShotgunBojevic
- name: MagazineShotgun
- name: MagazineShotgunBeanbag
# - name: ThermalImagingGoggles
- id: ShotgunBojevic
- id: MagazineShotgun
- id: MagazineShotgunBeanbag
# - id: ThermalImagingGoggles
- type: entity
parent: ClothingBackpackDuffelSyndicateAmmo
@@ -49,10 +49,10 @@
components:
- type: StorageFill
contents:
- name: SmgC20r
- name: MagazinePistolSmg
- id: SmgC20r
- id: MagazinePistolSmg
amount: 2
# - name: SMGSuppressor
# - id: SMGSuppressor
- type: entity
parent: ClothingBackpackDuffelSyndicateAmmo
@@ -62,8 +62,8 @@
components:
- type: StorageFill
contents:
- name: LMGL6
- name: MagazineLRifleBox
- id: LMGL6
- id: MagazineLRifleBox
- type: entity
parent: ClothingBackpackDuffelSyndicateAmmo
@@ -73,12 +73,12 @@
components:
- type: StorageFill
contents:
- name: LauncherChinaLake
- name: GrenadeBlast
- id: LauncherChinaLake
- id: GrenadeBlast
amount: 3
- name: GrenadeFlash
- id: GrenadeFlash
amount: 3
- name: GrenadeFrag
- id: GrenadeFrag
amount: 3
- type: Storage
capacity: 200
@@ -91,16 +91,16 @@
components:
- type: StorageFill
contents:
- name: ClothingHeadHatCaptain
- name: ClothingEyesGlassesSunglasses
- name: ClothingUniformJumpsuitCentcomOfficial
- name: ClothingShoesBootsJack
- name: ClothingHandsGlovesColorGray
- name: ClothingHeadsetService
- name: ClothingOuterVestKevlar
- name: Paper
- name: Pen
- name: CentcomPDA
- id: ClothingHeadHatCaptain
- id: ClothingEyesGlassesSunglasses
- id: ClothingUniformJumpsuitCentcomOfficial
- id: ClothingShoesBootsJack
- id: ClothingHandsGlovesColorGray
- id: ClothingHeadsetService
- id: ClothingOuterVestKevlar
- id: Paper
- id: Pen
- id: CentcomPDA
- type: entity
parent: ClothingBackpackDuffelClown
@@ -110,9 +110,9 @@
components:
- type: StorageFill
contents:
- name: ClothingUniformJumpsuitClown
- name: ClothingShoesClown
- name: ClothingMaskClown
- name: BikeHorn
- name: ClownPDA
- name: ClothingHeadsetService
- id: ClothingUniformJumpsuitClown
- id: ClothingShoesClown
- id: ClothingMaskClown
- id: BikeHorn
- id: ClownPDA
- id: ClothingHeadsetService

16
Resources/Prototypes/Catalog/Fills/Boxes/general.yml
View File

@@ -6,7 +6,7 @@
components:
- type: StorageFill
contents:
- name: LightBulb
- id: LightBulb
amount: 12
- type: Sprite
layers:
@@ -22,7 +22,7 @@
components:
- type: StorageFill
contents:
- name: LightTube
- id: LightTube
amount: 12
- type: Sprite
layers:
@@ -38,9 +38,9 @@
components:
- type: StorageFill
contents:
- name: LightTube
- id: LightTube
amount: 6
- name: LightBulb
- id: LightBulb
amount: 6
- type: Sprite
layers:
@@ -56,7 +56,7 @@
components:
- type: StorageFill
contents:
- name: AssistantPDA
- id: AssistantPDA
amount: 3
- type: Sprite
layers:
@@ -74,7 +74,7 @@
components:
- type: StorageFill
contents:
- name: ClothingEyesGlassesMeson
- id: ClothingEyesGlassesMeson
amount: 4
- type: Sprite
layers:
@@ -92,8 +92,8 @@
components:
- type: StorageFill
contents:
- name: ClothingMaskBreath
- name: EmergencyOxygenTankFilled
- id: ClothingMaskBreath
- id: EmergencyOxygenTankFilled
#- name: Injector
- type: Sprite
layers:

6
Resources/Prototypes/Catalog/Fills/Boxes/medical.yml
View File

@@ -6,7 +6,7 @@
components:
- type: StorageFill
contents:
- name: Syringe
- id: Syringe
amount: 6
- type: Sprite
layers:
@@ -25,7 +25,7 @@
components:
- type: StorageFill
contents:
- name: ClothingMaskSterile
- id: ClothingMaskSterile
amount: 4
- type: Sprite
layers:
@@ -44,7 +44,7 @@
components:
- type: StorageFill
contents:
- name: ClothingHandsGlovesLatex
- id: ClothingHandsGlovesLatex
amount: 4
- type: Sprite
layers:

4
Resources/Prototypes/Catalog/Fills/Boxes/science.yml
View File

@@ -6,9 +6,9 @@
components:
- type: StorageFill
contents:
- name: Beaker
- id: Beaker
amount: 3
- name: LargeBeaker
- id: LargeBeaker
amount: 3
- type: Sprite
layers:

6
Resources/Prototypes/Catalog/Fills/Boxes/security.yml
View File

@@ -6,7 +6,7 @@
components:
- type: StorageFill
contents:
- name: Handcuffs
- id: Handcuffs
amount: 6
- type: Sprite
layers:
@@ -25,7 +25,7 @@
components:
- type: StorageFill
contents:
- name: GrenadeFlashBang
- id: GrenadeFlashBang
amount: 4
- type: Sprite
layers:
@@ -44,7 +44,7 @@
components:
- type: StorageFill
contents:
- name: ClothingEyesGlassesSecurity
- id: ClothingEyesGlassesSecurity
amount: 4
- type: Sprite
layers:

8
Resources/Prototypes/Catalog/Fills/Crates/armory.yml
View File

@@ -6,9 +6,9 @@
components:
- type: StorageFill
contents:
- name: SmgDrozd
- id: SmgDrozd
amount: 2
- name: MagazineMagnumSmg
- id: MagazineMagnumSmg
amount: 4
- type: entity
@@ -19,7 +19,7 @@
components:
- type: StorageFill
contents:
- name: ShotgunGladstone
- id: ShotgunGladstone
amount: 2
- name: ShellShotgun
- id: ShellShotgun
amount: 18

60
Resources/Prototypes/Catalog/Fills/Crates/botany.yml
View File

@@ -6,19 +6,19 @@
components:
- type: StorageFill
contents:
- name: BananaSeeds
- id: BananaSeeds
amount: 2
- name: EggySeeds
- id: EggySeeds
amount: 2
- name: TowercapSeeds
- id: TowercapSeeds
amount: 2
# - name: NettleSeeds
# - id: NettleSeeds
# amount: 2
# - name: RainbowBunchSeeds
# - id: RainbowBunchSeeds
# amount: 2
# - name: StrangeSeeds
# - id: StrangeSeeds
# amount: 2
# - name: BunchaOfMyceliumSeeds
# - id: BunchaOfMyceliumSeeds
# amount: 2
- type: entity
@@ -29,21 +29,21 @@
components:
- type: StorageFill
contents:
- name: HydroponicsToolMiniHoe
- id: HydroponicsToolMiniHoe
amount: 1
- name: PlantBGoneSpray
- id: PlantBGoneSpray
amount: 1
- name: WeedSpray
- id: WeedSpray
amount: 1
- name: PestSpray
- id: PestSpray
amount: 1
- name: HydroponicsToolScythe
- id: HydroponicsToolScythe
amount: 1
- name: HydroponicsToolHatchet
- id: HydroponicsToolHatchet
amount: 1
- name: ClothingOuterApronBotanist
- id: ClothingOuterApronBotanist
amount: 1
- name: ClothingHandsGlovesLeather
- id: ClothingHandsGlovesLeather
amount: 1
- type: entity
@@ -54,33 +54,33 @@
components:
- type: StorageFill
contents:
# - name: ChiliSeeds
# - id: ChiliSeeds
# amount: 1
# - name: CottonSeeds
# - id: CottonSeeds
# amount: 1
# - name: BerrySeeds
# - id: BerrySeeds
# amount: 1
- name: CornSeeds
- id: CornSeeds
amount: 1
- name: EggplantSeeds
- id: EggplantSeeds
amount: 1
- name: TomatoSeeds
- id: TomatoSeeds
amount: 1
# - name: SoybeanSeeds
# - id: SoybeanSeeds
# amount: 1
- name: WheatSeeds
- id: WheatSeeds
amount: 1
# - name: RiceSeeds
# - id: RiceSeeds
# amount: 1
- name: CarrotSeeds
- id: CarrotSeeds
amount: 1
# - name: SunflowerSeeds
# - id: SunflowerSeeds
# amount: 1
- name: ChanterelleSeeds
- id: ChanterelleSeeds
amount: 1
- name: PotatoSeeds
- id: PotatoSeeds
amount: 1
- name: SugarcaneSeeds
- id: SugarcaneSeeds
amount: 1
- name: LemonSeeds
- id: LemonSeeds
amount: 1

42
Resources/Prototypes/Catalog/Fills/Crates/emergency.yml
View File

@@ -5,17 +5,17 @@
components:
- type: StorageFill
contents:
- name: ClothingHeadHelmetBombSuit
- id: ClothingHeadHelmetBombSuit
amount: 1
- name: ClothingMaskGas
- id: ClothingMaskGas
amount: 1
- name: Screwdriver
- id: Screwdriver
amount: 1
- name: Wirecutter
- id: Wirecutter
amount: 1
- name: Multitool
- id: Multitool
amount: 1
- name: ClothingOuterSuitBomb
- id: ClothingOuterSuitBomb
amount: 1
- type: entity
@@ -25,17 +25,17 @@
components:
- type: StorageFill
contents:
- name: FlashlightLantern
- id: FlashlightLantern
amount: 2
- name: FireExtinguisher
- id: FireExtinguisher
amount: 2
- name: ClothingHeadHatHardhatRed
- id: ClothingHeadHatHardhatRed
amount: 2
- name: ClothingMaskGas
- id: ClothingMaskGas
amount: 2
- name: ClothingOuterSuitFire
- id: ClothingOuterSuitFire
amount: 2
- name: RedOxygenTank
- id: RedOxygenTank
amount: 2
- type: entity
@@ -45,13 +45,13 @@
components:
- type: StorageFill
contents:
- name: ClothingMaskGas
- id: ClothingMaskGas
amount: 3
- name: ClothingMaskBreath
- id: ClothingMaskBreath
amount: 3
- name: OxygenTankFilled
- id: OxygenTankFilled
amount: 3
- name: EmergencyOxygenTankFilled
- id: EmergencyOxygenTankFilled
amount: 3
- type: entity
@@ -61,13 +61,13 @@
components:
- type: StorageFill
contents:
- name: ClothingOuterSuitRad
- id: ClothingOuterSuitRad
amount: 2
- name: ClothingHeadHatHoodRad
- id: ClothingHeadHatHoodRad
amount: 2
# - name: GeigerCounter
# - id: GeigerCounter
# amount: 2
- name: DrinkVodkaBottleFull
- id: DrinkVodkaBottleFull
amount: 1
- name: DrinkShotGlass
- id: DrinkShotGlass
amount: 2

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

@@ -5,17 +5,17 @@
components:
- type: StorageFill
contents:
- name: ClothingBeltUtility
- id: ClothingBeltUtility
amount: 2
- name: ClothingEyesGlassesMeson
- id: ClothingEyesGlassesMeson
amount: 2
- name: ClothingHeadHatHardhatYellow
- id: ClothingHeadHatHardhatYellow
amount: 2
- name: ClothingHeadHatWeldingMaskFlame # Replace with regular welding mask when we have it.
- id: ClothingHeadHatWeldingMaskFlame # Replace with regular welding mask when we have it.
amount: 2
- name: ClothingOuterVestHazard
- id: ClothingOuterVestHazard
amount: 3
- name: ClothingHandsGlovesColorYellow
- id: ClothingHandsGlovesColorYellow
amount: 2
- type: entity
@@ -25,9 +25,9 @@
components:
- type: StorageFill
contents:
- name: ToolboxMechanical
- id: ToolboxMechanical
amount: 2
- name: ToolboxElectricalFilled
- id: ToolboxElectricalFilled
amount: 2
#- type: entity
@@ -37,11 +37,11 @@
# components:
# - type: StorageFill
# contents:
# - name: PowerCellLargeStandard
# - id: PowerCellLargeStandard
# amount: 3
# - name: PowerCellMediumStandard
# - id: PowerCellMediumStandard
# amount: 3
# - name: PowerCellSmallAutorecharge
# - id: PowerCellSmallAutorecharge
# amount: 3
- type: entity
@@ -51,7 +51,7 @@
components:
- type: StorageFill
contents:
- name: ApcExtensionCableStack
- id: ApcExtensionCableStack
amount: 3
- type: entity
@@ -61,7 +61,7 @@
components:
- type: StorageFill
contents:
- name: MVWireStack
- id: MVWireStack
amount: 3
- type: entity
@@ -71,7 +71,7 @@
components:
- type: StorageFill
contents:
- name: HVWireStack
- id: HVWireStack
amount: 3
- type: entity
@@ -81,9 +81,9 @@
components:
- type: StorageFill
contents:
- name: HVWireStack
- id: HVWireStack
amount: 2
- name: MVWireStack
- id: MVWireStack
amount: 2
- name: ApcExtensionCableStack
- id: ApcExtensionCableStack
amount: 2

34
Resources/Prototypes/Catalog/Fills/Crates/engines.yml
View File

@@ -8,7 +8,7 @@
components:
- type: StorageFill
contents:
- name: AMEPart
- id: AMEPart
amount: 9
- type: entity
@@ -19,7 +19,7 @@
components:
- type: StorageFill
contents:
- name: AMEJar
- id: AMEJar
amount: 3
- type: entity
@@ -30,7 +30,7 @@
components:
- type: StorageFill
contents:
- name: AMEControllerUnanchored
- id: AMEControllerUnanchored
amount: 1
# Singularity
@@ -43,7 +43,7 @@
components:
- type: StorageFill
contents:
- name: Emitter
- id: Emitter
amount: 1
- type: entity
@@ -54,7 +54,7 @@
components:
- type: StorageFill
contents:
- name: RadiationCollector
- id: RadiationCollector
amount: 1
- type: entity
@@ -65,7 +65,7 @@
components:
- type: StorageFill
contents:
- name: ContainmentFieldGenerator
- id: ContainmentFieldGenerator
amount: 1
- type: entity
@@ -76,7 +76,7 @@
components:
- type: StorageFill
contents:
- name: SingularityGenerator
- id: SingularityGenerator
amount: 1
# Particle Accelerator
@@ -89,19 +89,19 @@
components:
- type: StorageFill
contents:
- name: MachineParticleAcceleratorEndCapCircuitboard
- id: MachineParticleAcceleratorEndCapCircuitboard
amount: 1
- name: MachineParticleAcceleratorEmitterLeftCircuitboard
- id: MachineParticleAcceleratorEmitterLeftCircuitboard
amount: 1
- name: MachineParticleAcceleratorEmitterCenterCircuitboard
- id: MachineParticleAcceleratorEmitterCenterCircuitboard
amount: 1
- name: MachineParticleAcceleratorEmitterRightCircuitboard
- id: MachineParticleAcceleratorEmitterRightCircuitboard
amount: 1
- name: MachineParticleAcceleratorFuelChamberCircuitboard
- id: MachineParticleAcceleratorFuelChamberCircuitboard
amount: 1
- name: MachineParticleAcceleratorPowerBoxCircuitboard
- id: MachineParticleAcceleratorPowerBoxCircuitboard
amount: 1
- name: ParticleAcceleratorComputerCircuitboard
- id: ParticleAcceleratorComputerCircuitboard
amount: 1
# Non-functional for some reason
@@ -114,7 +114,7 @@
# components:
# - type: StorageFill
# contents:
# - name: Singularity
# - id: Singularity
# amount: 1
- type: entity
@@ -124,7 +124,7 @@
components:
- type: StorageFill
contents:
- name: DebugGenerator
- id: DebugGenerator
amount: 1
- type: entity
@@ -134,5 +134,5 @@
components:
- type: StorageFill
contents:
- name: SolarAssemblyPart
- id: SolarAssemblyPart
amount: 6

44
Resources/Prototypes/Catalog/Fills/Crates/fun.yml
View File

@@ -5,19 +5,19 @@
components:
- type: StorageFill
contents:
- name: PlushieBee
- id: PlushieBee
amount: 1
- name: PlushieNar
- id: PlushieNar
amount: 1
- name: PlushieCarp
- id: PlushieCarp
amount: 1
- name: PlushieNuke
- id: PlushieNuke
amount: 1
- name: PlushieSlime
- id: PlushieSlime
amount: 1
- name: PlushieSnake
- id: PlushieSnake
amount: 1
- name: PlushieLizard
- id: PlushieLizard
amount: 1
- type: entity
@@ -28,31 +28,31 @@
components:
- type: StorageFill
contents:
- name: SynthesizerInstrument
- id: SynthesizerInstrument
amount: 1
- name: AcousticGuitarInstrument
- id: AcousticGuitarInstrument
amount: 1
- name: ViolinInstrument
- id: ViolinInstrument
amount: 1
- name: TrumpetInstrument
- id: TrumpetInstrument
amount: 1
- name: ElectricGuitarInstrument
- id: ElectricGuitarInstrument
amount: 1
- name: AccordionInstrument
- id: AccordionInstrument
amount: 1
- name: HarmonicaInstrument
- id: HarmonicaInstrument
amount: 1
- name: RecorderInstrument
- id: RecorderInstrument
amount: 1
- name: TromboneInstrument
- id: TromboneInstrument
amount: 1
- name: SaxophoneInstrument
- id: SaxophoneInstrument
amount: 1
- name: GlockenspielInstrument
- id: GlockenspielInstrument
amount: 1
- name: BanjoInstrument
- id: BanjoInstrument
amount: 1
- name: BikeHornInstrument
- id: BikeHornInstrument
amount: 1
- type: entity
@@ -62,7 +62,7 @@
components:
- type: StorageFill
contents:
- name: CrayonBox
- id: CrayonBox
amount: 1
- name: CrayonWhite
- id: CrayonWhite
amount: 1

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

@@ -5,7 +5,7 @@
components:
- type: StorageFill
contents:
- name: SheetGlass
- id: SheetGlass
amount: 3
- type: entity
@@ -15,7 +15,7 @@
components:
- type: StorageFill
contents:
- name: SheetSteel
- id: SheetSteel
amount: 3
- type: entity
@@ -25,7 +25,7 @@
components:
- type: StorageFill
contents:
- name: SheetPlastic
- id: SheetPlastic
amount: 3
- type: entity
@@ -35,7 +35,7 @@
components:
- type: StorageFill
contents:
- name: MaterialWoodPlank
- id: MaterialWoodPlank
amount: 1
- type: entity
@@ -45,7 +45,7 @@
components:
- type: StorageFill
contents:
- name: WeldingFuelTank
- id: WeldingFuelTank
amount: 1
#- type: entity
@@ -55,7 +55,7 @@
# components:
# - type: StorageFill
# contents:
# - name: WeldingFuelTank
# - id: WeldingFuelTank
# amount: 1
- type: entity
@@ -65,7 +65,7 @@
components:
- type: StorageFill
contents:
- name: WaterTankFull
- id: WaterTankFull
amount: 1
#- type: entity
@@ -75,7 +75,7 @@
# components:
# - type: StorageFill
# contents:
# - name: WaterTankFull
# - id: WaterTankFull
# amount: 1
- type: entity
@@ -85,5 +85,5 @@
components:
- type: StorageFill
contents:
- name: SheetPlasteel
- id: SheetPlasteel
amount: 1

34
Resources/Prototypes/Catalog/Fills/Crates/medical.yml
View File

@@ -5,7 +5,7 @@
components:
- type: StorageFill
# contents:
# - name: Defibrillator
# - id: Defibrillator
# amount: 1
- type: entity
@@ -15,9 +15,9 @@
components:
- type: StorageFill
contents:
- name: MedkitFilled
- id: MedkitFilled
amount: 2
- name: Gauze
- id: Gauze
amount: 2
- type: entity
@@ -27,19 +27,19 @@
components:
- type: StorageFill
contents:
- name: Scalpel
- id: Scalpel
amount: 1
- name: Retractor
- id: Retractor
amount: 1
- name: Cautery
- id: Cautery
amount: 1
- name: Drill
- id: Drill
amount: 1
- name: Saw
- id: Saw
amount: 1
- name: Hemostat
- id: Hemostat
amount: 1
- name: ClothingMaskSterile
- id: ClothingMaskSterile
amount: 1
- type: entity
@@ -49,17 +49,17 @@
components:
- type: StorageFill
contents:
- name: UniformScrubsColorGreen
- id: UniformScrubsColorGreen
amount: 1
- name: UniformScrubsColorPurple
- id: UniformScrubsColorPurple
amount: 1
- name: UniformScrubsColorBlue
- id: UniformScrubsColorBlue
amount: 1
- name: HatBandBlue
- id: HatBandBlue
amount: 1
- name: HatBandRed
- id: HatBandRed
amount: 1
- name: HatBandGreen
- id: HatBandGreen
amount: 1
- name: ClothingMaskSterile
- id: ClothingMaskSterile
amount: 3

26
Resources/Prototypes/Catalog/Fills/Crates/npc.yml
View File

@@ -5,7 +5,7 @@
components:
- type: StorageFill
contents:
- name: BeeMob_Content
- id: BeeMob_Content
amount: 8
@@ -16,7 +16,7 @@
components:
- type: StorageFill
contents:
- name: ButterflyMob_Content
- id: ButterflyMob_Content
amount: 5
@@ -27,7 +27,7 @@
components:
- type: StorageFill
contents:
- name: CatMob_Content
- id: CatMob_Content
amount: 1
@@ -38,7 +38,7 @@
components:
- type: StorageFill
contents:
- name: ChickenMob_Content
- id: ChickenMob_Content
amount: 4
@@ -49,7 +49,7 @@
components:
- type: StorageFill
contents:
- name: CorgiMob_Content
- id: CorgiMob_Content
amount: 1
- type: entity
@@ -59,7 +59,7 @@
components:
- type: StorageFill
contents:
- name: CowMob_Content
- id: CowMob_Content
amount: 1
@@ -70,7 +70,7 @@
components:
- type: StorageFill
contents:
- name: GoatMob_Content
- id: GoatMob_Content
amount: 1
@@ -81,7 +81,7 @@
components:
- type: StorageFill
contents:
- name: GooseMob_Content
- id: GooseMob_Content
amount: 2
@@ -92,7 +92,7 @@
components:
- type: StorageFill
contents:
- name: GorillaMob_Content
- id: GorillaMob_Content
amount: 1
@@ -103,7 +103,7 @@
components:
- type: StorageFill
contents:
- name: MonkeyCubeBox
- id: MonkeyCubeBox
amount: 1
@@ -114,7 +114,7 @@
components:
- type: StorageFill
contents:
- name: ParrotMob_Content
- id: ParrotMob_Content
amount: 3
@@ -125,7 +125,7 @@
components:
- type: StorageFill
contents:
- name: PenguinMob_Content
- id: PenguinMob_Content
amount: 2
@@ -136,5 +136,5 @@
components:
- type: StorageFill
contents:
- name: SnakeMob_Content
- id: SnakeMob_Content
amount: 3

26
Resources/Prototypes/Catalog/Fills/Crates/security.yml
View File

@@ -6,7 +6,7 @@
components:
- type: StorageFill
contents:
- name: ClothingOuterArmorBulletproof
- id: ClothingOuterArmorBulletproof
amount: 3
- type: entity
@@ -17,7 +17,7 @@
components:
- type: StorageFill
contents:
- name: ClothingHeadHelmetHelmet
- id: ClothingHeadHelmetHelmet
amount: 3
- type: entity
@@ -27,13 +27,13 @@
components:
- type: StorageFill
contents:
- name: TaserGun
- id: TaserGun
amount: 3
- name: Stunbaton
- id: Stunbaton
amount: 3
- name: BoxFlashbang
- id: BoxFlashbang
amount: 1
- name: Flash
- id: Flash
amount: 3
# - Pepperspray
# - GrenadeTeargas
@@ -45,7 +45,7 @@
components:
- type: StorageFill
contents:
- name: LaserGun
- id: LaserGun
amount: 3
- type: entity
@@ -55,13 +55,13 @@
components:
- type: StorageFill
contents:
- name: ClothingOuterArmorRiot
- id: ClothingOuterArmorRiot
amount: 2
- name: ClothingHeadHelmetRiot
- id: ClothingHeadHelmetRiot
amount: 2
- name: ShotgunGladstone
- id: ShotgunGladstone
amount: 2
- name: ShellShotgunBeanbag
- id: ShellShotgunBeanbag
amount: 12
# - ShieldRiot
# - SecGasmask
@@ -73,9 +73,9 @@
components:
- type: StorageFill
contents:
- name: BoxHandcuff
- id: BoxHandcuff
amount: 1
- name: BoxSechud
- id: BoxSechud
amount: 1
# - SecBelt
# - SecGasmask

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

@@ -6,17 +6,17 @@
components:
- type: StorageFill
contents:
- name: MopItem
- id: MopItem
amount: 1
- name: MopBucket
- id: MopBucket
amount: 1
- name: Bucket
- id: Bucket
amount: 3
- name: WetFloorSign
- id: WetFloorSign
amount: 2
- name: Soap
- id: Soap
amount: 1
- name: SprayBottleSpaceCleaner
- id: SprayBottleSpaceCleaner
amount: 2
- type: entity
@@ -27,9 +27,9 @@
components:
- type: StorageFill
contents:
- name: BoxLighttube
- id: BoxLighttube
amount: 1
- name: BoxLightbulb
- id: BoxLightbulb
amount: 1
- type: entity
@@ -40,20 +40,20 @@
components:
- type: StorageFill
contents:
- name: CigCartonGreen
- id: CigCartonGreen
prob: 0.50
orGroup: CigCarton1
- name: CigCartonRed
- id: CigCartonRed
orGroup: CigCarton1
- name: CigCartonBlue
- id: CigCartonBlue
prob: 0.50
orGroup: CigCarton2
- name: CigCartonBlack
- id: CigCartonBlack
orGroup: CigCarton2
- name: CigarGoldCase
- id: CigarGoldCase
prob: 0.05
orGroup: Cigars
- name: CigarCase
- id: CigarCase
orGroup: Cigars
- name: Matchbox
- id: Matchbox
amount: 2

40
Resources/Prototypes/Catalog/Fills/Items/belt.yml
View File

@@ -5,12 +5,12 @@
components:
- type: StorageFill
contents:
- name: Crowbar
- name: Wrench
- name: Screwdriver
- name: Wirecutter
- name: Welder
- name: Multitool
- id: Crowbar
- id: Wrench
- id: Screwdriver
- id: Wirecutter
- id: Welder
- id: Multitool
- type: entity
id: ClothingBeltChiefEngineerFilled
@@ -19,12 +19,12 @@
components:
- type: StorageFill
contents:
- name: PowerDrill
- name: Wirecutter
- name: Crowbar
- name: WelderExperimental
- name: Multitool
- name: ApcExtensionCableStack
- id: PowerDrill
- id: Wirecutter
- id: Crowbar
- id: WelderExperimental
- id: Multitool
- id: ApcExtensionCableStack
- type: entity
id: ClothingBeltSecurityFilled
@@ -33,11 +33,11 @@
components:
- type: StorageFill
contents:
- name: GrenadeFlashBang
- name: GrenadeFlashBang
- name: Stunbaton
- name: Handcuffs
- name: Handcuffs
- id: GrenadeFlashBang
- id: GrenadeFlashBang
- id: Stunbaton
- id: Handcuffs
- id: Handcuffs
- type: entity
id: ClothingBeltJanitorFilled
@@ -46,8 +46,8 @@
components:
- type: StorageFill
contents:
- name: Soap #Make a soap group and pick between when i'm not lazy
- name: SprayBottleSpaceCleaner
- id: Soap #Make a soap group and pick between when i'm not lazy
- id: SprayBottleSpaceCleaner
#- name: GrenadeChem
#- name: GrenadeChem
- name: FlashlightLantern
- id: FlashlightLantern

46
Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
View File

@@ -6,17 +6,17 @@
components:
- type: StorageFill
contents:
- name: CrowbarRed
- id: CrowbarRed
amount: 1
- name: ClothingMaskBreath
- id: ClothingMaskBreath
amount: 2
- name: FoodSnackChocolate
- name: FlashlightLantern
- id: FoodSnackChocolate
- id: FlashlightLantern
amount: 2
- name: HarmonicaInstrument
- id: HarmonicaInstrument
prob: 0.15
orGroup: HarmonicaOrChocolate
- name: FoodSnackChocolate
- id: FoodSnackChocolate
orGroup: HarmonicaOrChocolate
- type: entity
@@ -27,15 +27,15 @@
components:
- type: StorageFill
contents:
- name: Screwdriver
- name: Crowbar
- name: Wirecutter
- name: ApcExtensionCableStack
- name: MVWireStack
- name: ClothingHandsGlovesColorYellow
- id: Screwdriver
- id: Crowbar
- id: Wirecutter
- id: ApcExtensionCableStack
- id: MVWireStack
- id: ClothingHandsGlovesColorYellow
prob: 0.05
orGroup: GlovesOrWires
- name: HVWireStack
- id: HVWireStack
orGroup: GlovesOrWires
- type: entity
@@ -46,13 +46,13 @@
components:
- type: StorageFill
contents:
- name: Screwdriver
- name: Wrench
- name: Welder
- name: Crowbar
- name: Multitool
- name: Wirecutter
- name: ClothingHandsGlovesCombat
- id: Screwdriver
- id: Wrench
- id: Welder
- id: Crowbar
- id: Multitool
- id: Wirecutter
- id: ClothingHandsGlovesCombat
- type: entity
id: ToolboxGoldFilled
@@ -62,10 +62,10 @@
components:
- type: StorageFill
contents:
- name: IngotGold
- id: IngotGold
amount: 5
- name: DrinkGoldenCup
- id: DrinkGoldenCup
prob: 0.05
orGroup: CupOrGold
- name: IngotGold
- id: IngotGold
orGroup: CupOrGold

62
Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
View File

@@ -5,33 +5,33 @@
components:
- type: StorageFill
contents:
- name: ClothingOuterVestHazard
- id: ClothingOuterVestHazard
prob: 0.4
- name: FlashlightLantern
- id: FlashlightLantern
prob: 0.7
- name: Screwdriver
- id: Screwdriver
prob: 0.7
- name: Wrench
- id: Wrench
prob: 0.7
- name: Welder
- id: Welder
prob: 0.7
- name: Crowbar
- id: Crowbar
prob: 0.7
- name: Wirecutter
- id: Wirecutter
prob: 0.7
- name: Multitool
- id: Multitool
prob: 0.2
- name: ClothingBeltUtility
- id: ClothingBeltUtility
prob: 0.2
- name: ClothingHandsGlovesColorYellow
- id: ClothingHandsGlovesColorYellow
prob: 0.05
- name: ClothingHeadHatHardhatRed
- id: ClothingHeadHatHardhatRed
prob: 0.4
- name: ApcExtensionCableStack
- id: ApcExtensionCableStack
prob: 0.3
- name: ApcExtensionCableStack
- id: ApcExtensionCableStack
prob: 0.3
- name: ApcExtensionCableStack
- id: ApcExtensionCableStack
prob: 0.3
- type: entity
@@ -41,15 +41,15 @@
components:
- type: StorageFill
contents:
- name: ToolboxElectricalFilled
- id: ToolboxElectricalFilled
prob: 0.7
- name: FirelockElectronics
- id: FirelockElectronics
prob: 0.05
- name: APCElectronics
- id: APCElectronics
prob: 0.1
- name: MVWireStack
- id: MVWireStack
prob: 0.2
- name: ApcExtensionCableStack
- id: ApcExtensionCableStack
prob: 0.3
- type: entity
@@ -59,11 +59,11 @@
components:
- type: StorageFill
contents:
- name: WelderMini
- id: WelderMini
prob: 1
- name: Welder
- id: Welder
prob: 0.1
- name: ClothingHeadHatWelding
- id: ClothingHeadHatWelding
prob: 0.5
- type: entity
@@ -73,10 +73,10 @@
components:
- type: StorageFill
contents:
- name: ClothingHeadHelmetHardsuitAtmos
- name: ClothingOuterHardsuitAtmos
- name: ClothingMaskBreath
- name: OxygenTankFilled
- id: ClothingHeadHelmetHardsuitAtmos
- id: ClothingOuterHardsuitAtmos
- id: ClothingMaskBreath
- id: OxygenTankFilled
- type: entity
id: LockerEngineerFilled
@@ -85,11 +85,11 @@
components:
- type: StorageFill
contents:
- name: ClothingHeadHelmetHardsuitEngineering
- name: ClothingOuterHardsuitEngineering
- name: ClothingMaskBreath
- name: OxygenTankFilled
- name: ClothingShoesBootsMag
- id: ClothingHeadHelmetHardsuitEngineering
- id: ClothingOuterHardsuitEngineering
- id: ClothingMaskBreath
- id: OxygenTankFilled
- id: ClothingShoesBootsMag
prob: 0.15
- type: entity

148
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View File

@@ -5,25 +5,25 @@
components:
- type: StorageFill
contents:
- name: ClothingNeckCloakQm
- id: ClothingNeckCloakQm
prob: 1
- name: ClothingHeadsetCargo
- id: ClothingHeadsetCargo
prob: 1
- name: PlushieLizard
- id: PlushieLizard
prob: 0.1
- name: ClothingHandsGlovesColorBrown
- id: ClothingHandsGlovesColorBrown
prob: 1
- name: ClothingOuterSuitFire
- id: ClothingOuterSuitFire
prob: 0.5
- name: ClothingShoesColorBrown
- id: ClothingShoesColorBrown
prob: 0.7
- name: ClothingHeadHatCargosoft
- id: ClothingHeadHatCargosoft
prob: 0.8
- name: SupplyRequestComputerCircuitboard
- id: SupplyRequestComputerCircuitboard
prob: 1
- name: SupplyComputerCircuitboard
- id: SupplyComputerCircuitboard
prob: 1
- name: CigPackGreen
- id: CigPackGreen
prob: 0.50
- type: entity
@@ -33,31 +33,31 @@
components:
- type: StorageFill
contents:
- name: NukeDisk
- id: NukeDisk
prob: 1
- name: CaptainIDCard
- id: CaptainIDCard
prob: 1
- name: ClothingHeadHatCaptain
- id: ClothingHeadHatCaptain
prob: 1
- name: ClothingNeckCloakCap
- id: ClothingNeckCloakCap
prob: 1
- name: ClothingHandsGlovesCaptain
- id: ClothingHandsGlovesCaptain
prob: 1
- name: ClothingOuterHardsuitCap
- id: ClothingOuterHardsuitCap
prob: 1
- name: TaserGun
- id: TaserGun
prob: 1
- name: ClothingShoesColorBlack
- id: ClothingShoesColorBlack
prob: 0.7
- name: ClothingHeadHelmetHardsuitCap
- id: ClothingHeadHelmetHardsuitCap
prob: 1
- name: CommsComputerCircuitboard
- id: CommsComputerCircuitboard
prob: 1
- name: ClothingHeadsetAltCommand
- id: ClothingHeadsetAltCommand
prob: 1
- name: PlushieNuke
- id: PlushieNuke
prob: 0.1
- name: CigarGoldCase
- id: CigarGoldCase
prob: 0.25
- type: entity
@@ -67,25 +67,25 @@
components:
- type: StorageFill
contents:
- name: ClothingNeckCloakHop
- id: ClothingNeckCloakHop
prob: 1
- name: ClothingHeadHatHopcap
- id: ClothingHeadHatHopcap
prob: 1
- name: HoPIDCard
- id: HoPIDCard
prob: 0.9
- name: ClothingHeadsetCommand
- id: ClothingHeadsetCommand
prob: 1
- name: BoxPDA
- id: BoxPDA
prob: 1
- name: IDComputerCircuitboard
- id: IDComputerCircuitboard
prob: 1
- name: TaserGun
- id: TaserGun
prob: 1
- name: ClothingShoesColorBlack
- id: ClothingShoesColorBlack
prob: 0.7
- name: PlushieLizard
- id: PlushieLizard
prob: 0.1
- name: CigarGoldCase
- id: CigarGoldCase
prob: 0.10
# Fuck the HoP they don't deserve fucking cigars.
@@ -96,16 +96,16 @@
components:
- type: StorageFill
contents:
- name: ClothingHeadHelmetHardsuitEngineeringWhite
- name: ClothingOuterHardsuitEngineeringWhite
- name: ClothingMaskBreath
- name: OxygenTankFilled
- name: ClothingNeckCloakCe
- name: ClothingEyesGlassesMeson
- name: ClothingBeltChiefEngineerFilled
- name: ClothingHeadHatBeretEngineering
- name: ClothingShoesBootsMag
- name: CigarCase
- id: ClothingHeadHelmetHardsuitEngineeringWhite
- id: ClothingOuterHardsuitEngineeringWhite
- id: ClothingMaskBreath
- id: OxygenTankFilled
- id: ClothingNeckCloakCe
- id: ClothingEyesGlassesMeson
- id: ClothingBeltChiefEngineerFilled
- id: ClothingHeadHatBeretEngineering
- id: ClothingShoesBootsMag
- id: CigarCase
prob: 0.15
- type: entity
@@ -115,21 +115,21 @@
components:
- type: StorageFill
contents:
- name: MedkitFilled
- id: MedkitFilled
prob: 1
- name: ClothingHandsGlovesLatex
- id: ClothingHandsGlovesLatex
prob: 1
#- name: ClothingEyesHudMedical #Removed until working properly
# prob: 1
- name: ClothingHeadsetAltMedical
- id: ClothingHeadsetAltMedical
prob: 1
- name: ClothingCloakCmo
- id: ClothingCloakCmo
prob: 1
- name: ClothingBackpackDuffelSurgeryFilled
- id: ClothingBackpackDuffelSurgeryFilled
prob: 1
- name: ClothingOuterCoatLabCmo
- id: ClothingOuterCoatLabCmo
prob: 1
- name: ClothingMaskSterile
- id: ClothingMaskSterile
prob: 1
- type: entity
@@ -139,15 +139,15 @@
components:
- type: StorageFill
contents:
- name: ResearchComputerCircuitboard
- id: ResearchComputerCircuitboard
prob: 1
- name: ProtolatheMachineCircuitboard
- id: ProtolatheMachineCircuitboard
prob: 1
- name: ClothingNeckCloakRd
- id: ClothingNeckCloakRd
prob: 1
- name: ClothingHeadsetMedicalScience
- id: ClothingHeadsetMedicalScience
prob: 1
- name: PlushieSlime
- id: PlushieSlime
prob: 0.1
- type: entity
@@ -157,41 +157,41 @@
components:
- type: StorageFill
contents:
- name: TaserGun
- id: TaserGun
prob: 1
- name: ClothingHeadHatBeretHoS
- id: ClothingHeadHatBeretHoS
prob: 1
- name: ClothingHeadHatHoshat
- id: ClothingHeadHatHoshat
prob: 1
- name: ClothingNeckCloakHos
- id: ClothingNeckCloakHos
prob: 1
- name: ClothingOuterCoatHoSTrench
- id: ClothingOuterCoatHoSTrench
prob: 1
- name: ClothingUniformJumpskirtHoSAlt
- id: ClothingUniformJumpskirtHoSAlt
prob: 1
- name: ClothingUniformJumpsuitHoSAlt
- id: ClothingUniformJumpsuitHoSAlt
prob: 1
- name: ClothingUniformJumpsuitHoSBlue
- id: ClothingUniformJumpsuitHoSBlue
prob: 0.5
- name: ClothingUniformJumpsuitHoSGrey
- id: ClothingUniformJumpsuitHoSGrey
prob: 0.5
- name: ClothingUniformJumpsuitHoSParadeMale
- id: ClothingUniformJumpsuitHoSParadeMale
prob: 0.1
- name: ClothingUniformJumpskirtHoSParadeMale
- id: ClothingUniformJumpskirtHoSParadeMale
prob: 0.1
- name: ClothingHeadHelmetHardsuitSecurityRed
- id: ClothingHeadHelmetHardsuitSecurityRed
prob: 1
- name: ClothingOuterHardsuitSecurityRed
- id: ClothingOuterHardsuitSecurityRed
prob: 1
- name: DrinkVacuumFlask
- id: DrinkVacuumFlask
prob: 0.8
- name: ClothingBeltSecurityFilled
- id: ClothingBeltSecurityFilled
prob: 1
- name: ClothingHeadsetAltSecurity
- id: ClothingHeadsetAltSecurity
prob: 1
- name: ClothingEyesGlassesSecurity
- id: ClothingEyesGlassesSecurity
prob: 1
- name: ClothingShoesBootsJack
- id: ClothingShoesBootsJack
prob: 1
- name: CigarGoldCase
- id: CigarGoldCase
prob: 0.50

26
Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
View File

@@ -10,33 +10,33 @@
components:
- type: StorageFill
contents:
- name: ClothingHandsGlovesLatex
- id: ClothingHandsGlovesLatex
prob: 1
- name: ClothingHeadsetMedical
- id: ClothingHeadsetMedical
prob: 1
# - name: ClothingEyesHudMedical #Removed until working properly
# - id: ClothingEyesHudMedical #Removed until working properly
# prob: 1
- name: ClothingBeltMedical
- id: ClothingBeltMedical
prob: 1
- name: ClothingHeadHatSurgcapBlue
- id: ClothingHeadHatSurgcapBlue
prob: 1
orGroup: Surgcaps
- name: ClothingHeadHatSurgcapGreen
- id: ClothingHeadHatSurgcapGreen
prob: 0.1
orGroup: Surgcaps
- name: ClothingHeadHatSurgcapPurple
- id: ClothingHeadHatSurgcapPurple
prob: 0.05
orGroup: Surgcaps
- name: UniformScrubsColorBlue
- id: UniformScrubsColorBlue
prob: 0.5
orGroup: Surgshrubs
- name: UniformScrubsColorGreen
- id: UniformScrubsColorGreen
prob: 0.1
orGroup: Surgshrubs
- name: UniformScrubsColorPurple
- id: UniformScrubsColorPurple
prob: 0.05
orGroup: Surgshrubs
- name: ClothingMaskSterile
- id: ClothingMaskSterile
prob: 1
- type: entity
@@ -46,7 +46,7 @@
components:
- type: StorageFill
contents:
- name: BoxSyringe
- id: BoxSyringe
prob: 1
- name: BoxBeaker
- id: BoxBeaker
prob: 1

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

@@ -10,15 +10,15 @@
components:
- type: StorageFill
contents:
- name: ToolboxEmergencyFilled
- id: ToolboxEmergencyFilled
prob: 0.4
- name: ClothingMaskBreath
- id: ClothingMaskBreath
prob: 0.4
- name: ClothingMaskBreath
- id: ClothingMaskBreath
prob: 0.25
- name: EmergencyOxygenTankFilled
- id: EmergencyOxygenTankFilled
prob: 0.4
- name: OxygenTankFilled
- id: OxygenTankFilled
prob: 0.2
- type: entity
@@ -28,7 +28,7 @@
components:
- type: StorageFill
contents:
- name: RedOxygenTankFilled
- id: RedOxygenTankFilled
prob: 0.6
- name: ClothingOuterSuitFire
- id: ClothingOuterSuitFire
prob: 0.75

50
Resources/Prototypes/Catalog/Fills/Lockers/security.yml
View File

@@ -5,23 +5,23 @@
components:
- type: StorageFill
contents:
- name: TaserGun
- id: TaserGun
prob: 0.3
- name: ClothingHeadHatWarden
- id: ClothingHeadHatWarden
prob: 1
- name: ClothingHeadHatBeretWarden
- id: ClothingHeadHatBeretWarden
prob: 1
- name: ClothingBeltSecurityFilled
- id: ClothingBeltSecurityFilled
prob: 1
- name: Flash
- id: Flash
prob: 1
- name: ClothingEyesGlassesSecurity
- id: ClothingEyesGlassesSecurity
prob: 1
- name: ClothingHeadsetAltSecurity
- id: ClothingHeadsetAltSecurity
prob: 1
- name: ClothingHandsGlovesCombat
- id: ClothingHandsGlovesCombat
prob: 1
- name: ClothingShoesBootsJack
- id: ClothingShoesBootsJack
prob: 1
- type: entity
@@ -31,23 +31,23 @@
components:
- type: StorageFill
contents:
- name: ClothingUniformJumpsuitSecGrey
- id: ClothingUniformJumpsuitSecGrey
prob: 0.3
- name: ClothingHeadHelmetHelmet
- id: ClothingHeadHelmetHelmet
prob: 1
- name: ClothingOuterArmorBulletproof
- id: ClothingOuterArmorBulletproof
prob: 1
- name: ClothingBeltSecurityFilled
- id: ClothingBeltSecurityFilled
prob: 1
- name: Flash
- id: Flash
prob: 0.5
- name: ClothingEyesGlassesSecurity
- id: ClothingEyesGlassesSecurity
prob: 1
- name: ClothingHeadsetSecurity
- id: ClothingHeadsetSecurity
prob: 1
- name: ClothingHandsGlovesColorBlack
- id: ClothingHandsGlovesColorBlack
prob: 1
- name: ClothingShoesBootsJack
- id: ClothingShoesBootsJack
prob: 1
- type: entity
@@ -57,13 +57,13 @@
components:
- type: StorageFill
contents:
- name: ClothingHeadHatFedoraBrown
- id: ClothingHeadHatFedoraBrown
prob: 1
- name: ClothingNeckTieDet
- id: ClothingNeckTieDet
prob: 1
- name: ClothingOuterVestDetective
- id: ClothingOuterVestDetective
prob: 1
- name: ClothingOuterCoatDetective
- id: ClothingOuterCoatDetective
prob: 1
@@ -74,9 +74,9 @@
components:
- type: StorageFill
contents:
- name: ClothingHeadHelmetBombSuit
- id: ClothingHeadHelmetBombSuit
prob: 1
- name: ClothingOuterSuitBomb
- id: ClothingOuterSuitBomb
prob: 1
- name: ClothingMaskGas
- id: ClothingMaskGas
prob: 1

48
Resources/Prototypes/Catalog/Fills/Lockers/service.yml
View File

@@ -5,17 +5,17 @@
components:
- type: StorageFill
contents:
- name: ClothingOuterArmorBulletproof
- id: ClothingOuterArmorBulletproof
prob: 0.5
- name: ShotgunSawn
- id: ShotgunSawn
prob: 0.8
- name: DrinkShaker
- id: DrinkShaker
prob: 1
- name: ClothingEyesGlassesBeer
- id: ClothingEyesGlassesBeer
prob: 1
- name: DrinkBeer
- id: DrinkBeer
prob: 0.5
- name: DrinkBottleBeer
- id: DrinkBottleBeer
prob: 0.5
#- type: entity
@@ -30,10 +30,10 @@
components:
- type: StorageFill
contents:
- name: CrowbarRed
- name: MonkeyCubeBox
- name: SprayBottleWater
- name: ReagentContainerFlour
- id: CrowbarRed
- id: MonkeyCubeBox
- id: SprayBottleWater
- id: ReagentContainerFlour
- type: entity
id: LockerJanitorFilled
@@ -42,14 +42,14 @@
components:
- type: StorageFill
contents:
- name: MopItem
- name: WetFloorSign
- id: MopItem
- id: WetFloorSign
amount: 3
- name: TrashBag
- id: TrashBag
amount: 2
- name: LightReplacer
- id: LightReplacer
amount: 1
- name: BoxLightMixed
- id: BoxLightMixed
amount: 1
#- type: entity
@@ -64,21 +64,21 @@
components:
- type: StorageFill
contents:
- name: ClothingHandsGlovesLeather
- id: ClothingHandsGlovesLeather
prob: 1
- name: ClothingHandsGlovesLeather
- id: ClothingHandsGlovesLeather
prob: 0.8
- name: ClothingOuterApronBotanist
- id: ClothingOuterApronBotanist
prob: 1
- name: ClothingOuterApronBotanist
- id: ClothingOuterApronBotanist
prob: 0.8
- name: TowercapSeeds
- id: TowercapSeeds
prob: 1
- name: BananaSeeds
- id: BananaSeeds
prob: 0.8
- name: EggySeeds
- id: EggySeeds
prob: 0.5
- name: AppleSeeds
- id: AppleSeeds
prob: 0.8
- name: TomatoSeeds
- id: TomatoSeeds
prob: 1

2
Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
View File

@@ -46,7 +46,7 @@
# components:
# - type: StorageFill
# contents:
# - name: ClothingHandsGlovesLatex
# - id: ClothingHandsGlovesLatex
# prob: 0.4
# - type: entity

8
Resources/Prototypes/Catalog/Fills/firstaidkits.yml
View File

@@ -6,9 +6,9 @@
components:
- type: StorageFill
contents:
- name: Brutepack
- id: Brutepack
amount: 3
- name: Ointment
- id: Ointment
amount: 3
# todo 1 Health Analyzer once it exists. Remove brutepack and ointment for suture, gauze, mesh and medipen?
# see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents
@@ -20,7 +20,7 @@
components:
- type: StorageFill
contents:
- name: Ointment
- id: Ointment
amount: 5
- type: entity
@@ -30,6 +30,6 @@
components:
- type: StorageFill
contents:
- name: Brutepack
- id: Brutepack
amount: 5
#todo TO DO - add first aid kits for rad, toxin, o2, advanced and combat.

2
Resources/Prototypes/Entities/Clothing/Belt/belts.yml
View File

@@ -142,7 +142,7 @@
capacity: 15
- type: StorageFill
contents:
- name: CaptainSabre
- id: CaptainSabre
- type: entity
parent: ClothingBeltBase

42
Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml
View File

@@ -23,9 +23,9 @@
HeldPrefix: box
- type: StorageFill
contents:
- name: FoodDonutPink
- id: FoodDonutPink
amount: 3
- name: FoodDonutPlain
- id: FoodDonutPlain
amount: 3
- type: StorageCounter
countTag: Donut
@@ -62,7 +62,7 @@
size: 12
- type: StorageFill
contents:
- name: FoodEgg
- id: FoodEgg
amount: 12
- type: StorageCounter
countTag: Egg
@@ -117,7 +117,7 @@
components:
- type: StorageFill
contents:
- name: Eggshells
- id: Eggshells
amount: 12
- type: Destructible
thresholds:
@@ -182,31 +182,31 @@
map: ["enum.StorageVisualLayers.Door"]
- type: StorageFill
contents:
- name: FoodPizzaArnold
- id: FoodPizzaArnold
prob: 0.15
orGroup: Pizza
- name: FoodPizzaDank
- id: FoodPizzaDank
prob: 0.15
orGroup: Pizza
- name: FoodPizzaSassysage
- id: FoodPizzaSassysage
prob: 0.15
orGroup: Pizza
- name: FoodPizzaMargherita
- id: FoodPizzaMargherita
prob: 0.15
orGroup: Pizza
- name: FoodPizzaMeat
- id: FoodPizzaMeat
prob: 0.15
orGroup: Pizza
- name: FoodPizzaMushroom
- id: FoodPizzaMushroom
prob: 0.15
orGroup: Pizza
- name: FoodPizzaPineapple
- id: FoodPizzaPineapple
prob: 0.15
orGroup: Pizza
- name: FoodPizzaVegetable
- id: FoodPizzaVegetable
prob: 0.15
orGroup: Pizza
- name: FoodPizzaDonkpocket
- id: FoodPizzaDonkpocket
prob: 0.15
orGroup: Pizza
@@ -230,7 +230,7 @@
HeldPrefix: box
- type: StorageFill
contents:
- name: FoodBakedNugget
- id: FoodBakedNugget
amount: 6
- type: StorageCounter
countTag: Nugget
@@ -268,7 +268,7 @@
color: red
- type: StorageFill
contents:
- name: FoodDonkpocket
- id: FoodDonkpocket
amount: 6
- type: entity
@@ -282,7 +282,7 @@
sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
- type: StorageFill
contents:
- name: FoodDonkpocketSpicy
- id: FoodDonkpocketSpicy
amount: 6
- type: entity
@@ -296,7 +296,7 @@
sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
- type: StorageFill
contents:
- name: FoodDonkpocketTeriyaki
- id: FoodDonkpocketTeriyaki
amount: 6
- type: entity
@@ -311,7 +311,7 @@
color: white
- type: StorageFill
contents:
- name: FoodDonkpocketPizza
- id: FoodDonkpocketPizza
amount: 6
- type: entity
@@ -326,7 +326,7 @@
color: brown
- type: StorageFill
contents:
- name: FoodDonkpocketGondola
- id: FoodDonkpocketGondola
amount: 6
- type: entity
@@ -340,7 +340,7 @@
sprite: Objects/Consumable/Food/Baked/donkpocket.rsi
- type: StorageFill
contents:
- name: FoodDonkpocketBerry
- id: FoodDonkpocketBerry
amount: 6
- type: entity
@@ -355,5 +355,5 @@
color: yellow
- type: StorageFill
contents:
- name: FoodDonkpocketHonk
- id: FoodDonkpocketHonk
amount: 6

8
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml
View File

@@ -14,7 +14,7 @@
sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi
- type: StorageFill
contents:
- name: CigPackGreen
- id: CigPackGreen
amount: 6
- type: Appearance
visuals:
@@ -35,7 +35,7 @@
sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi
- type: StorageFill
contents:
- name: CigPackRed
- id: CigPackRed
amount: 6
- type: entity
@@ -52,7 +52,7 @@
sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi
- type: StorageFill
contents:
- name: CigPackBlue
- id: CigPackBlue
amount: 6
- type: entity
@@ -69,5 +69,5 @@
sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi
- type: StorageFill
contents:
- name: CigPackBlack
- id: CigPackBlack
amount: 6

2
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml
View File

@@ -10,7 +10,7 @@
size: 6
- type: StorageFill
contents:
- name: Cigarette
- id: Cigarette
amount: 6
- type: StorageCounter
countTag: Cigarette

4
Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml
View File

@@ -16,7 +16,7 @@
size: 8
- type: StorageFill
contents:
- name: Cigar
- id: Cigar
amount: 8
- type: StorageCounter
countTag: Cigar
@@ -44,5 +44,5 @@
components:
- type: StorageFill
contents:
- name: CigarGold
- id: CigarGold
amount: 8

14
Resources/Prototypes/Entities/Objects/Fun/crayons.yml
View File

@@ -145,13 +145,13 @@
countTag: Crayon
- type: StorageFill
contents:
- name: CrayonRed
- name: CrayonOrange
- name: CrayonYellow
- name: CrayonGreen
- name: CrayonBlue
- name: CrayonPurple
- name: CrayonBlack
- id: CrayonRed
- id: CrayonOrange
- id: CrayonYellow
- id: CrayonGreen
- id: CrayonBlue
- id: CrayonPurple
- id: CrayonBlack
- type: Appearance
visuals:
- type: StackVisualizer

14
Resources/Prototypes/Entities/Objects/Tools/cowtools.yml
View File

@@ -169,12 +169,12 @@
components:
- type: StorageFill
contents:
- name: Haycutters
- name: Moodriver
- name: Wronch
- name: Cowbar
- name: Mooltitool
- name: Cowelder
- name: Milkalyzer
- id: Haycutters
- id: Moodriver
- id: Wronch
- id: Cowbar
- id: Mooltitool
- id: Cowelder
- id: Milkalyzer
# I hate these fucking cowtools I hope the burn in hell -Swept

4
Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml
View File

@@ -11,9 +11,9 @@
sprite: Objects/Specific/Janitorial/light_replacer.rsi
- type: LightReplacer
contents:
- name: LightTube
- id: LightTube
amount: 8
type: Tube
- name: LightBulb
- id: LightBulb
amount: 5
type: Bulb

2
Resources/Prototypes/Entities/Objects/Tools/matches.yml
View File

@@ -49,5 +49,5 @@
- state: matchbox
- type: StorageFill
contents:
- name: Matchstick
- id: Matchstick
amount: 6