From 8dedabbb8f4398b24bd1e26b3296c2273546cc57 Mon Sep 17 00:00:00 2001 From: Tollhouse Date: Tue, 15 Aug 2023 18:27:18 -0600 Subject: [PATCH] Dan's Soaked Smokes (#19150) * Added all the basics I think I needed for the basic cigs to show up in vendors and game. Need to implement the randomizer to grab varied chems from a list. * Forgot a png * Smokes work just need sprite work and random * First pass on random cigs * Cigarettes are named now just randomization left * Finished on my end. * Whoops * Nutrient is not availiable for smokes I guess? * Testing fixes * Dunno found this on the filledbookshelf might work here? * I dont know what Im doing wrong but I think this might work. * Trying with orgroups in the pack YAML * It seems to not like the food chems. Commented them out. * THC is also a no go. Also increased storage size of pack to total pool. Given the low prob should still should never hit max volume. * I have a sneaky suspicion its the size of the container and pool of fill items. * Messed with the size of the cigarrettes so they all have a chance to fit and the size of box stays consistent. * Apparently non whole number size is a no go. * Cartons were to small and added maxamount on cigarettes. * Amount: 0 caused odd errors. removed and changed maxamount to 2. * Reworked randomization system to try and use weightedRandom instead of prob in storageFill * Wrong weightedRandom * Rework of a rework. Good on my end. Simplified the randomization to bare minimum. * Added gas station dick pill vibe to all the names. --- .../VendingMachines/Inventories/cigs.yml | 1 + .../Smokeables/Cigarettes/cartons.yml | 176 ++++--- .../Smokeables/Cigarettes/cigarette.yml | 458 ++++++++++++++++-- .../Smokeables/Cigarettes/packs.yml | 397 ++++++++++----- .../Cigarettes/Cartons/mixed.rsi/closed.png | Bin 0 -> 275 bytes .../Cartons/mixed.rsi/inhand-left.png | Bin 0 -> 247 bytes .../Cartons/mixed.rsi/inhand-right.png | Bin 0 -> 248 bytes .../Cigarettes/Cartons/mixed.rsi/meta.json | 25 + .../Cigarettes/Cartons/mixed.rsi/open.png | Bin 0 -> 320 bytes .../Cigarettes/Packs/mixed.rsi/closed.png | Bin 0 -> 4350 bytes .../Packs/mixed.rsi/equipped-BELT.png | Bin 0 -> 159 bytes .../Packs/mixed.rsi/inhand-left.png | Bin 0 -> 4356 bytes .../Packs/mixed.rsi/inhand-right.png | Bin 0 -> 4353 bytes .../Cigarettes/Packs/mixed.rsi/meta.json | 32 ++ .../Cigarettes/Packs/mixed.rsi/open.png | Bin 0 -> 4417 bytes .../Cigarettes/Packs/mixed.rsi/trash.png | Bin 0 -> 4426 bytes 16 files changed, 834 insertions(+), 255 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/equipped-BELT.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml index a7f6dbd76d..dfbf2c1c9d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml @@ -5,6 +5,7 @@ CigPackRed: 2 CigPackBlue: 2 CigPackBlack: 2 + CigPackMixed: 2 CigarCase: 1 SmokingPipeFilledTobacco: 1 Vape: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml index 2ae53cad2b..4d0b442c46 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml @@ -1,79 +1,97 @@ -- type: entity - id: CigCartonGreen - parent: [ BoxCardboard, BaseBagOpenClose ] - name: Spessman's Smokes carton - description: "A carton containing 6 packets of Spessman's Smokes." - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi - layers: - - state: closed - - state: open - map: ["openLayer"] - - type: Storage - capacity: 36 - - type: Item - sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi - size: 36 - - type: StorageFill - contents: - - id: CigPackGreen - amount: 6 - - type: Tag - tags: - - Trash - - type: PhysicalComposition - materialComposition: - Plastic: 50 - - type: SpaceGarbage - -- type: entity - id: CigCartonRed - parent: CigCartonGreen - name: Dromedaryco carton - description: A carton containing 6 packets of Dromedarycos. - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi - layers: - - state: closed - - type: Item - sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi - - type: StorageFill - contents: - - id: CigPackRed - amount: 6 - -- type: entity - id: CigCartonBlue - parent: CigCartonGreen - name: AcmeCo carton - description: A carton containing 6 packets of AcmeCo. - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi - layers: - - state: closed - - type: Item - sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi - - type: StorageFill - contents: - - id: CigPackBlue - amount: 6 - -- type: entity - id: CigCartonBlack - parent: CigCartonGreen - name: Nomads carton - description: A carton containing 6 packets of Nomads. - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi - layers: - - state: closed - - type: Item - sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi - - type: StorageFill - contents: - - id: CigPackBlack - amount: 6 +- type: entity + id: CigCartonGreen + parent: [ BoxCardboard, BaseBagOpenClose ] + name: Spessman's Smokes carton + description: "A carton containing 6 packets of Spessman's Smokes." + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi + layers: + - state: closed + - state: open + map: ["openLayer"] + - type: Storage + capacity: 36 + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi + size: 36 + - type: StorageFill + contents: + - id: CigPackGreen + amount: 6 + - type: Tag + tags: + - Trash + - type: PhysicalComposition + materialComposition: + Plastic: 50 + - type: SpaceGarbage + +- type: entity + id: CigCartonRed + parent: CigCartonGreen + name: Dromedaryco carton + description: A carton containing 6 packets of Dromedarycos. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi + layers: + - state: closed + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi + - type: StorageFill + contents: + - id: CigPackRed + amount: 6 + +- type: entity + id: CigCartonBlue + parent: CigCartonGreen + name: AcmeCo carton + description: A carton containing 6 packets of AcmeCo. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi + layers: + - state: closed + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi + - type: StorageFill + contents: + - id: CigPackBlue + amount: 6 + +- type: entity + id: CigCartonBlack + parent: CigCartonGreen + name: Nomads carton + description: A carton containing 6 packets of Nomads. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi + layers: + - state: closed + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi + - type: StorageFill + contents: + - id: CigPackBlack + amount: 6 + +- type: entity + id: CigCartonMixed + parent: CigCartonGreen + name: Dan's soaked smokes + description: A carton containg 3 packets of Dan's soaked smokes. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi + layers: + - state: closed + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi + - type: StorageFill + contents: + - id: CigPackMixedMedical + - id: CigPackMixed + - id: CigPackMixedNasty diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml index cb58637be3..d46e787838 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml @@ -1,53 +1,405 @@ -- type: entity - id: Cigarette - parent: BaseCigar - name: cigarette - description: A roll of tobacco and nicotine. - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi - state: unlit-icon - - type: Tag - tags: - - Cigarette - - Trash - - type: SpaceGarbage - - type: Clothing - sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi - slots: [ mask ] - equippedPrefix: unlit - - type: Item - size: 1 - - type: Construction - graph: smokeableCigarette - node: cigarette - -- type: entity - id: CigaretteSpent - parent: Cigarette - suffix: spent - components: - - type: Sprite - state: burnt-icon - - type: Smokable - state: Burnt - - type: SolutionContainerManager - solutions: - smokable: - maxVol: 20 - -- type: entity - id: CigaretteSyndicate - suffix: syndicate - parent: Cigarette - name: cigarette - components: - - type: SolutionContainerManager - solutions: - smokable: - maxVol: 40 - reagents: - - ReagentId: Nicotine - Quantity: 10 - - ReagentId: Omnizine - Quantity: 30 +- type: entity + id: Cigarette + parent: BaseCigar + name: cigarette + description: A roll of tobacco and nicotine. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi + state: unlit-icon + - type: Tag + tags: + - Cigarette + - Trash + - type: SpaceGarbage + - type: Clothing + sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi + slots: [ mask ] + equippedPrefix: unlit + - type: Item + size: 1 + - type: Construction + graph: smokeableCigarette + node: cigarette + +- type: entity + id: SoakedCigarette + parent: BaseCigar + name: cigarette + description: A roll of tobacco and nicotine soaked in some chemical. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi + state: unlit-icon + - type: Tag + tags: + - Cigarette + - Trash + - type: SpaceGarbage + - type: Clothing + sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi + slots: [ mask ] + equippedPrefix: unlit + - type: Item + size: 1 + - type: Construction + graph: smokeableCigarette + node: cigarette + +- type: entity + id: CigaretteSpent + parent: Cigarette + suffix: spent + components: + - type: Sprite + state: burnt-icon + - type: Smokable + state: Burnt + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 20 + +- type: entity + id: CigaretteSyndicate + suffix: syndicate + parent: Cigarette + name: cigarette + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Omnizine + Quantity: 30 + +- type: entity + id: CigaretteOmnizine + parent: SoakedCigarette + name: Hot Dog Water Flavor Explosion + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Omnizine + Quantity: 10 + +- type: entity + id: CigaretteIron + parent: SoakedCigarette + name: Rusty Orange Baja Blast + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Iron + Quantity: 10 + +- type: entity + id: CigaretteTricordrazine + parent: SoakedCigarette + name: Licorice Allsorts + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Tricordrazine + Quantity: 10 + +- type: entity + id: CigaretteDylovene + parent: SoakedCigarette + name: Urinal Cake Disolver + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Dylovene + Quantity: 10 + +- type: entity + id: CigaretteDermaline + parent: SoakedCigarette + name: Aloe Peanut Butter Medley + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Dylovene + Quantity: 10 + +- type: entity + id: CigaretteArithrazine + parent: SoakedCigarette + name: Roman Pipe Works + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Arithrazine + Quantity: 10 + +- type: entity + id: CigaretteIpecac + parent: SoakedCigarette + name: Grandma's Christmas Fruitcake + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Ipecac + Quantity: 2 + +- type: entity + id: CigaretteBicaridine + parent: SoakedCigarette + name: Wet Dog Enhanced Cigarette + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Bicaridine + Quantity: 10 + +- type: entity + id: CigaretteDexalin + parent: SoakedCigarette + name: Rocky Mountain Musk + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Dexalin + Quantity: 10 + +- type: entity + id: CigarettePax + parent: SoakedCigarette + name: Switzerland Express + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Pax + Quantity: 2 + +- type: entity + id: CigaretteBbqSauce + parent: SoakedCigarette + name: Spicy Wood Aroma + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: BbqSauce + Quantity: 10 + +- type: entity + id: CigaretteBlackPepper + parent: SoakedCigarette + name: English Spice + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Blackpepper + Quantity: 10 + +- type: entity + id: CigaretteCapsaicinOil + parent: SoakedCigarette + name: Chilly P + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: CapsaicinOil + Quantity: 10 + +- type: entity + id: CigaretteBread + parent: SoakedCigarette + name: Double Toasted + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + +- type: entity + id: CigaretteMilk + parent: SoakedCigarette + name: Bovine Extract + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Milk + Quantity: 10 + +- type: entity + id: CigaretteBanana + parent: SoakedCigarette + name: Clown Adjancency Bonus + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: BananaHonk + Quantity: 10 + +- type: entity + id: CigaretteSpaceDrugs + parent: SoakedCigarette + name: 80's Power Hour + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: SpaceDrugs + Quantity: 10 + +- type: entity + id: CigaretteMuteToxin + parent: SoakedCigarette + name: Mixed Lozenges + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: MuteToxin + Quantity: 2 + +- type: entity + id: CigaretteMold + parent: SoakedCigarette + name: Beneath The Sink Experience + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Mold + Quantity: 2 + +- type: entity + id: CigaretteLicoxide + parent: SoakedCigarette + name: Wake Up Call + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: Licoxide + Quantity: 5 + +- type: entity + id: CigaretteWeldingFuel + parent: SoakedCigarette + name: Plasma Sauce + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: WeldingFuel + Quantity: 5 + +- type: entity + id: CigaretteTHC + parent: SoakedCigarette + name: Hippy Romance Novel + components: + - type: SolutionContainerManager + solutions: + smokable: + maxVol: 40 + reagents: + - ReagentId: Nicotine + Quantity: 10 + - ReagentId: THC + Quantity: 5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index bca512c2bd..1d161b160a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -1,123 +1,274 @@ -- type: entity - id: CigPackBase - parent: [ BaseStorageItem, BaseBagOpenClose ] - name: cigarette pack - abstract: true - components: - - type: Sprite - layers: - - state: closed - - state: open - map: ["openLayer"] - visible: false - - state: cig1 - map: ["cig1"] - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi - visible: false - - state: cig2 - map: ["cig2"] - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi - visible: false - - state: cig3 - map: ["cig3"] - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi - visible: false - - state: cig4 - map: ["cig4"] - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi - visible: false - - state: cig5 - map: ["cig5"] - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi - visible: false - - state: cig6 - map: ["cig6"] - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi - visible: false - - type: Tag - tags: - - CigPack - - Trash - - type: PhysicalComposition - materialComposition: - Steel: 50 - - type: SpaceGarbage - - type: Storage - capacity: 5 - - type: Item - size: 5 - - type: StorageFill - contents: - - id: Cigarette - amount: 5 - - type: ItemCounter - count: - tags: [Cigarette] - composite: true - layerStates: - - cig1 - - cig2 - - cig3 - - cig4 - - cig5 - - cig6 - - type: Appearance - -- type: entity - id: CigPackGreen - parent: CigPackBase - name: Spessman's Smokes packet - description: A label on the packaging reads, Wouldn't a slow death make a change? - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi - - type: Item - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi - -- type: entity - id: CigPackRed - parent: CigPackBase - name: DromedaryCo packet - description: The most popular brand of Space Cigarettes, sponsors of the Space Olympics. - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi - - type: Item - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi - -- type: entity - id: CigPackBlue - parent: CigPackBase - name: AcmeCo packet - description: For those who somehow want to obtain the record for the most amount of cancerous tumors. - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi - - type: Item - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi - -- type: entity - id: CigPackBlack - parent: CigPackBase - name: Nomads packet - description: Nomads's extra strong, for when your life is more extra hard. - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi - - type: Item - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi - -- type: entity - id: CigPackSyndicate - parent: CigPackBase - name: Interdyne herbals packet - description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves. - components: - - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi - - type: Item - sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi - - type: StorageFill - contents: - - id: CigaretteSyndicate - amount: 5 +- type: entity + id: CigPackBase + parent: [ BaseStorageItem, BaseBagOpenClose ] + name: cigarette pack + abstract: true + components: + - type: Sprite + layers: + - state: closed + - state: open + map: ["openLayer"] + visible: false + - state: cig1 + map: ["cig1"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - state: cig2 + map: ["cig2"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - state: cig3 + map: ["cig3"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - state: cig4 + map: ["cig4"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - state: cig5 + map: ["cig5"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - state: cig6 + map: ["cig6"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - type: Tag + tags: + - CigPack + - Trash + - type: PhysicalComposition + materialComposition: + Steel: 50 + - type: SpaceGarbage + - type: Storage + capacity: 5 + - type: Item + size: 5 + - type: StorageFill + contents: + - id: Cigarette + amount: 5 + - type: ItemCounter + count: + tags: [Cigarette] + composite: true + layerStates: + - cig1 + - cig2 + - cig3 + - cig4 + - cig5 + - cig6 + - type: Appearance + +- type: entity + id: CigPackMixedBase + parent: [ BaseStorageItem, BaseBagOpenClose ] + name: soaked cigarette pack + abstract: true + components: + - type: Sprite + layers: + - state: closed + - state: open + map: ["openLayer"] + visible: false + - state: cig1 + map: ["cig1"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - state: cig2 + map: ["cig2"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - state: cig3 + map: ["cig3"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - state: cig4 + map: ["cig4"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - state: cig5 + map: ["cig5"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - state: cig6 + map: ["cig6"] + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/visualizer.rsi + visible: false + - type: Tag + tags: + - CigPack + - Trash + - type: PhysicalComposition + materialComposition: + Steel: 50 + - type: SpaceGarbage + - type: Storage + capacity: 10 + - type: Item + size: 10 + - type: StorageFill + contents: + - id: CigaretteRandom + amount: 10 + - type: ItemCounter + count: + tags: [Cigarette] + composite: true + layerStates: + - cig1 + - cig2 + - cig3 + - cig4 + - cig5 + - cig6 + - type: Appearance + +- type: entity + id: CigPackGreen + parent: CigPackBase + name: Spessman's Smokes packet + description: A label on the packaging reads, Wouldn't a slow death make a change? + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi + +- type: entity + id: CigPackRed + parent: CigPackBase + name: DromedaryCo packet + description: The most popular brand of Space Cigarettes, sponsors of the Space Olympics. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi + +- type: entity + id: CigPackBlue + parent: CigPackBase + name: AcmeCo packet + description: For those who somehow want to obtain the record for the most amount of cancerous tumors. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi + +- type: entity + id: CigPackBlack + parent: CigPackBase + name: Nomads packet + description: Nomads's extra strong, for when your life is more extra hard. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi + +- type: entity + id: CigPackSyndicate + parent: CigPackBase + name: Interdyne herbals packet + description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi + - type: StorageFill + contents: + - id: CigaretteSyndicate + amount: 5 + +- type: entity + id: CigPackMixedMedical + parent: CigPackMixedBase + name: Dan's soaked smokes + description: Dan worked with NT chemistry to dispose of excess chemicals, ENJOY. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi + - type: StorageFill + contents: + - id: CigaretteIron + - id: CigaretteTricordrazine + - id: CigaretteDylovene + - id: CigaretteDermaline + - id: CigaretteArithrazine + - id: CigaretteBicaridine + - id: CigaretteIpecac + - id: CigaretteOmnizine + prob: 0.25 + - id: CigaretteDexalin + prob: 0.25 + - id: CigarettePax + prob: 0.10 + + +- type: entity + id: CigPackMixed + parent: CigPackMixedBase + name: Dan's soaked smokes + description: Dan worked with NT chemistry to dispose of excess chemicals, ENJOY. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi + - type: StorageFill + contents: + - id: CigaretteBbqSauce + prob: 0.70 + - id: CigaretteBlackPepper + prob: 0.70 + - id: CigaretteCapsaicinOil + prob: 0.70 + - id: CigaretteBread + prob: 0.70 + - id: CigaretteMilk + prob: 0.70 + - id: CigaretteBanana + prob: 0.10 + - id: CigaretteTHC + prob: 0.70 + - id: CigaretteTricordrazine + prob: 0.25 + - id: CigaretteSpaceDrugs + prob: 0.50 + - id: CigaretteLicoxide + prob: 0.10 + +- type: entity + id: CigPackMixedNasty + parent: CigPackMixedBase + name: Dan's soaked smokes + description: Dan worked with NT chemistry to dispose of excess chemicals, ENJOY. + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi + - type: StorageFill + contents: + - id: CigaretteSpaceDrugs + amount: 2 + - id: CigaretteWeldingFuel + amount: 2 + - id: CigaretteMold + amount: 2 + - id: CigaretteTHC + - id: CigaretteLicoxide + prob: 0.50 + - id: CigarettePax + prob: 0.10 + - id: CigaretteMuteToxin + prob: 0.05 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..d0598011a33c3539e2b951ebe0752ae4aac3a1be GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7ltYZ5eDvKcP5$wMNW9S zIEF+VPEL?uU7R4&(=?G!;v(z1n&O}Syv^J5?V3aPnEYYxn(MmG8S%P&<`kE<^3+VU=DmO>S$ zCcXn=*SGY@t$M=L*ne8W;=jd%(8GtfwKlfra_7n%0D*s|ysMoHB7KVV6pkvs;mPE& z$=SXloX^HCuP4~=+9w^qoxg9(ta!{&GwlI$R~)+mYx?b;um-TB0~?qa9;O<4^=h42 Q3iK0$r>mdKI;Vst01EA9;{X5v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..ea9384ff290f7bd7b5912a1edb6b36941de03b42 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE(})~zA?DCo_oOy6j|fx z;uunK>+P+LyoU?~STAshoiONeaCSTxlex+5+6Nw;13c;%XLYd!y4q<@yD$AG+PKGzza*AcG{(P?WjdpNZa>i~eSN-nzWoJID|NMBz@_4V6f`QX>*S+3#?b<^i z9a-;iN=RwZw4kilJKOiO?~}i+_2>N^J-x%%9&Ucl1Tv1HB>9I|-HQ)1-wX1+kI%m2 r+c;}uOHbIY)v7#q+P+LyoU?~STAshoiONeaCSTxlex+5+6Nw;13c3*d{Z?=xlT;1IaSSUQ64{S z_WVSkPKJi{%TjgP`5ye-H|?JD3CsL>@4uX9&-?Cu-TYx`-5-%dX`gMTXG(gX+qqgA8Qgc=921r$C#;e{Pel s>*g%pa@5y#^{H~+hZl6$a7i(AykjnUHer!L=_IgfPgg&ebxsLQ0Q%Krg8%>k literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json new file mode 100644 index 0000000000..e4be1ba5f4 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/f18aa05685f13c8b424867e4219a1e727019c026", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "open" + }, + { + "name": "closed" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/mixed.rsi/open.png new file mode 100644 index 0000000000000000000000000000000000000000..fe7e45344181d4a78045b4c65721161537f3eb90 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzwj^(N7ltYZ5eDvKcP5$wMZS8v zIEF+VPEL?uU7R4oW02q?zGJPtW@rTYq_6?zKK>zhL1sZT&U}Sjh<#h4yQ{_9r0ATQR L^>bP0l+XkK$Vh>` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/closed.png new file mode 100644 index 0000000000000000000000000000000000000000..992b30b7aa26cf31fda230d580b4148add0da95c GIT binary patch literal 4350 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 a{t(G{Y-rry);0tZhfLYIhF@lt?)VSde?Wl% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/mixed.rsi/trash.png new file mode 100644 index 0000000000000000000000000000000000000000..874c15245b1840f88caac54cec3acf68fd1af716 GIT binary patch literal 4426 zcmeHKdr%X19$y|6Org~l1w3zNjhv#g$!=ckZV8GBkDP}0C~|YcW_J^|CfS%QNl3K< z77vjTyyrH!iZGLMh9!oT^dZrnXc(-F>d&UeJF!)(^nZ^(4#%bBi7f4BnTWJa)YE8S(g?<7c3~8FSetY9>FU(_Tp4+}JZ? zi9s?*41Smr9rtE$(+_uladTgLaA!p9uJcLjs|ym`M=rHBG7YDcr>N8m@kM`YYIJ

L)F)^e!pVD>e$-3 zFE%W%>V4QY)b07qO!@w9lzdg*7k%-0OqkDIVZQunOP#H`EcoHxiY15ce5@(|BJ1q; zHe^F+gf%4k-!|iSAu><-)rG%R#HHUo7bSV2`&sRmi^3u<2cKAH=MQb%lMKb)e*Muj z91mSk^M@0CgMG^^{7^l2|3OG~j`QOLD)}ksIyVQptH8LDqsSFcu@=s*mG(EcNMVlAN>{6msL`QgOSlZ5lg;yG=F`4)G{H!hCQFjMBml6n z0tI_*R=bPzYNdW$60AkBTnhV5gmqeJfiWA_@lF<2$y72FN%eAWg)~_LCpj52nX6A5 zh5&C`X^9{>NV(kO@yI+%8Sk{nF@hlEs6wt#Aix4~mDvT#i`ZTBMTh`~o^{bq&LMET z9TqVu6JIK5rBa}WN8+Spc2{P7SBJ?if$bz1%DFtnVtvNmAq0=r@pwoEq|vqwEd3M`z>;r9Y$ zPp}j?^B7qZViPs~bjAk)+(&UISdZlHHwIQlBdO=+;4%*2peBlilNCg-f5#iIXN3;VdW0H#jg+vCsVQwTB$;Yj!Ckulwbx9Ux02EayNfakBMLwn=RVuJXPz{NWv*#Jk zT=rAe;`qQxfud({F0g-@Ulf?BJa&EHE%0jP{KEvp{;?n_I*@{kabN^!QwcsG^r3!b{tV*iAn@l;2MNdD-^g{V?r?|&`+c2F5WD7C?}g@ z0Xzb(K!f_Zg5!rvwP<2Ao)T891E356G>uV4Nae%H%Ec37B-T!+e2Qf6i;T4nOA>Fg&%%r1+hpYl^N(F)%6PsqUJhYf=nM%6O`~{%>?i z#y+N4JNO6W0iQ|8%$jCek*Li3?n*+*`%Kr-EtvBm{KFTN_?LC_!f!~kKK zU@)eJ-3*U-C1HBchJQT(q6Y?jN`65*T^#em{^F?G${h4;(0p~o7kB@8eQE8X_D_Bn zr`*-R5k&dcIrHFw^|6~V32%>I(AqYcE+gb=OIkL}k=e_G`W!fGx$v#nnFM3_5fzahm(`Hb*)NF6)&ITihIU zBRodb9r^Q}#E|B`)Gc>*ceWz^YZnddJ-{tX%dMTMmF#GHT6ZNT=4fn8=toBtU8{S~HGShR>Gl&bnlJc=zkD)a_B*&bV9e-A_mN%~N)5S^TTThV894cI2Rv ew6=IS41&mGYX`o(ezpZr02xv<^@o=iSN<1ZZ%lju literal 0 HcmV?d00001