fix cburn bag issue, make new bag entity for them and filled bag entity (#21295)

This commit is contained in:
Whisper
2023-10-28 00:30:59 -04:00
committed by GitHub
parent 219109cac5
commit e11d33b68d
3 changed files with 253 additions and 242 deletions

View File

@@ -4,32 +4,31 @@
name: surgical duffel bag
description: "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools."
components:
- type: StorageFill
contents:
- id: Hemostat
- id: Saw
- id: Drill
- id: Cautery
- id: Retractor
- id: Scalpel
- type: StorageFill
contents:
- id: Hemostat
- id: Saw
- id: Drill
- id: Cautery
- id: Retractor
- id: Scalpel
- type: entity
id: ClothingBackpackDuffelCBURN
parent: ClothingBackpackDuffel
name: CBURN duffel bag
description: A duffel bag containing a variety of biological containment equipment.
id: ClothingBackpackDuffelCBURNFilled
parent: ClothingBackpackDuffelCBURN
suffix: Filled
components:
- type: StorageFill
contents:
#- id: BoxSurvivalEngineering
- id: WeaponShotgunDoubleBarreled
- id: BoxShotgunIncendiary
amount: 2
- id: GrenadeFlashBang
amount: 2
- id: PillAmbuzolPlus
- id: PillAmbuzol
amount: 4
- type: StorageFill
contents:
- id: BoxSurvivalEngineering
- id: WeaponShotgunDoubleBarreled
- id: BoxShotgunIncendiary
amount: 2
- id: GrenadeFlashBang
amount: 2
- id: PillAmbuzolPlus
- id: PillAmbuzol
amount: 4
- type: entity
parent: ClothingBackpackDuffelSyndicateMedicalBundle
@@ -37,14 +36,14 @@
name: syndicate surgical duffel bag
description: A large duffel bag containing a full suite of surgical tools.
components:
- type: StorageFill
contents:
- id: Hemostat
- id: SawAdvanced
- id: Drill
- id: Cautery
- id: Retractor
- id: ScalpelAdvanced
- type: StorageFill
contents:
- id: Hemostat
- id: SawAdvanced
- id: Drill
- id: Cautery
- id: Retractor
- id: ScalpelAdvanced
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
@@ -52,12 +51,12 @@
name: Bulldog bundle
description: "Lean and mean: Contains the popular Bulldog Shotgun, a 12g beanbag drum and 3 12g buckshot drums." #, and a pair of Thermal Imaging Goggles.
components:
- type: StorageFill
contents:
- id: WeaponShotgunBulldog
- id: MagazineShotgun
- id: MagazineShotgun
- id: MagazineShotgunBeanbag
- type: StorageFill
contents:
- id: WeaponShotgunBulldog
- id: MagazineShotgun
- id: MagazineShotgun
- id: MagazineShotgunBeanbag
# - id: ThermalImagingGoggles
- type: entity
@@ -66,11 +65,11 @@
name: C-20r bundle
description: "Old faithful: The classic C-20r Submachine Gun, bundled with three magazines." #, and a Suppressor.
components:
- type: StorageFill
contents:
- id: WeaponSubMachineGunC20r
- id: MagazinePistolSubMachineGun
amount: 2
- type: StorageFill
contents:
- id: WeaponSubMachineGunC20r
- id: MagazinePistolSubMachineGun
amount: 2
# - id: SMGSuppressor
- type: entity
@@ -79,11 +78,11 @@
name: Python bundle
description: "Go loud and proud with a fully loaded Magnum Python, bundled with two speed loaders."
components:
- type: StorageFill
contents:
- id: WeaponRevolverPythonAP
- id: SpeedLoaderMagnumAP
amount: 2
- type: StorageFill
contents:
- id: WeaponRevolverPythonAP
- id: SpeedLoaderMagnumAP
amount: 2
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
@@ -91,10 +90,10 @@
name: L6 Saw bundle
description: "More dakka: The iconic L6 lightmachinegun, bundled with 2 box magazines."
components:
- type: StorageFill
contents:
- id: WeaponLightMachineGunL6
- id: MagazineLightRifleBox
- type: StorageFill
contents:
- id: WeaponLightMachineGunL6
- id: MagazineLightRifleBox
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
@@ -102,13 +101,13 @@
name: China-Lake bundle
description: "An old China-Lake grenade launcher bundled with 11 rounds of various destruction capability."
components:
- type: StorageFill
contents:
- id: WeaponLauncherChinaLake
- id: GrenadeBlast
amount: 4
- id: GrenadeFrag
amount: 4
- type: StorageFill
contents:
- id: WeaponLauncherChinaLake
- id: GrenadeBlast
amount: 4
- id: GrenadeFrag
amount: 4
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
@@ -116,17 +115,17 @@
name: M-90gl bundle
description: "A versatile battle rifle with an attached grenade launcher, bundled with 3 magazines and 6 grenades of various capabilities."
components:
- type: StorageFill
contents:
- id: WeaponRifleM90GrenadeLauncher
- id: MagazineRifle
amount: 2
- id: GrenadeBlast
amount: 2
- id: GrenadeFlash
amount: 2
- id: GrenadeFrag
amount: 2
- type: StorageFill
contents:
- id: WeaponRifleM90GrenadeLauncher
- id: MagazineRifle
amount: 2
- id: GrenadeBlast
amount: 2
- id: GrenadeFlash
amount: 2
- id: GrenadeFrag
amount: 2
- type: entity
parent: ClothingBackpackDuffelSyndicateAmmo
@@ -134,14 +133,14 @@
name: ammo bundle
description: "Reloading! Contains 4 magazines for the C-20r, 4 drums for the Bulldog, and 2 ammo boxes for the L6 SAW."
components:
- type: StorageFill
contents:
- id: MagazinePistolSubMachineGun
amount: 4
- id: MagazineShotgun
amount: 4
- id: MagazineLightRifleBox
amount: 2
- type: StorageFill
contents:
- id: MagazinePistolSubMachineGun
amount: 4
- id: MagazineShotgun
amount: 4
- id: MagazineLightRifleBox
amount: 2
- type: entity
parent: ClothingBackpackDuffel
@@ -150,36 +149,36 @@
description: "Contains a full CentCom Official uniform set, headset and clipboard included. Encryption keys and ID access are not included."
suffix: DO NOT MAP
components:
- type: Tag
tags: [] # ignore "WhitelistChameleon" tag
- type: StorageFill
contents:
- id: ClothingHeadHatCentcom
- id: ClothingEyesGlassesSunglasses
- id: ClothingUniformJumpsuitCentcomOfficial
- id: ClothingShoesBootsJack
- id: ClothingHandsGlovesColorBlack
- id: ClothingHeadsetAltCentComFake
- id: ClothingOuterArmorBasic
- id: Paper
- id: Pen
- id: CentcomPDAFake
- type: Tag
tags: [] # ignore "WhitelistChameleon" tag
- type: StorageFill
contents:
- id: ClothingHeadHatCentcom
- id: ClothingEyesGlassesSunglasses
- id: ClothingUniformJumpsuitCentcomOfficial
- id: ClothingShoesBootsJack
- id: ClothingHandsGlovesColorBlack
- id: ClothingHeadsetAltCentComFake
- id: ClothingOuterArmorBasic
- id: Paper
- id: Pen
- id: CentcomPDAFake
- type: entity
parent: ClothingBackpackDuffelClown
id: ClothingBackpackDuffelSyndicateCostumeClown
suffix: syndicate
components:
- type: Tag
tags: [] # ignore "WhitelistChameleon" tag
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitClown
- id: ClothingShoesClown
- id: ClothingMaskClown
- id: BikeHorn
- id: ClownPDA
- id: ClothingHeadsetService
- type: Tag
tags: [] # ignore "WhitelistChameleon" tag
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitClown
- id: ClothingShoesClown
- id: ClothingMaskClown
- id: BikeHorn
- id: ClownPDA
- id: ClothingHeadsetService
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
@@ -187,11 +186,11 @@
name: carp suit duffel bag
description: Contains a carp suit and some friends to play with.
components:
- type: StorageFill
contents:
- id: ClothingOuterSuitCarp
- id: PlushieCarp
amount: 6
- type: StorageFill
contents:
- id: ClothingOuterSuitCarp
- id: PlushieCarp
amount: 6
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
@@ -199,22 +198,22 @@
name: syndicate pyjama duffel bag
description: Contains 3 pairs of syndicate pyjamas and 3 plushies for the ultimate sleepover.
components:
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitPyjamaSyndicateRed
- id: ClothingUniformJumpsuitPyjamaSyndicateBlack
- id: ClothingUniformJumpsuitPyjamaSyndicatePink
- id: ClothingHeadPyjamaSyndicateRed
- id: ClothingHeadPyjamaSyndicateBlack
- id: ClothingHeadPyjamaSyndicatePink
- id: ClothingShoesSlippers
amount: 3
- id: BedsheetSyndie
amount: 3
- id: PlushieCarp
- id: PlushieNuke
- id: PlushieLizard
- id: PlushieSharkBlue
- type: StorageFill
contents:
- id: ClothingUniformJumpsuitPyjamaSyndicateRed
- id: ClothingUniformJumpsuitPyjamaSyndicateBlack
- id: ClothingUniformJumpsuitPyjamaSyndicatePink
- id: ClothingHeadPyjamaSyndicateRed
- id: ClothingHeadPyjamaSyndicateBlack
- id: ClothingHeadPyjamaSyndicatePink
- id: ClothingShoesSlippers
amount: 3
- id: BedsheetSyndie
amount: 3
- id: PlushieCarp
- id: PlushieNuke
- id: PlushieLizard
- id: PlushieSharkBlue
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
@@ -250,12 +249,12 @@
name: syndicate EVA bundle
description: "Contains the Syndicate approved EVA suit."
components:
- type: StorageFill
contents:
- id: ClothingHeadHelmetSyndicate
- id: ClothingOuterHardsuitSyndicate
- id: ClothingMaskGasSyndicate
- id: DoubleEmergencyOxygenTankFilled
- type: StorageFill
contents:
- id: ClothingHeadHelmetSyndicate
- id: ClothingOuterHardsuitSyndicate
- id: ClothingMaskGasSyndicate
- id: DoubleEmergencyOxygenTankFilled
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
@@ -263,11 +262,11 @@
name: syndicate hardsuit bundle
description: "Contains the Syndicate's signature blood red hardsuit."
components:
- type: StorageFill
contents:
- id: ClothingOuterHardsuitSyndie
- id: ClothingMaskGasSyndicate
- id: ClothingHandsGlovesCombat
- type: StorageFill
contents:
- id: ClothingOuterHardsuitSyndie
- id: ClothingMaskGasSyndicate
- id: ClothingHandsGlovesCombat
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
@@ -275,26 +274,26 @@
name: syndicate zombie bundle
description: "An all-in-one kit for unleashing the undead upon a station."
components:
- type: StorageFill
contents:
- id: SyringeRomerol
- id: WeaponRevolverPython
- id: MagazineBoxMagnumIncendiary
- id: PillAmbuzolPlus
- id: PillAmbuzol
amount: 3
- type: StorageFill
contents:
- id: SyringeRomerol
- id: WeaponRevolverPython
- id: MagazineBoxMagnumIncendiary
- id: PillAmbuzolPlus
- id: PillAmbuzol
amount: 3
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
id: ClothingBackpackDuffelSyndicateOperative
name: operative duffelbag
components:
- type: StorageFill
contents:
- id: BoxSurvivalSyndicate
- id: WeaponPistolViper
- id: PinpointerNuclear
- id: MicroBombImplanter
- type: StorageFill
contents:
- id: BoxSurvivalSyndicate
- id: WeaponPistolViper
- id: PinpointerNuclear
- id: MicroBombImplanter
- type: entity
@@ -303,18 +302,18 @@
name: operative medic duffelbag
description: A large duffel bag for holding extra medical supplies.
components:
- type: StorageFill
contents:
- id: BoxSurvivalSyndicate
- id: SawAdvanced
- id: Cautery
- id: CombatKnife
- id: WeaponPistolViper
- id: PinpointerNuclear
- id: HandheldHealthAnalyzer
- id: CombatMedipen
- id: MicroBombImplanter
- id: SyndiHypo
- type: StorageFill
contents:
- id: BoxSurvivalSyndicate
- id: SawAdvanced
- id: Cautery
- id: CombatKnife
- id: WeaponPistolViper
- id: PinpointerNuclear
- id: HandheldHealthAnalyzer
- id: CombatMedipen
- id: MicroBombImplanter
- id: SyndiHypo
- type: entity
parent: ClothingBackpackDuffelSyndicateMedicalBundle
@@ -322,12 +321,12 @@
name: medical bundle
description: "All you need to get your comrades back in the fight."
components:
- type: StorageFill
contents:
- id: MedkitCombatFilled
- id: Defibrillator
- id: CombatMedipen
amount: 3
- id: ClothingHandsGlovesLatex
- id: SyringeTranexamicAcid
- id: SyringeHyronalin
- type: StorageFill
contents:
- id: MedkitCombatFilled
- id: Defibrillator
- id: CombatMedipen
amount: 3
- id: ClothingHandsGlovesLatex
- id: SyringeTranexamicAcid
- id: SyringeHyronalin

View File

@@ -4,13 +4,13 @@
name: duffel bag
description: A large duffel bag for holding extra things.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/duffel.rsi
- type: Storage
capacity: 120
- type: ClothingSpeedModifier
walkModifier: 1
sprintModifier: 0.9
- type: Sprite
sprite: Clothing/Back/Duffels/duffel.rsi
- type: Storage
capacity: 120
- type: ClothingSpeedModifier
walkModifier: 1
sprintModifier: 0.9
- type: entity
parent: ClothingBackpackDuffel
@@ -18,8 +18,8 @@
name: engineering duffel bag
description: A large duffel bag for holding extra tools and supplies.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/engineering.rsi
- type: Sprite
sprite: Clothing/Back/Duffels/engineering.rsi
- type: entity
parent: ClothingBackpackDuffel
@@ -27,8 +27,8 @@
name: atmospherics duffel bag
description: A large duffel bag made of fire resistant fibers. Smells like plasma.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/atmospherics.rsi
- type: Sprite
sprite: Clothing/Back/Duffels/atmospherics.rsi
- type: entity
parent: ClothingBackpackDuffel
@@ -36,8 +36,8 @@
name: medical duffel bag
description: A large duffel bag for holding extra medical supplies.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/medical.rsi
- type: Sprite
sprite: Clothing/Back/Duffels/medical.rsi
- type: entity
parent: ClothingBackpackDuffel
@@ -45,8 +45,8 @@
name: captain's duffel bag
description: A large duffel bag for holding extra captainly goods.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/captain.rsi
- type: Sprite
sprite: Clothing/Back/Duffels/captain.rsi
- type: entity
parent: ClothingBackpackDuffel
@@ -54,11 +54,11 @@
name: clown duffel bag
description: A large duffel bag for holding extra honk goods.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/clown.rsi
- type: Storage
storageOpenSound:
collection: BikeHorn
- type: Sprite
sprite: Clothing/Back/Duffels/clown.rsi
- type: Storage
storageOpenSound:
collection: BikeHorn
- type: entity
parent: ClothingBackpackDuffel
@@ -66,8 +66,8 @@
name: security duffel bag
description: A large duffel bag for holding extra security related goods.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/security.rsi
- type: Sprite
sprite: Clothing/Back/Duffels/security.rsi
- type: entity
parent: ClothingBackpackDuffel
@@ -75,8 +75,8 @@
name: brigmedic duffel bag
description: A large duffel bag for holding extra medical related goods.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/brigmedic.rsi
- type: Sprite
sprite: Clothing/Back/Duffels/brigmedic.rsi
- type: entity
parent: ClothingBackpackDuffel
@@ -84,8 +84,8 @@
name: chemistry duffel bag
description: A large duffel bag for holding extra beakers and test tubes.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/chemistry.rsi
- type: Sprite
sprite: Clothing/Back/Duffels/chemistry.rsi
- type: entity
parent: ClothingBackpackDuffel
@@ -93,8 +93,8 @@
name: virology duffel bag
description: A large duffel bag made of hypo-allergenic fibers. It's designed to help prevent the spread of disease. Smells like monkey.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/virology.rsi
- type: Sprite
sprite: Clothing/Back/Duffels/virology.rsi
- type: entity
parent: ClothingBackpackDuffel
@@ -102,8 +102,8 @@
name: genetics duffel bag
description: A large duffel bag for holding extra genetic mutations.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/genetics.rsi
- type: Sprite
sprite: Clothing/Back/Duffels/genetics.rsi
- type: entity
parent: ClothingBackpackDuffel
@@ -111,12 +111,12 @@
name: mime duffel bag
description: A large duffel bag for holding... mime... stuff.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/mime.rsi
storageOpenSound:
collection: null
storageInsertSound:
collection: null
- type: Sprite
sprite: Clothing/Back/Duffels/mime.rsi
storageOpenSound:
collection: null
storageInsertSound:
collection: null
- type: entity
parent: ClothingBackpackDuffel
@@ -124,8 +124,8 @@
name: science duffel bag
description: A large duffel bag for holding extra science related goods.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/science.rsi
- type: Sprite
sprite: Clothing/Back/Duffels/science.rsi
- type: entity
parent: ClothingBackpackDuffel
@@ -160,31 +160,31 @@
name: syndicate duffel bag
description: A large duffel bag for holding various traitor goods.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/syndicate.rsi
- type: Storage
capacity: 131
- type: Sprite
sprite: Clothing/Back/Duffels/syndicate.rsi
- type: Storage
capacity: 131
- type: entity
parent: ClothingBackpackDuffelSyndicate
id: ClothingBackpackDuffelSyndicateBundle
abstract: true
components:
- type: Tag
tags: [] # ignore "WhitelistChameleon" tag
- type: Tag
tags: [] # ignore "WhitelistChameleon" tag
- type: entity
parent: ClothingBackpackDuffelSyndicate
id: ClothingBackpackDuffelSyndicateAmmo
name: syndicate duffel bag
components:
- type: Sprite
sprite: Clothing/Back/Duffels/syndicate.rsi
state: icon-ammo
- type: Item
heldPrefix: ammo
- type: Clothing
equippedPrefix: ammo
- type: Sprite
sprite: Clothing/Back/Duffels/syndicate.rsi
state: icon-ammo
- type: Item
heldPrefix: ammo
- type: Clothing
equippedPrefix: ammo
- type: entity
parent: ClothingBackpackDuffelSyndicateAmmo
@@ -199,13 +199,13 @@
id: ClothingBackpackDuffelSyndicateMedical
name: syndicate duffel bag
components:
- type: Sprite
sprite: Clothing/Back/Duffels/syndicate.rsi
state: icon-med
- type: Item
heldPrefix: med
- type: Clothing
equippedPrefix: med
- type: Sprite
sprite: Clothing/Back/Duffels/syndicate.rsi
state: icon-med
- type: Item
heldPrefix: med
- type: Clothing
equippedPrefix: med
- type: entity
parent: ClothingBackpackDuffelSyndicateMedical
@@ -221,14 +221,26 @@
name: duffelbag of holding
description: A duffelbag that opens into a localized pocket of bluespace.
components:
- type: Sprite
sprite: Clothing/Back/Duffels/holding.rsi
state: icon
layers:
- state: icon
- state: icon-unlit
shader: unshaded
- type: Storage
capacity: 9999
- type: ClothingSpeedModifier
sprintModifier: 1 # makes its stats identical to other variants of bag of holding
- type: Sprite
sprite: Clothing/Back/Duffels/holding.rsi
state: icon
layers:
- state: icon
- state: icon-unlit
shader: unshaded
- type: Storage
capacity: 9999
- type: ClothingSpeedModifier
sprintModifier: 1 # makes its stats identical to other variants of bag of holding
- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelCBURN
name: CBURN duffel bag
description: A duffel bag containing a variety of biological containment equipment.
components:
- type: Storage
capacity: 150
- type: ClothingSpeedModifier
walkModifier: 1
sprintModifier: 1

View File

@@ -103,7 +103,7 @@
jumpsuit: ClothingUniformJumpsuitOperative
back: ClothingBackpackDuffelSyndicateOperative
mask: ClothingMaskGasSyndicate
# eyes: Night Vision Goggles whenever they're made
# eyes: Night Vision Goggles whenever they're made
eyes: ClothingEyesGlassesMeson
ears: ClothingHeadsetAltSyndicate
gloves: ClothingHandsGlovesCombat
@@ -124,7 +124,7 @@
jumpsuit: ClothingUniformJumpsuitOperative
back: ClothingBackpackDuffelSyndicateOperative
mask: ClothingMaskGasSyndicate
# eyes: Night Vision Goggles whenever they're made
# eyes: Night Vision Goggles whenever they're made
eyes: ClothingEyesGlassesMeson
ears: ClothingHeadsetAltSyndicate
gloves: ClothingHandsGlovesCombat
@@ -254,7 +254,7 @@
id: CBURNGear
equipment:
jumpsuit: ClothingUniformJumpsuitColorBrown
back: ClothingBackpackDuffelCBURN
back: ClothingBackpackDuffelCBURNFilled
mask: ClothingMaskGasERT
eyes: ClothingEyesGlassesSecurity
ears: ClothingHeadsetAltCentCom
@@ -267,8 +267,8 @@
suitstorage: YellowOxygenTankFilled
belt: ClothingBeltBandolier
innerClothingSkirt: ClothingUniformJumpsuitColorBrown
satchel: ClothingBackpackDuffelCBURN
duffelbag: ClothingBackpackDuffelCBURN
satchel: ClothingBackpackDuffelCBURNFilled
duffelbag: ClothingBackpackDuffelCBURNFilled
- type: startingGear
id: BoxingKangarooGear