diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs b/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs index 6c2bc44fbb..27427a9888 100644 --- a/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs +++ b/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs @@ -1,4 +1,4 @@ -using Content.Client.UserInterface.Stylesheets; +using Content.Client.UserInterface.Stylesheets; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; diff --git a/Content.Server/GameObjects/Components/Items/Storage/StorageCounterComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/StorageCounterComponent.cs index 6454ff3147..7cd612fcec 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/StorageCounterComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/StorageCounterComponent.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System.Collections.Generic; using Content.Shared.GameObjects.Components; diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/GameObjects/Components/SharedStackComponent.cs index 18e83f0b44..b33534b18a 100644 --- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs +++ b/Content.Shared/GameObjects/Components/SharedStackComponent.cs @@ -1,4 +1,4 @@ -using System; +using System; using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Players; @@ -137,6 +137,12 @@ namespace Content.Shared.GameObjects.Components FloorTileWhite, FloorTileDark, FloorTileWood, - MetalRod + MetalRod, + PaperRolling, + CigaretteFilter, + GroundTobacco, + GroundCannabis, + LeavesTobaccoDried, + LeavesCannabisDried } } diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index d1920e8f7f..51e5a9ec5f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -21,3 +21,15 @@ cost: 1000 category: Service group: market + +- type: cargoProduct + name: "lung cancer crate" + id: cargo.servicesmokeables + description: "Tired of a quick death on the station? Order this crate and chain-smoke your way to a coughy demise!" + icon: + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi + state: closed + product: CrateServiceSmokeables + cost: 2000 + category: Service + group: market diff --git a/Resources/Prototypes/Catalog/Fills/lockers.yml b/Resources/Prototypes/Catalog/Fills/lockers.yml index a86fedc413..0a728abee8 100644 --- a/Resources/Prototypes/Catalog/Fills/lockers.yml +++ b/Resources/Prototypes/Catalog/Fills/lockers.yml @@ -90,13 +90,15 @@ - name: ClothingOuterSuitFire prob: 0.5 - name: ClothingShoesColorBrown - prob: 0.7 + prob: 0.7 - name: ClothingHeadHatCargosoft prob: 0.8 - name: SupplyRequestComputerCircuitboard prob: 1 - name: SupplyComputerCircuitboard prob: 1 + - name: CigPackGreen + prob: 0.50 - type: entity id: LockerCaptainFilled @@ -120,7 +122,7 @@ - name: TaserGun prob: 1 - name: ClothingShoesColorBlack - prob: 0.7 + prob: 0.7 - name: ClothingHeadHelmetHardsuitCap prob: 1 - name: CommsComputerCircuitboard @@ -129,7 +131,9 @@ prob: 1 - name: PlushieNuke prob: 0.1 - + - name: CigarGoldCase + prob: 0.25 + - type: entity id: LockerHeadOfPersonnelFilled suffix: Filled @@ -152,9 +156,12 @@ - name: TaserGun prob: 1 - name: ClothingShoesColorBlack - prob: 0.7 + prob: 0.7 - name: PlushieLizard prob: 0.1 + - name: CigarGoldCase + prob: 0.10 + # Fuck the HoP they don't deserve fucking cigars. - type: entity id: LockerChiefEngineerFilled @@ -171,6 +178,8 @@ - name: ClothingEyesGlassesMeson - name: ClothingBeltChiefEngineerFilled - name: ClothingHeadHatBeretEngineering + - name: CigarCase + prob: 0.15 - type: entity id: LockerElectricalSuppliesFilled @@ -189,7 +198,7 @@ prob: 0.2 - name: ApcExtensionCableStack prob: 0.3 - + - type: entity id: LockerWeldingSuppliesFilled suffix: Filled @@ -294,7 +303,7 @@ orGroup: Surgshrubs - name: ClothingMaskSterile prob: 1 - + - type: entity id: LockerChemistryFilled @@ -393,7 +402,8 @@ prob: 1 - name: ClothingShoesBootsJack prob: 1 - + - name: CigarGoldCase + prob: 0.50 - type: entity id: LockerWardenFilled diff --git a/Resources/Prototypes/Catalog/VendingMachines/cigs.yml b/Resources/Prototypes/Catalog/VendingMachines/cigs.yml index bf1a001aa1..467f32088f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/cigs.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/cigs.yml @@ -5,5 +5,9 @@ animationDuration: 2.1 spriteName: cigs startingInventory: - CigarettePack: 20 - Matchbox: 10 + CigPackGreen: 2 + CigPackRed: 2 + CigPackBlue: 2 + CigPackBlack: 2 + CigarCase: 1 + Matchbox: 5 diff --git a/Resources/Prototypes/Datasets/Names/rollie.yml b/Resources/Prototypes/Datasets/Names/rollie.yml new file mode 100644 index 0000000000..b758fb13ac --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/rollie.yml @@ -0,0 +1,42 @@ +- type: dataset + id: names_rollie + values: + - "bifta" + - "bifter" + - "bird" + - "blunt" + - "bloint" + - "boof" + - "boofer" + - "bomber" + - "bone" + - "bun" + - "doink" + - "doob" + - "doober" + - "doobie" + - "dutch" + - "fatty" + - "hogger" + - "hooter" + - "hootie" + - "jay" + - "jimmy" + - "joint" + - "juju" + - "jeebie weebie" + - "number" + - "owl" + - "phattie" + - "puffer" + - "reef" + - "reefer" + - "rollie" + - "scoobie" + - "shorty" + - "spiff" + - "spliff" + - "toke" + - "torpedo" + - "zoot" + - "zooter" diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_service.yml b/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_service.yml index 9122cdf2d9..c8204e9109 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_service.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Crates/Filled/crate_service.yml @@ -31,3 +31,29 @@ amount: 1 - name: BoxLightbulb amount: 1 + +- type: entity + id: CrateServiceSmokeables + name: smokeables crate + description: "Tired of a quick death on the station? Order this crate and chain-smoke your way to a coughy demise!" + parent: CrateGenericonimo + components: + - type: StorageFill + contents: + - name: CigCartonGreen + prob: 0.50 + orGroup: CigCarton1 + - name: CigCartonRed + orGroup: CigCarton1 + - name: CigCartonBlue + prob: 0.50 + orGroup: CigCarton2 + - name: CigCartonBlack + orGroup: CigCarton2 + - name: CigarGoldCase + prob: 0.05 + orGroup: Cigars + - name: CigarCase + orGroup: Cigars + - name: Matchbox + amount: 2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/blunts.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/blunts.yml new file mode 100644 index 0000000000..8e4ae7c7b6 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/blunts.yml @@ -0,0 +1,21 @@ +- type: entity + id: Rollie + parent: BaseSmokeable + name: blunt + description: "A roll of dried plant matter wrapped in thin paper." + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi + netsync: false + state: unlit-icon + - type: Tag + tags: + - Cigarette + - type: Clothing + sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi + Slots: [ mask ] + HeldPrefix: unlit + size: 1 + - type: Construction + graph: smokeableRollie + node: rollie diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml new file mode 100644 index 0000000000..9757ea0715 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml @@ -0,0 +1,73 @@ +- type: entity + id: CigCartonGreen + parent: BoxBase + 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 + - type: Storage + capacity: 36 + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi + - type: StorageFill + contents: + - name: CigPackGreen + amount: 6 + - type: Appearance + visuals: + - type: BagOpenCloseVisualizer + openIcon: open + +- 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: + - name: 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: + - name: 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: + - name: CigPackBlack + amount: 6 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml new file mode 100644 index 0000000000..a2b473e0de --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml @@ -0,0 +1,25 @@ +- type: Tag + id: Cigarette + +- type: entity + id: Cigarette + parent: BaseSmokeable + name: cigarette + description: "A roll of tobacco and nicotine." + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi + netsync: false + state: unlit-icon + - type: Tag + tags: + - Cigarette + - type: Clothing + netsync: false + sprite: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi + Slots: [ mask ] + HeldPrefix: unlit + size: 1 + - type: Construction + graph: smokeableCigarette + node: cigarette diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml new file mode 100644 index 0000000000..6d6f33657a --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -0,0 +1,88 @@ +- type: entity + id: CigPackBase + parent: BaseItem + name: cigarette pack + abstract: true + components: + - type: Sprite + netsync: false + state: closed + - type: Storage + capacity: 6 + - type: Item + size: 6 + - type: StorageFill + contents: + - name: Cigarette + amount: 6 + - type: StorageCounter + countTag: Cigarette + - type: Appearance + visuals: + - type: BagOpenCloseVisualizer + openIcon: open + - type: StackVisualizer + composite: true + stackLayers: + - cig1 + - cig2 + - cig3 + - cig4 + - cig5 + - cig6 + +- 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 + layers: + - state: closed + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi + size: 6 + +- 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 + layers: + - state: closed + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi + size: 6 + +- 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 + layers: + - state: closed + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi + size: 6 + +- 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 + layers: + - state: closed + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi + size: 6 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml new file mode 100644 index 0000000000..800d6a50a5 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml @@ -0,0 +1,50 @@ +- type: entity + parent: BaseItem + name: pack of rolling paper + id: PackPaperRolling + description: "A pack of thin pieces of paper used to make fine smokeables." + components: + # I know but it just works. + - type: FoodContainer + prototypes: + PaperRolling: 100 + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigpapers + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigpapers + +- type: entity + id: PaperRolling + name: rolling paper + description: "A thin piece of paper used to make fine smokeables." + parent: BaseItem + components: + - type: Stack + stacktype: enum.StackType.PaperRolling + max: 5 + count: 1 + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigpaper + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigpaper + +- type: entity + id: CigaretteFilter + name: cigarette filter + description: "A strip of firm paper used as a filter for handmade cigarettes." + parent: BaseItem + components: + - type: Stack + stacktype: enum.StackType.CigaretteFilter + max: 5 + count: 1 + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigfilter + - type: Item + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigfilter diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml new file mode 100644 index 0000000000..110d8da6aa --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml @@ -0,0 +1,48 @@ +- type: entity + id: CigarCase + parent: BaseItem + name: cigar case + description: "A case for holding your cigars when you are not smoking them." + components: + - type: Sprite + netsync: false + sprite: Objects/Consumable/Smokeables/Cigars/case.rsi + layers: + - state: closed + - type: Storage + capacity: 8 + - type: Item + sprite: Objects/Consumable/Smokeables/Cigars/case.rsi + size: 8 + - type: StorageFill + contents: + - name: Cigar + amount: 8 + - type: StorageCounter + countTag: Cigar + - type: Appearance + visuals: + - type: BagOpenCloseVisualizer + openIcon: open + - type: StackVisualizer + composite: true + stackLayers: + - cigar1 + - cigar2 + - cigar3 + - cigar4 + - cigar5 + - cigar6 + - cigar7 + - cigar8 + +- type: entity + id: CigarGoldCase + parent: CigarCase + name: premium cigar case + description: "A case of premium Havanian cigars. You'll only see heads with these." + components: + - type: StorageFill + contents: + - name: CigarGold + amount: 8 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml new file mode 100644 index 0000000000..3c8cb802f9 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml @@ -0,0 +1,39 @@ +- type: Tag + id: Cigar + +- type: entity + id: Cigar + parent: BaseSmokeable + name: cigar + description: "A brown roll of tobacco and... well, you're not quite sure." + components: + - type: Smoking + duration: 70 + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi + netsync: false + state: unlit-icon + - type: Tag + tags: + - Cigar + - type: Clothing + sprite: Objects/Consumable/Smokeables/Cigars/cigar.rsi + Slots: [ mask ] + HeldPrefix: unlit + size: 1 + +- type: entity + id: CigarGold + parent: Cigar + name: premium Havanian cigar + description: "A cigar fit for only the best of the best." + components: + - type: Sprite + sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi + netsync: false + state: unlit-icon + - type: Clothing + sprite: Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi + Slots: [ mask ] + HeldPrefix: unlit + size: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base.yml new file mode 100644 index 0000000000..6e57950d40 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base.yml @@ -0,0 +1,11 @@ +- type: entity + description: "If you want to get cancer, might as well do it in style." + id: BaseSmokeable + parent: BaseItem + abstract: true + components: + - type: Smoking + duration: 50 + - type: Appearance + visuals: + - type: BurnStateVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/pipes.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/pipes.yml new file mode 100644 index 0000000000..e19351dfa4 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/pipes.yml @@ -0,0 +1,17 @@ +- type: entity + id: SmokingPipe + parent: BaseSmokeable + name: smoking pipe + description: "A pipe, for smoking. Probably made of meershaum or something." + components: + - type: Smoking + duration: 70 + - type: Sprite + sprite: Objects/Consumable/Smokeables/Pipes/pipe.rsi + netsync: false + state: unlit-icon + - type: Clothing + sprite: Objects/Consumable/Smokeables/Pipes/pipe.rsi + Slots: [ mask ] + HeldPrefix: unlit + size: 1 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/fancy.yml b/Resources/Prototypes/Entities/Objects/Consumable/fancy.yml deleted file mode 100644 index be305e3ff9..0000000000 --- a/Resources/Prototypes/Entities/Objects/Consumable/fancy.yml +++ /dev/null @@ -1,62 +0,0 @@ -- type: Tag - id: Cigarette -- type: entity - name: "Base Cigarette" - id: BaseCigarette - parent: BaseItem - abstract: true - components: - - type: Sprite - sprite: Objects/Consumable/Fancy/mask_cig.rsi - netsync: false - state: icon - - type: Clothing - sprite: Objects/Consumable/Fancy/mask_cig.rsi - Slots: [ mask ] - HeldPrefix: unlit - size: 1 - - type: Tag - tags: - - Cigarette - - type: Smoking - duration: 30 - - type: Appearance - visuals: - - type: BurnStateVisualizer - -- type: entity - id: Cigarette - parent: BaseCigarette - name: cigarette - description: "If you want to get cancer, might as well do it in style." - -- type: entity - id: CigarettePack - parent: SmallboxItem - name: cigarette pack - description: "Pack of cigarettes" - components: - - type: Sprite - sprite: Objects/Consumable/Fancy/cigarettes.rsi - netsync: false - layers: - - state: cig - - type: StorageFill - contents: - - name: Cigarette - amount: 6 - - type: StorageCounter - countTag: Cigarette - - type: Appearance - visuals: - - type: BagOpenCloseVisualizer - openIcon: cig_open - - type: StackVisualizer - composite: true - stackLayers: - - cigarette_1 - - cigarette_2 - - cigarette_3 - - cigarette_4 - - cigarette_5 - - cigarette_6 diff --git a/Resources/Prototypes/Entities/Objects/Misc/box.yml b/Resources/Prototypes/Entities/Objects/Misc/box.yml index d84d0f45a9..e49a270c7d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/box.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/box.yml @@ -4,6 +4,7 @@ abstract: true components: - type: Sprite + netsync: false sprite: Objects/Storage/boxes.rsi - type: Item sprite: Objects/Storage/boxes.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml index 88f7391bd3..2650ac9f5a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/produce.yml @@ -247,3 +247,117 @@ sprite: Objects/Specific/Hydroponics/chanterelle.rsi - type: Produce seed: chanterelle + +# Leaves + +- type: entity + name: cannabis leaves + parent: ProduceBase + id: LeavesCannabis + description: "Recently legalized in most galaxies." + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/cannabis.rsi + - type: Produce + seed: cannabis + - type: Food + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.THCOil + Quantity: 5 + +- type: entity + name: dried cannabis leaves + parent: BaseItem + id: LeavesCannabisDried + description: "Dried cannabis leaves, ready to be ground." + components: + - type: Stack + stacktype: enum.StackType.LeavesCannabisDried + max: 5 + count: 1 + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.THC + Quantity: 2 + - type: Sprite + sprite: Objects/Specific/Hydroponics/tobacco.rsi + state: dried + +- type: entity + name: ground cannabis + parent: BaseItem + id: GroundCannabis + description: "Ground cannabis, ready to take you on a trip." + components: + - type: Stack + stacktype: enum.StackType.GroundCannabis + max: 5 + count: 1 + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.THC + Quantity: 10 + - type: Sprite + sprite: Objects/Misc/reageant_fillings.rsi + state: powderpile + color: darkgreen + - type: Construction + graph: smokeableGroundCannabis + node: ground + +- type: entity + name: tobacco leaves + parent: ProduceBase + id: LeavesTobacco + description: "Dry them out to make some smokes." + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/tobacco.rsi + - type: Produce + seed: tobacco + +- type: entity + name: dried tobacco leaves + parent: BaseItem + id: LeavesTobaccoDried + description: "Dried tobacco leaves, ready to be ground." + components: + - type: Stack + stacktype: enum.StackType.LeavesTobaccoDried + max: 5 + count: 1 + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Nicotine + Quantity: 2 + - type: Sprite + sprite: Objects/Specific/Hydroponics/tobacco.rsi + state: dried + +- type: entity + name: ground tobacco + parent: BaseItem + id: GroundTobacco + description: "Ground tobacco, perfect for hand-rolled cigarettes." + components: + - type: Stack + stacktype: enum.StackType.GroundTobacco + max: 5 + count: 1 + - type: SolutionContainer + contents: + reagents: + - ReagentId: chem.Nicotine + Quantity: 10 + - type: Sprite + sprite: Objects/Misc/reageant_fillings.rsi + state: powderpile + color: brown + - type: Construction + graph: smokeableGroundTobacco + node: ground diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index c98868dd24..6c78f40235 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -140,3 +140,25 @@ seed: eggy - type: Sprite sprite: Objects/Specific/Hydroponics/eggy.rsi + +- type: entity + parent: SeedBase + name: packet of tobacco seeds + description: "These seeds grow into tobacco plants." + id: TobaccoSeeds + components: + - type: Seed + seed: tobacco + - type: Sprite + sprite: Objects/Specific/Hydroponics/tobacco.rsi + +- type: entity + parent: SeedBase + name: packet of cannabis seeds + description: "Taxable." + id: CannabisSeeds + components: + - type: Seed + seed: cannabis + - type: Sprite + sprite: Objects/Specific/Hydroponics/cannabis.rsi diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 3c6dd8c8fc..54c7ecd2fe 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -286,3 +286,49 @@ Min: 1 Max: 10 PotencyDivisor: 10 + +- type: seed + id: cannabis + name: cannabis + seedName: cannabis + displayName: cannabis + plantRsi: Objects/Specific/Hydroponics/cannabis.rsi + productPrototypes: + - LeavesCannabis + harvestRepeat: Repeat + lifespan: 75 + maturation: 8 + production: 12 + yield: 2 + potency: 20 + growthStages: 3 + idealLight: 9 + idealHeat: 298 + chemicals: + chem.THC: + Min: 1 + Max: 10 + PotencyDivisor: 10 + +- type: seed + id: tobacco + name: tobacco + seedName: tobacco + displayName: tobacco plant + plantRsi: Objects/Specific/Hydroponics/tobacco.rsi + productPrototypes: + - LeavesTobacco + harvestRepeat: Repeat + lifespan: 75 + maturation: 5 + production: 5 + yield: 2 + potency: 20 + growthStages: 3 + idealLight: 9 + idealHeat: 298 + chemicals: + chem.Nicotine: + Min: 1 + Max: 10 + PotencyDivisor: 10 diff --git a/Resources/Prototypes/Reagents/botany.yml b/Resources/Prototypes/Reagents/botany.yml index c1f6a3e321..720991af9d 100644 --- a/Resources/Prototypes/Reagents/botany.yml +++ b/Resources/Prototypes/Reagents/botany.yml @@ -80,3 +80,25 @@ amount: 4 - !type:AdjustWeeds amount: -6 + +- type: reagent + id: chem.THC + name: THC + desc: The main psychoactive compound in cannabis. + color: "#808080" + physicalDesc: crystalline + plantMetabolism: + - !type:AdjustNutrition + amount: -5 + - !type:AdjustHealth + amount: -1 + +- type: reagent + id: chem.Nicotine + name: Nicotine + desc: Dangerous and highly addictive. + color: "#C0C0C0" + physicalDesc: strong smelling + plantMetabolism: + - !type:AdjustHealth + amount: -5 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index b87417674e..1da32293e3 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -305,3 +305,10 @@ desc: An illegal compound which induces a number of effects such as loss of balance and visual artefacts. physicalDesc: syrupy color: "#63806e" + +- type: reagent + id: chem.THCOil + name: THC oil + desc: Pure THC oil, extracted from the leaves of the cannabis plant. Much stronger than in it's natural form and can be used to numb chronic pain in patients. + physicalDesc: skunky + color: "#DAA520" diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 6274f75836..76a741ad20 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -334,12 +334,20 @@ solids: FoodMiloSoup: 1 -#Handy template for copy **pasta**. Get it? Pasta? Aw whatever fuck you. -# - type: microwaveMealRecipe -# id: -# name: -# result: -# time: 5 -# reagents: +# NOT ACTUAL FOOD -# solids: +- type: microwaveMealRecipe + id: RecipeDriedCannabis + name: dried cannabis leaves recipe + result: LeavesTobaccoDried + time: 10 + solids: + LeavesTobacco: 1 + +- type: microwaveMealRecipe + id: RecipeDriedTobacco + name: dried tobacco leaves recipe + result: LeavesCannabisDried + time: 10 + solids: + LeavesCannabis: 1 diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml new file mode 100644 index 0000000000..dbbdabfcc1 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml @@ -0,0 +1,100 @@ +- type: constructionGraph + id: smokeableRollie + start: start + graph: + - node: start + edges: + - to: rollie + steps: + - prototype: PaperRolling + icon: + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigpaper + name: rolling paper + - prototype: CigaretteFilter + icon: + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigfilter + name: cigarette filter + - prototype: GroundCannabis + icon: + sprite: Objects/Misc/reageant_fillings.rsi + state: powderpile +# color: darkgreen + name: ground cannabis + doAfter: 2 + - node: rollie + entity: Rollie + +- type: constructionGraph + id: smokeableCigarette + start: start + graph: + - node: start + edges: + - to: cigarette + steps: + - prototype: PaperRolling + icon: + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigpaper + name: rolling paper + - prototype: CigaretteFilter + icon: + sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi + state: cigfilter + name: cigarette filter + - prototype: GroundTobacco + icon: + sprite: Objects/Misc/reageant_fillings.rsi + state: powderpile +# color: brown + name: ground tobacco + doAfter: 2 + - node: cigarette + entity: Cigarette + +- type: constructionGraph + id: smokeableGroundCannabis + start: start + graph: + - node: start + edges: + - to: ground + steps: + - prototype: LeavesCannabisDried + icon: + sprite: Objects/Specific/Hydroponics/cannabis.rsi + state: dried + name: dried cannabis leaves + - prototype: LeavesCannabisDried + icon: + sprite: Objects/Specific/Hydroponics/cannabis.rsi + state: dried + name: dried cannabis leaves + doAfter: 5 + - node: ground + entity: GroundCannabis + +- type: constructionGraph + id: smokeableGroundTobacco + start: start + graph: + - node: start + edges: + - to: ground + steps: + - prototype: LeavesTobaccoDried + icon: + sprite: Objects/Specific/Hydroponics/tobacco.rsi + state: dried + name: dried tobacco leaves + - prototype: LeavesTobaccoDried + icon: + sprite: Objects/Specific/Hydroponics/tobacco.rsi + state: dried + name: dried tobacco leaves + doAfter: 5 + + - node: ground + entity: GroundTobacco diff --git a/Resources/Prototypes/Recipes/Crafting/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/smokeables.yml new file mode 100644 index 0000000000..d23de733e8 --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/smokeables.yml @@ -0,0 +1,47 @@ +- type: construction + name: rollie + id: smokeableRollie + graph: smokeableRollie + startNode: start + targetNode: rollie + category: Misc + description: "A roll of dried plant matter wrapped in thin paper." + icon: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png + objectType: Item + +- type: construction + name: cigarette + id: smokeableCigarette + graph: smokeableCigarette + startNode: start + targetNode: cigarette + category: Misc + description: "A roll of tobacco and nicotine." + icon: Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-icon.png + objectType: Item + +# I wanted to put a hand-grinder here but we need construction graphs that use non-consumed catalysts first. + +- type: construction + name: ground cannabis + id: smokeableGroundCannabis + graph: smokeableGroundCannabis + startNode: start + targetNode: ground + category: Misc + description: "Ground cannabis, ready to take you on a trip." + icon: Objects/Misc/reageant_fillings.rsi/powderpile.png +# color: darkgreen + objectType: Item + +- type: construction + name: ground tobacco + id: smokeableGroundTobacco + graph: smokeableGroundTobacco + startNode: start + targetNode: ground + category: Misc + description: "Ground tobacco, perfect for hand-rolled cigarettes." + icon: Objects/Misc/reageant_fillings.rsi/powderpile.png +# color: brown + objectType: Item diff --git a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig.png b/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig.png deleted file mode 100644 index 845968ae9f..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig_empty.png b/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig_empty.png deleted file mode 100644 index 42abce58e0..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig_empty.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig_open.png b/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig_open.png deleted file mode 100644 index 45bf3c6cc0..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig_open.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_1.png b/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_1.png deleted file mode 100644 index 93f34c641c..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_1.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_2.png b/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_2.png deleted file mode 100644 index ec90405507..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_2.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_3.png b/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_3.png deleted file mode 100644 index 7e3eb0c1b9..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_3.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_4.png b/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_4.png deleted file mode 100644 index bf9361b9b5..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_4.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_5.png b/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_5.png deleted file mode 100644 index 6d0a066c52..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_5.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_6.png b/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_6.png deleted file mode 100644 index 53048fed17..0000000000 Binary files a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_6.png and /dev/null differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/meta.json b/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/meta.json deleted file mode 100644 index a33f00be16..0000000000 --- a/Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/meta.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "cig" - }, - { - "name": "cig_empty" - }, - { - "name": "cig_open" - }, - { - "name": "cigarette_1" - }, - { - "name": "cigarette_2" - }, - { - "name": "cigarette_3" - }, - { - "name": "cigarette_4" - }, - { - "name": "cigarette_5" - }, - { - "name": "cigarette_6" - } - ] -} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png new file mode 100644 index 0000000000..a2d008910c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png new file mode 100644 index 0000000000..fa238f8de7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png new file mode 100644 index 0000000000..263f797355 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json new file mode 100644 index 0000000000..00190d8818 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.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/black.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/open.png new file mode 100644 index 0000000000..be3e5ff1ee Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png new file mode 100644 index 0000000000..830e4c6953 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png new file mode 100644 index 0000000000..4022576f4e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png new file mode 100644 index 0000000000..c369df8d2c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json new file mode 100644 index 0000000000..00190d8818 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.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/blue.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/open.png new file mode 100644 index 0000000000..78a710de74 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png new file mode 100644 index 0000000000..61cc98703d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png new file mode 100644 index 0000000000..27f428832a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png new file mode 100644 index 0000000000..c4007a3355 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json new file mode 100644 index 0000000000..00190d8818 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.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/green.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/open.png new file mode 100644 index 0000000000..14eb8b6ca8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png new file mode 100644 index 0000000000..79e47ba47b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png new file mode 100644 index 0000000000..683e37bb45 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png new file mode 100644 index 0000000000..57468a3b1b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json new file mode 100644 index 0000000000..00190d8818 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.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/red.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/open.png new file mode 100644 index 0000000000..ad4eb63127 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig1.png new file mode 100644 index 0000000000..cc8c846f38 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig1.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig2.png new file mode 100644 index 0000000000..446d606c89 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig2.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig3.png new file mode 100644 index 0000000000..72e1aa40d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig3.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig4.png new file mode 100644 index 0000000000..0d9b28188e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig4.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig5.png new file mode 100644 index 0000000000..b79eef3d2d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig5.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig6.png new file mode 100644 index 0000000000..8f39716ef2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig6.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png new file mode 100644 index 0000000000..0b18a29cda Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png new file mode 100644 index 0000000000..fa238f8de7 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png new file mode 100644 index 0000000000..263f797355 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json new file mode 100644 index 0000000000..aa330b70a5 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "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": "cig1" + }, + { + "name": "cig2" + }, + { + "name": "cig3" + }, + { + "name": "cig4" + }, + { + "name": "cig5" + }, + { + "name": "cig6" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png new file mode 100644 index 0000000000..482f53e0d6 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png new file mode 100644 index 0000000000..601d8927fb Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig1.png new file mode 100644 index 0000000000..cc8c846f38 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig1.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig2.png new file mode 100644 index 0000000000..446d606c89 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig2.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig3.png new file mode 100644 index 0000000000..72e1aa40d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig3.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig4.png new file mode 100644 index 0000000000..0d9b28188e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig4.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig5.png new file mode 100644 index 0000000000..b79eef3d2d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig5.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig6.png new file mode 100644 index 0000000000..8f39716ef2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig6.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png new file mode 100644 index 0000000000..21a07b90c8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png new file mode 100644 index 0000000000..4022576f4e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png new file mode 100644 index 0000000000..c369df8d2c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json new file mode 100644 index 0000000000..aa330b70a5 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "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": "cig1" + }, + { + "name": "cig2" + }, + { + "name": "cig3" + }, + { + "name": "cig4" + }, + { + "name": "cig5" + }, + { + "name": "cig6" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png new file mode 100644 index 0000000000..60c7f9975d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png new file mode 100644 index 0000000000..a80b8ec860 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig1.png new file mode 100644 index 0000000000..cc8c846f38 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig1.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig2.png new file mode 100644 index 0000000000..446d606c89 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig2.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig3.png new file mode 100644 index 0000000000..72e1aa40d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig3.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig4.png new file mode 100644 index 0000000000..0d9b28188e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig4.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig5.png new file mode 100644 index 0000000000..b79eef3d2d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig5.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig6.png new file mode 100644 index 0000000000..8f39716ef2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig6.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png new file mode 100644 index 0000000000..fa5fa930c1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png new file mode 100644 index 0000000000..27f428832a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png new file mode 100644 index 0000000000..c4007a3355 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json new file mode 100644 index 0000000000..aa330b70a5 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "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": "cig1" + }, + { + "name": "cig2" + }, + { + "name": "cig3" + }, + { + "name": "cig4" + }, + { + "name": "cig5" + }, + { + "name": "cig6" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png new file mode 100644 index 0000000000..463e51db96 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png new file mode 100644 index 0000000000..65470ecb3f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig1.png new file mode 100644 index 0000000000..cc8c846f38 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig1.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig2.png new file mode 100644 index 0000000000..446d606c89 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig2.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig3.png new file mode 100644 index 0000000000..72e1aa40d4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig3.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig4.png new file mode 100644 index 0000000000..0d9b28188e Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig4.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig5.png new file mode 100644 index 0000000000..b79eef3d2d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig5.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig6.png new file mode 100644 index 0000000000..8f39716ef2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig6.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png new file mode 100644 index 0000000000..6faf9c0567 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png new file mode 100644 index 0000000000..683e37bb45 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png new file mode 100644 index 0000000000..57468a3b1b Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json new file mode 100644 index 0000000000..aa330b70a5 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "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": "cig1" + }, + { + "name": "cig2" + }, + { + "name": "cig3" + }, + { + "name": "cig4" + }, + { + "name": "cig5" + }, + { + "name": "cig6" + }, + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "trash" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png new file mode 100644 index 0000000000..977b9bb1f9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png new file mode 100644 index 0000000000..d3ded3558d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/burnt-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/burnt-icon.png new file mode 100644 index 0000000000..8bd96119f9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/burnt-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-equipped-MASK.png new file mode 100644 index 0000000000..ced9c03bce Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-icon.png new file mode 100644 index 0000000000..b0ad909a71 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-inhand-left.png new file mode 100644 index 0000000000..294f326780 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-inhand-right.png new file mode 100644 index 0000000000..3a4e9e8f9d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/meta.json new file mode 100644 index 0000000000..00fcb768fb --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/meta.json @@ -0,0 +1,182 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-equipped-MASK.png new file mode 100644 index 0000000000..a28788ca44 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png new file mode 100644 index 0000000000..a41875a41c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-inhand-left.png new file mode 100644 index 0000000000..e8bfce8645 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-inhand-right.png new file mode 100644 index 0000000000..4635cb206c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/burnt-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/burnt-icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/burnt-icon.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/burnt-icon.png diff --git a/Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/lit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/lit-equipped-MASK.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-equipped-MASK.png diff --git a/Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/lit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/lit-icon.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-icon.png diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png new file mode 100644 index 0000000000..294f326780 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png new file mode 100644 index 0000000000..3a4e9e8f9d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json new file mode 100644 index 0000000000..00fcb768fb --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json @@ -0,0 +1,182 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/unlit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/unlit-equipped-MASK.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-equipped-MASK.png diff --git a/Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-icon.png similarity index 100% rename from Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/icon.png rename to Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-icon.png diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png new file mode 100644 index 0000000000..e8bfce8645 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png new file mode 100644 index 0000000000..4635cb206c Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigfilter.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigfilter.png new file mode 100644 index 0000000000..431b489fc3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigfilter.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpaper.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpaper.png new file mode 100644 index 0000000000..8e126d7ca3 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpaper.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpapers.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpapers.png new file mode 100644 index 0000000000..4b54f511a1 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpapers.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json new file mode 100644 index 0000000000..78d7b18b89 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "cigfilter" + }, + { + "name": "cigpapers" + }, + { + "name": "trash-cigpapers" + }, + { + "name": "cigpaper" + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/trash-cigpapers.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/trash-cigpapers.png new file mode 100644 index 0000000000..7a251dc9e8 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/trash-cigpapers.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar1.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar1.png new file mode 100644 index 0000000000..3d9d62bdc5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar1.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar2.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar2.png new file mode 100644 index 0000000000..63c8cd4346 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar2.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar3.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar3.png new file mode 100644 index 0000000000..c29e78f223 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar3.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar4.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar4.png new file mode 100644 index 0000000000..703fc2a467 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar4.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar5.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar5.png new file mode 100644 index 0000000000..e6f009f414 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar5.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar6.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar6.png new file mode 100644 index 0000000000..1c619a519f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar6.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar7.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar7.png new file mode 100644 index 0000000000..5ef817decf Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar7.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar8.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar8.png new file mode 100644 index 0000000000..8645a8c3c4 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar8.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/closed.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/closed.png new file mode 100644 index 0000000000..93400e974f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/closed.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/inhand-left.png new file mode 100644 index 0000000000..805da9bb87 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/inhand-right.png new file mode 100644 index 0000000000..a7b46b6b93 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/meta.json new file mode 100644 index 0000000000..4e24b483e6 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/meta.json @@ -0,0 +1,49 @@ +{ + "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": "cigar1" + }, + { + "name": "cigar2" + }, + { + "name": "cigar3" + }, + { + "name": "cigar4" + }, + { + "name": "cigar5" + }, + { + "name": "cigar6" + }, + { + "name": "cigar7" + }, + { + "name": "cigar8" + }, + { + "name": "open" + }, + { + "name": "closed" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/open.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/open.png new file mode 100644 index 0000000000..780937baa5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/open.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/burnt-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/burnt-icon.png new file mode 100644 index 0000000000..b0f0b08560 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/burnt-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-equipped-MASK.png new file mode 100644 index 0000000000..ac8547199a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-icon.png new file mode 100644 index 0000000000..64d7e1dc75 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-left.png new file mode 100644 index 0000000000..353efa3f39 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-right.png new file mode 100644 index 0000000000..cdeedb4c24 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json new file mode 100644 index 0000000000..c219407953 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json @@ -0,0 +1,170 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon" + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-equipped-MASK.png new file mode 100644 index 0000000000..e46afbfc89 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-icon.png new file mode 100644 index 0000000000..9175915455 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-left.png new file mode 100644 index 0000000000..9c3943fbf2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-right.png new file mode 100644 index 0000000000..0f4ab68d15 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/burnt-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/burnt-icon.png new file mode 100644 index 0000000000..b0f0b08560 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/burnt-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-equipped-MASK.png new file mode 100644 index 0000000000..ac8547199a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-icon.png new file mode 100644 index 0000000000..475a2792a9 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-left.png new file mode 100644 index 0000000000..353efa3f39 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-right.png new file mode 100644 index 0000000000..cdeedb4c24 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json new file mode 100644 index 0000000000..c219407953 --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json @@ -0,0 +1,170 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon" + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-equipped-MASK.png new file mode 100644 index 0000000000..e46afbfc89 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-icon.png new file mode 100644 index 0000000000..1e13cc1116 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-left.png new file mode 100644 index 0000000000..9c3943fbf2 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-right.png new file mode 100644 index 0000000000..0f4ab68d15 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-equipped-MASK.png new file mode 100644 index 0000000000..a98c989fb0 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-icon.png new file mode 100644 index 0000000000..963bc5c708 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json similarity index 82% rename from Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/meta.json rename to Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json index fe7f2d1c1c..a7420e3c72 100644 --- a/Resources/Textures/Objects/Consumable/Fancy/mask_cig.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/meta.json @@ -23,6 +23,9 @@ 0.1, 0.1, 0.1, + 0.1, + 0.1, + 0.1, 0.1 ], [ @@ -33,6 +36,9 @@ 0.1, 0.1, 0.1, + 0.1, + 0.1, + 0.1, 0.1 ], [ @@ -43,6 +49,9 @@ 0.1, 0.1, 0.1, + 0.1, + 0.1, + 0.1, 0.1 ], [ @@ -53,15 +62,15 @@ 0.1, 0.1, 0.1, + 0.1, + 0.1, + 0.1, 0.1 ] ] }, { - "name": "burnt-icon" - }, - { - "name": "icon" + "name": "unlit-icon" }, { "name": "lit-icon", @@ -74,6 +83,9 @@ 0.1, 0.1, 0.1, + 0.1, + 0.1, + 0.1, 0.1 ] ] diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-equipped-MASK.png new file mode 100644 index 0000000000..9f38c2ad67 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-icon.png new file mode 100644 index 0000000000..305151c79d Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/burnt-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/burnt-icon.png new file mode 100644 index 0000000000..ea20286359 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/burnt-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK.png new file mode 100644 index 0000000000..adc3efaa85 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-icon.png new file mode 100644 index 0000000000..d17b3fa7d5 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-inhand-left.png new file mode 100644 index 0000000000..8ad8f89568 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-inhand-right.png new file mode 100644 index 0000000000..1ba524e64a Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json new file mode 100644 index 0000000000..00fcb768fb --- /dev/null +++ b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json @@ -0,0 +1,182 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-equipped-MASK", + "directions": 4 + }, + { + "name": "lit-equipped-MASK", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "burnt-icon" + }, + { + "name": "unlit-icon" + }, + { + "name": "lit-icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "lit-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK.png new file mode 100644 index 0000000000..d31ec4c6ca Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-icon.png new file mode 100644 index 0000000000..ea20286359 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-icon.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-inhand-left.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-inhand-left.png new file mode 100644 index 0000000000..3d468a47ee Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-inhand-right.png new file mode 100644 index 0000000000..386827feef Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack0.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack0.png new file mode 100644 index 0000000000..05f3127136 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack0.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack15.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack15.png new file mode 100644 index 0000000000..87af9277bb Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack15.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack60.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack60.png new file mode 100644 index 0000000000..b77569d5ed Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack60.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob-10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob-10.png new file mode 100644 index 0000000000..17835faabb Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob-10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob100.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob100.png new file mode 100644 index 0000000000..1a01ae51cf Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob100.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob50.png new file mode 100644 index 0000000000..1cc753cd78 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker0.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker0.png new file mode 100644 index 0000000000..2b55477166 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker0.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker10.png new file mode 100644 index 0000000000..8d45040219 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker25.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker25.png new file mode 100644 index 0000000000..ea42dcb835 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker25.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker50.png new file mode 100644 index 0000000000..09a2afe7ff Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker75.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker75.png new file mode 100644 index 0000000000..254a948543 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker75.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker80.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker80.png new file mode 100644 index 0000000000..a0f0bf3cd7 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker80.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker90.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker90.png new file mode 100644 index 0000000000..f61b5c2fb9 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker90.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold0.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold0.png new file mode 100644 index 0000000000..3041d36349 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold0.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold10.png new file mode 100644 index 0000000000..ef8ed318b5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold25.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold25.png new file mode 100644 index 0000000000..3ec712cb2b Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold25.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold50.png new file mode 100644 index 0000000000..73194d0316 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold75.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold75.png new file mode 100644 index 0000000000..e04fec1a7a Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold75.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold80.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold80.png new file mode 100644 index 0000000000..f778f0e8ca Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold80.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold90.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold90.png new file mode 100644 index 0000000000..c8ac8a9188 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold90.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge0.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge0.png new file mode 100644 index 0000000000..3041d36349 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge0.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge10.png new file mode 100644 index 0000000000..f7bf191cd5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge25.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge25.png new file mode 100644 index 0000000000..ef8ed318b5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge25.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge50.png new file mode 100644 index 0000000000..83415b883f Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge75.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge75.png new file mode 100644 index 0000000000..bb4a33170c Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge75.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge80.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge80.png new file mode 100644 index 0000000000..73194d0316 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge80.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge90.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge90.png new file mode 100644 index 0000000000..49f87ec81e Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge90.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack10.png new file mode 100644 index 0000000000..4a2e33d1ce Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack100.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack100.png new file mode 100644 index 0000000000..286ef3bc3c Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack100.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack20.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack20.png new file mode 100644 index 0000000000..193f143491 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack20.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack30.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack30.png new file mode 100644 index 0000000000..461ca8a00e Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack30.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack40.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack40.png new file mode 100644 index 0000000000..fa9681675f Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack40.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack50.png new file mode 100644 index 0000000000..d22d725b23 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack60.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack60.png new file mode 100644 index 0000000000..c1ecde3571 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack60.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack70.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack70.png new file mode 100644 index 0000000000..ca017f3dfb Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack70.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack80.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack80.png new file mode 100644 index 0000000000..b233efefb5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack80.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack90.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack90.png new file mode 100644 index 0000000000..8bff06bbcf Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack90.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle0.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle0.png new file mode 100644 index 0000000000..90671e7dd9 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle0.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle10.png new file mode 100644 index 0000000000..cbebd909c0 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle30.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle30.png new file mode 100644 index 0000000000..8e6c3165b7 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle30.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle50.png new file mode 100644 index 0000000000..fc1b303acf Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle70.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle70.png new file mode 100644 index 0000000000..ea53b81a3c Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle70.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack10.png new file mode 100644 index 0000000000..4a2e33d1ce Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack100.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack100.png new file mode 100644 index 0000000000..cf88f91d17 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack100.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack20.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack20.png new file mode 100644 index 0000000000..f8976de36f Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack20.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack30.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack30.png new file mode 100644 index 0000000000..2fc2393112 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack30.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack40.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack40.png new file mode 100644 index 0000000000..ac1569544d Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack40.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack50.png new file mode 100644 index 0000000000..322d476f93 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack60.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack60.png new file mode 100644 index 0000000000..fd2d3e93df Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack60.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack70.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack70.png new file mode 100644 index 0000000000..8cba3a1dcb Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack70.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack80.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack80.png new file mode 100644 index 0000000000..0555a85408 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack80.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack90.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack90.png new file mode 100644 index 0000000000..1897534111 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack90.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/dropper.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/dropper.png new file mode 100644 index 0000000000..999d333ab8 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/dropper.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment0.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment0.png new file mode 100644 index 0000000000..2e0e54fd48 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment0.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment10.png new file mode 100644 index 0000000000..8373017240 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment100.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment100.png new file mode 100644 index 0000000000..fdc000beff Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment100.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment25.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment25.png new file mode 100644 index 0000000000..e5e95416a6 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment25.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment50.png new file mode 100644 index 0000000000..dae9d037d5 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment75.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment75.png new file mode 100644 index 0000000000..5f2a0244b0 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment75.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle0.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle0.png new file mode 100644 index 0000000000..ca02e27dd6 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle0.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle10.png new file mode 100644 index 0000000000..fcf83be5da Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle20.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle20.png new file mode 100644 index 0000000000..784b99fa44 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle20.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle30.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle30.png new file mode 100644 index 0000000000..52300aab57 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle30.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle40.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle40.png new file mode 100644 index 0000000000..7bf88df527 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle40.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle50.png new file mode 100644 index 0000000000..2f6cc772c4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle60.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle60.png new file mode 100644 index 0000000000..79e0f85ba0 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle60.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle70.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle70.png new file mode 100644 index 0000000000..424abde374 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle70.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle80.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle80.png new file mode 100644 index 0000000000..192ca0ef13 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle80.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle90.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle90.png new file mode 100644 index 0000000000..d2de15aab7 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle90.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall0.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall0.png new file mode 100644 index 0000000000..b49dca12ac Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall0.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall10.png new file mode 100644 index 0000000000..7a92e7c497 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall20.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall20.png new file mode 100644 index 0000000000..09c7c9f830 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall20.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall30.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall30.png new file mode 100644 index 0000000000..9ada238c73 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall30.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall40.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall40.png new file mode 100644 index 0000000000..9d80bfc661 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall40.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall50.png new file mode 100644 index 0000000000..757f7e492c Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall60.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall60.png new file mode 100644 index 0000000000..a619371b58 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall60.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall70.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall70.png new file mode 100644 index 0000000000..b104c5fdbc Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall70.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall80.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall80.png new file mode 100644 index 0000000000..3b19c2b22e Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall80.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall90.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall90.png new file mode 100644 index 0000000000..1727ff5943 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall90.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle0.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle0.png new file mode 100644 index 0000000000..3974e82cdf Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle0.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle10.png new file mode 100644 index 0000000000..c00df70a59 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle25.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle25.png new file mode 100644 index 0000000000..33d921d8f2 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle25.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle50.png new file mode 100644 index 0000000000..1f964fe37a Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle75.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle75.png new file mode 100644 index 0000000000..61fd62c4db Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle75.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle80.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle80.png new file mode 100644 index 0000000000..7ef3ec2c2d Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle80.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle90.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle90.png new file mode 100644 index 0000000000..414c770679 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle90.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/maunafilling25.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/maunafilling25.png new file mode 100644 index 0000000000..ecd81cc496 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/maunafilling25.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/meta.json b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/meta.json new file mode 100644 index 0000000000..8a13e84ddc --- /dev/null +++ b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/meta.json @@ -0,0 +1,317 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/a7215663648f4289d2446a1c82aec1c9a406310c", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "backpack0" + }, + { + "name": "backpack15" + }, + { + "name": "backpack60" + }, + { + "name": "backpackmob-10", + "directions": 4 + }, + { + "name": "backpackmob100", + "directions": 4 + }, + { + "name": "backpackmob50", + "directions": 4 + }, + { + "name": "beaker0" + }, + { + "name": "beaker10" + }, + { + "name": "beaker25" + }, + { + "name": "beaker50" + }, + { + "name": "beaker75" + }, + { + "name": "beaker80" + }, + { + "name": "beaker90" + }, + { + "name": "beakergold0" + }, + { + "name": "beakergold10" + }, + { + "name": "beakergold25" + }, + { + "name": "beakergold50" + }, + { + "name": "beakergold75" + }, + { + "name": "beakergold80" + }, + { + "name": "beakergold90" + }, + { + "name": "beakerlarge0" + }, + { + "name": "beakerlarge10" + }, + { + "name": "beakerlarge25" + }, + { + "name": "beakerlarge50" + }, + { + "name": "beakerlarge75" + }, + { + "name": "beakerlarge80" + }, + { + "name": "beakerlarge90" + }, + { + "name": "bloodpack10" + }, + { + "name": "bloodpack100" + }, + { + "name": "bloodpack20" + }, + { + "name": "bloodpack30" + }, + { + "name": "bloodpack40" + }, + { + "name": "bloodpack50" + }, + { + "name": "bloodpack60" + }, + { + "name": "bloodpack70" + }, + { + "name": "bloodpack80" + }, + { + "name": "bloodpack90" + }, + { + "name": "bottle0" + }, + { + "name": "bottle10" + }, + { + "name": "bottle30" + }, + { + "name": "bottle50" + }, + { + "name": "bottle70" + }, + { + "name": "chempack10" + }, + { + "name": "chempack100" + }, + { + "name": "chempack20" + }, + { + "name": "chempack30" + }, + { + "name": "chempack40" + }, + { + "name": "chempack50" + }, + { + "name": "chempack60" + }, + { + "name": "chempack70" + }, + { + "name": "chempack80" + }, + { + "name": "chempack90" + }, + { + "name": "dropper" + }, + { + "name": "emptycondiment0" + }, + { + "name": "emptycondiment10" + }, + { + "name": "emptycondiment100" + }, + { + "name": "emptycondiment25" + }, + { + "name": "emptycondiment50" + }, + { + "name": "emptycondiment75" + }, + { + "name": "glassbottle0" + }, + { + "name": "glassbottle10" + }, + { + "name": "glassbottle20" + }, + { + "name": "glassbottle30" + }, + { + "name": "glassbottle40" + }, + { + "name": "glassbottle50" + }, + { + "name": "glassbottle60" + }, + { + "name": "glassbottle70" + }, + { + "name": "glassbottle80" + }, + { + "name": "glassbottle90" + }, + { + "name": "glassbottlesmall0" + }, + { + "name": "glassbottlesmall10" + }, + { + "name": "glassbottlesmall20" + }, + { + "name": "glassbottlesmall30" + }, + { + "name": "glassbottlesmall40" + }, + { + "name": "glassbottlesmall50" + }, + { + "name": "glassbottlesmall60" + }, + { + "name": "glassbottlesmall70" + }, + { + "name": "glassbottlesmall80" + }, + { + "name": "glassbottlesmall90" + }, + { + "name": "largebottle0" + }, + { + "name": "largebottle10" + }, + { + "name": "largebottle25" + }, + { + "name": "largebottle50" + }, + { + "name": "largebottle75" + }, + { + "name": "largebottle80" + }, + { + "name": "largebottle90" + }, + { + "name": "maunafilling25" + }, + { + "name": "pill" + }, + { + "name": "powderpile" + }, + { + "name": "smallbottle-10" + }, + { + "name": "smallbottle10" + }, + { + "name": "smallbottle25" + }, + { + "name": "smallbottle50" + }, + { + "name": "smallbottle75" + }, + { + "name": "smallbottle80" + }, + { + "name": "smallbottle90" + }, + { + "name": "splashed" + }, + { + "name": "syringe1" + }, + { + "name": "syringe10" + }, + { + "name": "syringe15" + }, + { + "name": "syringe5" + } + ] +} diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/pill.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/pill.png new file mode 100644 index 0000000000..978372ced8 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/pill.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/powderpile.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/powderpile.png new file mode 100644 index 0000000000..33ad4248a3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/powderpile.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle-10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle-10.png new file mode 100644 index 0000000000..ffa183eccb Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle-10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle10.png new file mode 100644 index 0000000000..bafddb3bdd Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle25.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle25.png new file mode 100644 index 0000000000..344e45c81d Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle25.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle50.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle50.png new file mode 100644 index 0000000000..7c6941e780 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle50.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle75.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle75.png new file mode 100644 index 0000000000..149f77ad9a Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle75.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle80.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle80.png new file mode 100644 index 0000000000..78ebfcc3a4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle80.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle90.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle90.png new file mode 100644 index 0000000000..4f392a2288 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle90.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/splashed.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/splashed.png new file mode 100644 index 0000000000..2f666c7167 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/splashed.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe1.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe1.png new file mode 100644 index 0000000000..d213808617 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe1.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe10.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe10.png new file mode 100644 index 0000000000..76a636e060 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe10.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe15.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe15.png new file mode 100644 index 0000000000..7fd7135d5d Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe15.png differ diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe5.png b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe5.png new file mode 100644 index 0000000000..423cbd2070 Binary files /dev/null and b/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe5.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/dead.png new file mode 100644 index 0000000000..2eb3c64ca9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/dried.png b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/dried.png new file mode 100644 index 0000000000..2225e4de48 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/dried.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/harvest.png new file mode 100644 index 0000000000..37c16d1c1d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/meta.json new file mode 100644 index 0000000000..3debab90a4 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA 3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at 1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "dried" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png new file mode 100644 index 0000000000..a03a31182b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/seed.png new file mode 100644 index 0000000000..4fd0fb182a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-1.png new file mode 100644 index 0000000000..d4c3f4353f Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-2.png new file mode 100644 index 0000000000..e331d30fb0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-3.png new file mode 100644 index 0000000000..186d1da999 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/dead.png new file mode 100644 index 0000000000..2eb3c64ca9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/harvest.png new file mode 100644 index 0000000000..76e9cde015 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/meta.json new file mode 100644 index 0000000000..021930d952 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA 3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da3da71e29400c8c2879037ae8d74e690a6fe604", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/produce.png new file mode 100644 index 0000000000..005accc4bf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/seed.png new file mode 100644 index 0000000000..52450000b8 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-1.png new file mode 100644 index 0000000000..01da7f9119 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-2.png new file mode 100644 index 0000000000..1d93452071 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-3.png new file mode 100644 index 0000000000..1712791a93 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/dead.png new file mode 100644 index 0000000000..2eb3c64ca9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/dried.png b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/dried.png new file mode 100644 index 0000000000..2225e4de48 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/dried.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/harvest.png new file mode 100644 index 0000000000..b359f23557 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/meta.json new file mode 100644 index 0000000000..7adf3b30e9 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA 3.0", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da3da71e29400c8c2879037ae8d74e690a6fe604", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "dried" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/produce.png new file mode 100644 index 0000000000..33a9636421 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/seed.png new file mode 100644 index 0000000000..be4ded4a35 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-1.png new file mode 100644 index 0000000000..17f94c835b Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-2.png new file mode 100644 index 0000000000..cc343cf467 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-3.png new file mode 100644 index 0000000000..feb74c6bca Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-3.png differ