From 4a67fc1d222b3aea0ce4b52bcdae4f2dc4e02a21 Mon Sep 17 00:00:00 2001 From: Swept Date: Mon, 22 Feb 2021 04:08:17 +0000 Subject: [PATCH] Fleshes out smoking content (#3295) * RSIs sorted out * Bookmark * Updated packet RSIs for Stacks * Cigs Packs done * Cigarette Cartons * fucking MANUALLY fixed the cigarette inhands, fuck you tgstation * Pipes work * Cigars/Cases * Updates vending machine inventory * tweaks count * Adds a cigarette crate * Fixes RSIs, working on rolling paper * Adds Tobacco and Cannabis plants * Cigarettes and Rollies are now craftable * There * Fixed crafting recipes * Reset RobustToolbox * Netsync'd * Ready Co-authored-by: DrSmugleaf --- .../Components/Power/AME/AMEWindow.cs | 2 +- .../Items/Storage/StorageCounterComponent.cs | 2 +- .../Components/SharedStackComponent.cs | 10 +- .../Catalog/Cargo/cargo_service.yml | 12 + .../Prototypes/Catalog/Fills/lockers.yml | 24 +- .../Catalog/VendingMachines/cigs.yml | 8 +- .../Prototypes/Datasets/Names/rollie.yml | 42 +++ .../Storage/Crates/Filled/crate_service.yml | 26 ++ .../Smokeables/Cigarettes/blunts.yml | 21 ++ .../Smokeables/Cigarettes/cartons.yml | 73 ++++ .../Smokeables/Cigarettes/cigarette.yml | 25 ++ .../Smokeables/Cigarettes/packs.yml | 88 +++++ .../Smokeables/Cigarettes/rolling_paper.yml | 50 +++ .../Consumable/Smokeables/Cigars/case.yml | 48 +++ .../Consumable/Smokeables/Cigars/cigar.yml | 39 +++ .../Objects/Consumable/Smokeables/base.yml | 11 + .../Objects/Consumable/Smokeables/pipes.yml | 17 + .../Entities/Objects/Consumable/fancy.yml | 62 ---- .../Prototypes/Entities/Objects/Misc/box.yml | 1 + .../Objects/Specific/Hydroponics/produce.yml | 114 +++++++ .../Objects/Specific/Hydroponics/seeds.yml | 22 ++ Resources/Prototypes/Hydroponics/seeds.yml | 46 +++ Resources/Prototypes/Reagents/botany.yml | 22 ++ Resources/Prototypes/Reagents/medicine.yml | 7 + .../Recipes/Cooking/meal_recipes.yml | 24 +- .../Recipes/Crafting/Graphs/smokeables.yml | 100 ++++++ .../Recipes/Crafting/smokeables.yml | 47 +++ .../Consumable/Fancy/cigarettes.rsi/cig.png | Bin 249 -> 0 bytes .../Fancy/cigarettes.rsi/cig_empty.png | Bin 280 -> 0 bytes .../Fancy/cigarettes.rsi/cig_open.png | Bin 171 -> 0 bytes .../Fancy/cigarettes.rsi/cigarette_1.png | Bin 117 -> 0 bytes .../Fancy/cigarettes.rsi/cigarette_2.png | Bin 116 -> 0 bytes .../Fancy/cigarettes.rsi/cigarette_3.png | Bin 116 -> 0 bytes .../Fancy/cigarettes.rsi/cigarette_4.png | Bin 116 -> 0 bytes .../Fancy/cigarettes.rsi/cigarette_5.png | Bin 114 -> 0 bytes .../Fancy/cigarettes.rsi/cigarette_6.png | Bin 114 -> 0 bytes .../Consumable/Fancy/cigarettes.rsi/meta.json | 38 --- .../Cigarettes/Cartons/black.rsi/closed.png | Bin 0 -> 269 bytes .../Cartons/black.rsi/inhand-left.png | Bin 0 -> 293 bytes .../Cartons/black.rsi/inhand-right.png | Bin 0 -> 275 bytes .../Cigarettes/Cartons/black.rsi/meta.json | 25 ++ .../Cigarettes/Cartons/black.rsi/open.png | Bin 0 -> 340 bytes .../Cigarettes/Cartons/blue.rsi/closed.png | Bin 0 -> 253 bytes .../Cartons/blue.rsi/inhand-left.png | Bin 0 -> 257 bytes .../Cartons/blue.rsi/inhand-right.png | Bin 0 -> 253 bytes .../Cigarettes/Cartons/blue.rsi/meta.json | 25 ++ .../Cigarettes/Cartons/blue.rsi/open.png | Bin 0 -> 330 bytes .../Cigarettes/Cartons/green.rsi/closed.png | Bin 0 -> 254 bytes .../Cartons/green.rsi/inhand-left.png | Bin 0 -> 243 bytes .../Cartons/green.rsi/inhand-right.png | Bin 0 -> 244 bytes .../Cigarettes/Cartons/green.rsi/meta.json | 25 ++ .../Cigarettes/Cartons/green.rsi/open.png | Bin 0 -> 320 bytes .../Cigarettes/Cartons/red.rsi/closed.png | Bin 0 -> 255 bytes .../Cartons/red.rsi/inhand-left.png | Bin 0 -> 261 bytes .../Cartons/red.rsi/inhand-right.png | Bin 0 -> 252 bytes .../Cigarettes/Cartons/red.rsi/meta.json | 25 ++ .../Cigarettes/Cartons/red.rsi/open.png | Bin 0 -> 324 bytes .../Cigarettes/Packs/black.rsi/cig1.png | Bin 0 -> 103 bytes .../Cigarettes/Packs/black.rsi/cig2.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/black.rsi/cig3.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/black.rsi/cig4.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/black.rsi/cig5.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/black.rsi/cig6.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/black.rsi/closed.png | Bin 0 -> 254 bytes .../Packs/black.rsi/inhand-left.png | Bin 0 -> 293 bytes .../Packs/black.rsi/inhand-right.png | Bin 0 -> 275 bytes .../Cigarettes/Packs/black.rsi/meta.json | 46 +++ .../Cigarettes/Packs/black.rsi/open.png | Bin 0 -> 297 bytes .../Cigarettes/Packs/black.rsi/trash.png | Bin 0 -> 292 bytes .../Cigarettes/Packs/blue.rsi/cig1.png | Bin 0 -> 103 bytes .../Cigarettes/Packs/blue.rsi/cig2.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/blue.rsi/cig3.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/blue.rsi/cig4.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/blue.rsi/cig5.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/blue.rsi/cig6.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/blue.rsi/closed.png | Bin 0 -> 249 bytes .../Cigarettes/Packs/blue.rsi/inhand-left.png | Bin 0 -> 257 bytes .../Packs/blue.rsi/inhand-right.png | Bin 0 -> 253 bytes .../Cigarettes/Packs/blue.rsi/meta.json | 46 +++ .../Cigarettes/Packs/blue.rsi/open.png | Bin 0 -> 300 bytes .../Cigarettes/Packs/blue.rsi/trash.png | Bin 0 -> 288 bytes .../Cigarettes/Packs/green.rsi/cig1.png | Bin 0 -> 103 bytes .../Cigarettes/Packs/green.rsi/cig2.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/green.rsi/cig3.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/green.rsi/cig4.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/green.rsi/cig5.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/green.rsi/cig6.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/green.rsi/closed.png | Bin 0 -> 234 bytes .../Packs/green.rsi/inhand-left.png | Bin 0 -> 243 bytes .../Packs/green.rsi/inhand-right.png | Bin 0 -> 244 bytes .../Cigarettes/Packs/green.rsi/meta.json | 46 +++ .../Cigarettes/Packs/green.rsi/open.png | Bin 0 -> 299 bytes .../Cigarettes/Packs/green.rsi/trash.png | Bin 0 -> 292 bytes .../Cigarettes/Packs/red.rsi/cig1.png | Bin 0 -> 103 bytes .../Cigarettes/Packs/red.rsi/cig2.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/red.rsi/cig3.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/red.rsi/cig4.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/red.rsi/cig5.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/red.rsi/cig6.png | Bin 0 -> 104 bytes .../Cigarettes/Packs/red.rsi/closed.png | Bin 0 -> 242 bytes .../Cigarettes/Packs/red.rsi/inhand-left.png | Bin 0 -> 261 bytes .../Cigarettes/Packs/red.rsi/inhand-right.png | Bin 0 -> 252 bytes .../Cigarettes/Packs/red.rsi/meta.json | 46 +++ .../Cigarettes/Packs/red.rsi/open.png | Bin 0 -> 303 bytes .../Cigarettes/Packs/red.rsi/trash.png | Bin 0 -> 292 bytes .../Cigarettes/blunt.rsi/burnt-icon.png | Bin 0 -> 237 bytes .../blunt.rsi/lit-equipped-MASK.png | Bin 0 -> 435 bytes .../Cigarettes/blunt.rsi/lit-icon.png | Bin 0 -> 992 bytes .../Cigarettes/blunt.rsi/lit-inhand-left.png | Bin 0 -> 648 bytes .../Cigarettes/blunt.rsi/lit-inhand-right.png | Bin 0 -> 539 bytes .../Smokeables/Cigarettes/blunt.rsi/meta.json | 182 ++++++++++ .../blunt.rsi/unlit-equipped-MASK.png | Bin 0 -> 244 bytes .../Cigarettes/blunt.rsi/unlit-icon.png | Bin 0 -> 267 bytes .../blunt.rsi/unlit-inhand-left.png | Bin 0 -> 239 bytes .../blunt.rsi/unlit-inhand-right.png | Bin 0 -> 239 bytes .../Cigarettes/cigarette.rsi}/burnt-icon.png | Bin .../cigarette.rsi}/lit-equipped-MASK.png | Bin .../Cigarettes/cigarette.rsi}/lit-icon.png | Bin .../cigarette.rsi/lit-inhand-left.png | Bin 0 -> 648 bytes .../cigarette.rsi/lit-inhand-right.png | Bin 0 -> 539 bytes .../Cigarettes/cigarette.rsi/meta.json | 182 ++++++++++ .../cigarette.rsi}/unlit-equipped-MASK.png | Bin .../Cigarettes/cigarette.rsi/unlit-icon.png} | Bin .../cigarette.rsi/unlit-inhand-left.png | Bin 0 -> 239 bytes .../cigarette.rsi/unlit-inhand-right.png | Bin 0 -> 239 bytes .../Cigarettes/paper.rsi/cigfilter.png | Bin 0 -> 156 bytes .../Cigarettes/paper.rsi/cigpaper.png | Bin 0 -> 242 bytes .../Cigarettes/paper.rsi/cigpapers.png | Bin 0 -> 436 bytes .../Smokeables/Cigarettes/paper.rsi/meta.json | 23 ++ .../Cigarettes/paper.rsi/trash-cigpapers.png | Bin 0 -> 239 bytes .../Smokeables/Cigars/case.rsi/cigar1.png | Bin 0 -> 305 bytes .../Smokeables/Cigars/case.rsi/cigar2.png | Bin 0 -> 333 bytes .../Smokeables/Cigars/case.rsi/cigar3.png | Bin 0 -> 318 bytes .../Smokeables/Cigars/case.rsi/cigar4.png | Bin 0 -> 279 bytes .../Smokeables/Cigars/case.rsi/cigar5.png | Bin 0 -> 296 bytes .../Smokeables/Cigars/case.rsi/cigar6.png | Bin 0 -> 295 bytes .../Smokeables/Cigars/case.rsi/cigar7.png | Bin 0 -> 293 bytes .../Smokeables/Cigars/case.rsi/cigar8.png | Bin 0 -> 292 bytes .../Smokeables/Cigars/case.rsi/closed.png | Bin 0 -> 255 bytes .../Cigars/case.rsi/inhand-left.png | Bin 0 -> 283 bytes .../Cigars/case.rsi/inhand-right.png | Bin 0 -> 295 bytes .../Smokeables/Cigars/case.rsi/meta.json | 49 +++ .../Smokeables/Cigars/case.rsi/open.png | Bin 0 -> 491 bytes .../Cigars/cigar-gold.rsi/burnt-icon.png | Bin 0 -> 183 bytes .../cigar-gold.rsi/lit-equipped-MASK.png | Bin 0 -> 434 bytes .../Cigars/cigar-gold.rsi/lit-icon.png | Bin 0 -> 262 bytes .../Cigars/cigar-gold.rsi/lit-inhand-left.png | Bin 0 -> 769 bytes .../cigar-gold.rsi/lit-inhand-right.png | Bin 0 -> 542 bytes .../Cigars/cigar-gold.rsi/meta.json | 170 ++++++++++ .../cigar-gold.rsi/unlit-equipped-MASK.png | Bin 0 -> 243 bytes .../Cigars/cigar-gold.rsi/unlit-icon.png | Bin 0 -> 185 bytes .../cigar-gold.rsi/unlit-inhand-left.png | Bin 0 -> 246 bytes .../cigar-gold.rsi/unlit-inhand-right.png | Bin 0 -> 263 bytes .../Cigars/cigar.rsi/burnt-icon.png | Bin 0 -> 183 bytes .../Cigars/cigar.rsi/lit-equipped-MASK.png | Bin 0 -> 434 bytes .../Smokeables/Cigars/cigar.rsi/lit-icon.png | Bin 0 -> 249 bytes .../Cigars/cigar.rsi/lit-inhand-left.png | Bin 0 -> 769 bytes .../Cigars/cigar.rsi/lit-inhand-right.png | Bin 0 -> 542 bytes .../Smokeables/Cigars/cigar.rsi/meta.json | 170 ++++++++++ .../Cigars/cigar.rsi/unlit-equipped-MASK.png | Bin 0 -> 243 bytes .../Cigars/cigar.rsi/unlit-icon.png | Bin 0 -> 171 bytes .../Cigars/cigar.rsi/unlit-inhand-left.png | Bin 0 -> 246 bytes .../Cigars/cigar.rsi/unlit-inhand-right.png | Bin 0 -> 263 bytes .../Pipes/crack.rsi/lit-equipped-MASK.png | Bin 0 -> 2891 bytes .../Smokeables/Pipes/crack.rsi/lit-icon.png | Bin 0 -> 3658 bytes .../Pipes/crack.rsi}/meta.json | 20 +- .../Pipes/crack.rsi/unlit-equipped-MASK.png | Bin 0 -> 626 bytes .../Smokeables/Pipes/crack.rsi/unlit-icon.png | Bin 0 -> 783 bytes .../Smokeables/Pipes/pipe.rsi/burnt-icon.png | Bin 0 -> 326 bytes .../Pipes/pipe.rsi/lit-equipped-MASK.png | Bin 0 -> 1244 bytes .../Smokeables/Pipes/pipe.rsi/lit-icon.png | Bin 0 -> 513 bytes .../Pipes/pipe.rsi/lit-inhand-left.png | Bin 0 -> 1022 bytes .../Pipes/pipe.rsi/lit-inhand-right.png | Bin 0 -> 919 bytes .../Smokeables/Pipes/pipe.rsi/meta.json | 182 ++++++++++ .../Pipes/pipe.rsi/unlit-equipped-MASK.png | Bin 0 -> 321 bytes .../Smokeables/Pipes/pipe.rsi/unlit-icon.png | Bin 0 -> 326 bytes .../Pipes/pipe.rsi/unlit-inhand-left.png | Bin 0 -> 314 bytes .../Pipes/pipe.rsi/unlit-inhand-right.png | Bin 0 -> 329 bytes .../Misc/reageant_fillings.rsi/backpack0.png | Bin 0 -> 123 bytes .../Misc/reageant_fillings.rsi/backpack15.png | Bin 0 -> 127 bytes .../Misc/reageant_fillings.rsi/backpack60.png | Bin 0 -> 149 bytes .../reageant_fillings.rsi/backpackmob-10.png | Bin 0 -> 149 bytes .../reageant_fillings.rsi/backpackmob100.png | Bin 0 -> 173 bytes .../reageant_fillings.rsi/backpackmob50.png | Bin 0 -> 164 bytes .../Misc/reageant_fillings.rsi/beaker0.png | Bin 0 -> 115 bytes .../Misc/reageant_fillings.rsi/beaker10.png | Bin 0 -> 123 bytes .../Misc/reageant_fillings.rsi/beaker25.png | Bin 0 -> 135 bytes .../Misc/reageant_fillings.rsi/beaker50.png | Bin 0 -> 137 bytes .../Misc/reageant_fillings.rsi/beaker75.png | Bin 0 -> 139 bytes .../Misc/reageant_fillings.rsi/beaker80.png | Bin 0 -> 139 bytes .../Misc/reageant_fillings.rsi/beaker90.png | Bin 0 -> 147 bytes .../reageant_fillings.rsi/beakergold0.png | Bin 0 -> 114 bytes .../reageant_fillings.rsi/beakergold10.png | Bin 0 -> 135 bytes .../reageant_fillings.rsi/beakergold25.png | Bin 0 -> 136 bytes .../reageant_fillings.rsi/beakergold50.png | Bin 0 -> 147 bytes .../reageant_fillings.rsi/beakergold75.png | Bin 0 -> 159 bytes .../reageant_fillings.rsi/beakergold80.png | Bin 0 -> 145 bytes .../reageant_fillings.rsi/beakergold90.png | Bin 0 -> 146 bytes .../reageant_fillings.rsi/beakerlarge0.png | Bin 0 -> 114 bytes .../reageant_fillings.rsi/beakerlarge10.png | Bin 0 -> 124 bytes .../reageant_fillings.rsi/beakerlarge25.png | Bin 0 -> 135 bytes .../reageant_fillings.rsi/beakerlarge50.png | Bin 0 -> 143 bytes .../reageant_fillings.rsi/beakerlarge75.png | Bin 0 -> 143 bytes .../reageant_fillings.rsi/beakerlarge80.png | Bin 0 -> 147 bytes .../reageant_fillings.rsi/beakerlarge90.png | Bin 0 -> 144 bytes .../reageant_fillings.rsi/bloodpack10.png | Bin 0 -> 125 bytes .../reageant_fillings.rsi/bloodpack100.png | Bin 0 -> 183 bytes .../reageant_fillings.rsi/bloodpack20.png | Bin 0 -> 140 bytes .../reageant_fillings.rsi/bloodpack30.png | Bin 0 -> 155 bytes .../reageant_fillings.rsi/bloodpack40.png | Bin 0 -> 158 bytes .../reageant_fillings.rsi/bloodpack50.png | Bin 0 -> 158 bytes .../reageant_fillings.rsi/bloodpack60.png | Bin 0 -> 159 bytes .../reageant_fillings.rsi/bloodpack70.png | Bin 0 -> 160 bytes .../reageant_fillings.rsi/bloodpack80.png | Bin 0 -> 166 bytes .../reageant_fillings.rsi/bloodpack90.png | Bin 0 -> 184 bytes .../Misc/reageant_fillings.rsi/bottle0.png | Bin 0 -> 109 bytes .../Misc/reageant_fillings.rsi/bottle10.png | Bin 0 -> 128 bytes .../Misc/reageant_fillings.rsi/bottle30.png | Bin 0 -> 141 bytes .../Misc/reageant_fillings.rsi/bottle50.png | Bin 0 -> 150 bytes .../Misc/reageant_fillings.rsi/bottle70.png | Bin 0 -> 157 bytes .../Misc/reageant_fillings.rsi/chempack10.png | Bin 0 -> 125 bytes .../reageant_fillings.rsi/chempack100.png | Bin 0 -> 194 bytes .../Misc/reageant_fillings.rsi/chempack20.png | Bin 0 -> 145 bytes .../Misc/reageant_fillings.rsi/chempack30.png | Bin 0 -> 154 bytes .../Misc/reageant_fillings.rsi/chempack40.png | Bin 0 -> 155 bytes .../Misc/reageant_fillings.rsi/chempack50.png | Bin 0 -> 157 bytes .../Misc/reageant_fillings.rsi/chempack60.png | Bin 0 -> 161 bytes .../Misc/reageant_fillings.rsi/chempack70.png | Bin 0 -> 167 bytes .../Misc/reageant_fillings.rsi/chempack80.png | Bin 0 -> 170 bytes .../Misc/reageant_fillings.rsi/chempack90.png | Bin 0 -> 192 bytes .../Misc/reageant_fillings.rsi/dropper.png | Bin 0 -> 113 bytes .../reageant_fillings.rsi/emptycondiment0.png | Bin 0 -> 106 bytes .../emptycondiment10.png | Bin 0 -> 143 bytes .../emptycondiment100.png | Bin 0 -> 200 bytes .../emptycondiment25.png | Bin 0 -> 145 bytes .../emptycondiment50.png | Bin 0 -> 149 bytes .../emptycondiment75.png | Bin 0 -> 182 bytes .../reageant_fillings.rsi/glassbottle0.png | Bin 0 -> 119 bytes .../reageant_fillings.rsi/glassbottle10.png | Bin 0 -> 122 bytes .../reageant_fillings.rsi/glassbottle20.png | Bin 0 -> 120 bytes .../reageant_fillings.rsi/glassbottle30.png | Bin 0 -> 123 bytes .../reageant_fillings.rsi/glassbottle40.png | Bin 0 -> 121 bytes .../reageant_fillings.rsi/glassbottle50.png | Bin 0 -> 124 bytes .../reageant_fillings.rsi/glassbottle60.png | Bin 0 -> 130 bytes .../reageant_fillings.rsi/glassbottle70.png | Bin 0 -> 125 bytes .../reageant_fillings.rsi/glassbottle80.png | Bin 0 -> 123 bytes .../reageant_fillings.rsi/glassbottle90.png | Bin 0 -> 124 bytes .../glassbottlesmall0.png | Bin 0 -> 114 bytes .../glassbottlesmall10.png | Bin 0 -> 116 bytes .../glassbottlesmall20.png | Bin 0 -> 118 bytes .../glassbottlesmall30.png | Bin 0 -> 117 bytes .../glassbottlesmall40.png | Bin 0 -> 120 bytes .../glassbottlesmall50.png | Bin 0 -> 118 bytes .../glassbottlesmall60.png | Bin 0 -> 120 bytes .../glassbottlesmall70.png | Bin 0 -> 119 bytes .../glassbottlesmall80.png | Bin 0 -> 121 bytes .../glassbottlesmall90.png | Bin 0 -> 120 bytes .../reageant_fillings.rsi/largebottle0.png | Bin 0 -> 123 bytes .../reageant_fillings.rsi/largebottle10.png | Bin 0 -> 141 bytes .../reageant_fillings.rsi/largebottle25.png | Bin 0 -> 168 bytes .../reageant_fillings.rsi/largebottle50.png | Bin 0 -> 177 bytes .../reageant_fillings.rsi/largebottle75.png | Bin 0 -> 180 bytes .../reageant_fillings.rsi/largebottle80.png | Bin 0 -> 193 bytes .../reageant_fillings.rsi/largebottle90.png | Bin 0 -> 213 bytes .../reageant_fillings.rsi/maunafilling25.png | Bin 0 -> 118 bytes .../Misc/reageant_fillings.rsi/meta.json | 317 ++++++++++++++++++ .../Misc/reageant_fillings.rsi/pill.png | Bin 0 -> 152 bytes .../Misc/reageant_fillings.rsi/powderpile.png | Bin 0 -> 252 bytes .../reageant_fillings.rsi/smallbottle-10.png | Bin 0 -> 108 bytes .../reageant_fillings.rsi/smallbottle10.png | Bin 0 -> 123 bytes .../reageant_fillings.rsi/smallbottle25.png | Bin 0 -> 144 bytes .../reageant_fillings.rsi/smallbottle50.png | Bin 0 -> 163 bytes .../reageant_fillings.rsi/smallbottle75.png | Bin 0 -> 165 bytes .../reageant_fillings.rsi/smallbottle80.png | Bin 0 -> 160 bytes .../reageant_fillings.rsi/smallbottle90.png | Bin 0 -> 163 bytes .../Misc/reageant_fillings.rsi/splashed.png | Bin 0 -> 613 bytes .../Misc/reageant_fillings.rsi/syringe1.png | Bin 0 -> 95 bytes .../Misc/reageant_fillings.rsi/syringe10.png | Bin 0 -> 111 bytes .../Misc/reageant_fillings.rsi/syringe15.png | Bin 0 -> 115 bytes .../Misc/reageant_fillings.rsi/syringe5.png | Bin 0 -> 96 bytes .../Hydroponics/cannabis.rsi/dead.png | Bin 0 -> 281 bytes .../Hydroponics/cannabis.rsi/dried.png | Bin 0 -> 185 bytes .../Hydroponics/cannabis.rsi/harvest.png | Bin 0 -> 993 bytes .../Hydroponics/cannabis.rsi/meta.json | 35 ++ .../Hydroponics/cannabis.rsi/produce.png | Bin 0 -> 220 bytes .../Hydroponics/cannabis.rsi/seed.png | Bin 0 -> 181 bytes .../Hydroponics/cannabis.rsi/stage-1.png | Bin 0 -> 823 bytes .../Hydroponics/cannabis.rsi/stage-2.png | Bin 0 -> 738 bytes .../Hydroponics/cannabis.rsi/stage-3.png | Bin 0 -> 896 bytes .../Hydroponics/stobacco.rsi/dead.png | Bin 0 -> 281 bytes .../Hydroponics/stobacco.rsi/harvest.png | Bin 0 -> 417 bytes .../Hydroponics/stobacco.rsi/meta.json | 32 ++ .../Hydroponics/stobacco.rsi/produce.png | Bin 0 -> 251 bytes .../Hydroponics/stobacco.rsi/seed.png | Bin 0 -> 190 bytes .../Hydroponics/stobacco.rsi/stage-1.png | Bin 0 -> 128 bytes .../Hydroponics/stobacco.rsi/stage-2.png | Bin 0 -> 242 bytes .../Hydroponics/stobacco.rsi/stage-3.png | Bin 0 -> 338 bytes .../Specific/Hydroponics/tobacco.rsi/dead.png | Bin 0 -> 281 bytes .../Hydroponics/tobacco.rsi/dried.png | Bin 0 -> 185 bytes .../Hydroponics/tobacco.rsi/harvest.png | Bin 0 -> 406 bytes .../Hydroponics/tobacco.rsi/meta.json | 35 ++ .../Hydroponics/tobacco.rsi/produce.png | Bin 0 -> 251 bytes .../Specific/Hydroponics/tobacco.rsi/seed.png | Bin 0 -> 190 bytes .../Hydroponics/tobacco.rsi/stage-1.png | Bin 0 -> 127 bytes .../Hydroponics/tobacco.rsi/stage-2.png | Bin 0 -> 223 bytes .../Hydroponics/tobacco.rsi/stage-3.png | Bin 0 -> 307 bytes 306 files changed, 2537 insertions(+), 125 deletions(-) create mode 100644 Resources/Prototypes/Datasets/Names/rollie.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/blunts.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cartons.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/case.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/base.yml create mode 100644 Resources/Prototypes/Entities/Objects/Consumable/Smokeables/pipes.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Consumable/fancy.yml create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml create mode 100644 Resources/Prototypes/Recipes/Crafting/smokeables.yml delete mode 100644 Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig.png delete mode 100644 Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig_empty.png delete mode 100644 Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cig_open.png delete mode 100644 Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_1.png delete mode 100644 Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_2.png delete mode 100644 Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_3.png delete mode 100644 Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_4.png delete mode 100644 Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_5.png delete mode 100644 Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/cigarette_6.png delete mode 100644 Resources/Textures/Objects/Consumable/Fancy/cigarettes.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/black.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/blue.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/green.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Cartons/red.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig1.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig2.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig3.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig4.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig5.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/cig6.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/black.rsi/trash.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig1.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig2.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig3.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig4.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig5.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/cig6.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/blue.rsi/trash.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig1.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig2.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig3.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig4.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig5.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/cig6.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/green.rsi/trash.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig1.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig2.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig3.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig4.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig5.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/cig6.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/Packs/red.rsi/trash.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/burnt-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/lit-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-inhand-right.png rename Resources/Textures/Objects/Consumable/{Fancy/mask_cig.rsi => Smokeables/Cigarettes/cigarette.rsi}/burnt-icon.png (100%) rename Resources/Textures/Objects/Consumable/{Fancy/mask_cig.rsi => Smokeables/Cigarettes/cigarette.rsi}/lit-equipped-MASK.png (100%) rename Resources/Textures/Objects/Consumable/{Fancy/mask_cig.rsi => Smokeables/Cigarettes/cigarette.rsi}/lit-icon.png (100%) create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/lit-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/meta.json rename Resources/Textures/Objects/Consumable/{Fancy/mask_cig.rsi => Smokeables/Cigarettes/cigarette.rsi}/unlit-equipped-MASK.png (100%) rename Resources/Textures/Objects/Consumable/{Fancy/mask_cig.rsi/icon.png => Smokeables/Cigarettes/cigarette.rsi/unlit-icon.png} (100%) create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/cigarette.rsi/unlit-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigfilter.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpaper.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpapers.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/trash-cigpapers.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar1.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar2.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar3.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar4.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar5.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar6.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar7.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/cigar8.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/closed.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/case.rsi/open.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/burnt-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/lit-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar-gold.rsi/unlit-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/burnt-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/lit-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigars/cigar.rsi/unlit-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/lit-icon.png rename Resources/Textures/Objects/Consumable/{Fancy/mask_cig.rsi => Smokeables/Pipes/crack.rsi}/meta.json (82%) create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/crack.rsi/unlit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/burnt-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/lit-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Pipes/pipe.rsi/unlit-inhand-right.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack0.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack15.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack60.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob-10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob100.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker0.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker25.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker75.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker80.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker90.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold0.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold25.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold75.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold80.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold90.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge0.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge25.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge75.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge80.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge90.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack100.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack20.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack30.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack40.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack60.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack70.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack80.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack90.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle0.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle30.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle70.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack100.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack20.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack30.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack40.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack60.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack70.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack80.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack90.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/dropper.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment0.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment100.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment25.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment75.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle0.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle20.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle30.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle40.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle60.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle70.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle80.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle90.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall0.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall20.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall30.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall40.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall60.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall70.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall80.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall90.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle0.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle25.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle75.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle80.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle90.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/maunafilling25.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/meta.json create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/pill.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/powderpile.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle-10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle25.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle50.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle75.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle80.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle90.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/splashed.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe1.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe10.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe15.png create mode 100644 Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe5.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/dried.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/stage-3.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/stobacco.rsi/stage-3.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/dead.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/dried.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/harvest.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/meta.json create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/produce.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/seed.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-1.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-2.png create mode 100644 Resources/Textures/Objects/Specific/Hydroponics/tobacco.rsi/stage-3.png 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 845968ae9f5585e402bdee93d3124c8ab7cb7921..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1D-C9Ar*6y6C_v{Cy4YkP2`jC z43ycq<(s|U&Zig8s?20%);Xf3V`0X;{OJ@1wJeEAM^YWD*-c)%O;+(MWlz}5b8PgIepH-GpA2`hcU@O+!|=0!NBmk!G&q_?58V$eqr!*^>bP0l+XkKh1O!p 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 42abce58e0b40dbee205e36f4e2d28e11d767133..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmV+z0q6dSP)qzGH?n z7@RXcOKXOg*Ma5vwOqMMvcU!Le_5pwDiy{E`Z;!0DYv*C-fFKC?{>c7i+$jK{ zP&=iRFCHc!O;Z2{jW&0!-rfN@+rzU; 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 45bf3c6cc0c91e17aeaabc5ba642f69052511161..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJB2O2`kcv6U2@?ZWKOz7C 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 93f34c641c66627c04bf601e05d6ba82fdad43a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz8&4OmdKI;Vst0K`Bj>Hq)$ 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 ec904055077b8d5716f49b545b8e6a69f43665b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzYfl%)kcv5PFKpyxP~>5DIKm>r zbJpn0#KwKU+0r^hI-jlEuDjEeVbZr*%Qvl0XTEQ*_5HKbqA!dL4D)t(RkP30xZQjP PXbgj=tDnm{r-UW|dLkzr 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 7e3eb0c1b9982c87fae22256117e70031e6722dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzYfl%)kcv5PFKpyxP~>5DIKm>r zbJpn0#KwKU*~&VUF5daNO?5k)!=bp(A*Ek^Ui@~yTIc67#g>8LK(Tm^IQtx3L;c@C PV;DSL{an^LB{Ts5c_k(2 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 bf9361b9b539003421c88436eedaebdff24837d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzYfl%)kcv5PFKpyxP~>5DIKm>r zbJpn0#KwKU*~&VUF5daNO?5k)!=<>-Az!}aeE98tv@XtNiVXw9fnssr&Fpik*^Vs& P8pGh}>gTe~DWM4fqGBg| 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 6d0a066c52501d3fe13098fe23b40b63692676c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzOHUWakcv5PFDw*fP!wQxXyXzP z`Fl3txM<7a53Vi=Wwn!LZeepssQtW5)|T_V@uj~$p-1@{7(U$L*Y{_ibLUfpIM5IV MPgg&ebxsLQ0O)}vB>(^b 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 53048fed17fae6103a328156686f2d7ad9ad29db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzOHUWakcv5PFDw*fP!wQxXyXzP z`Fl3txM<7a53Vi=Wwk~#x3D>6)P7d`Igjr~`V!HZtGeVE7#{4D7kJG+=S0}tW}qPq Mp00i_>zopr0O&g;X8-^I 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 0000000000000000000000000000000000000000..a2d008910c65f9929541c4495c4b610f1ef97d13 GIT binary patch literal 269 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJE1oWnAr*6y6C_v{Cy4YkP2`if z$lA0x=zs9x2ifND6GivemFaiQ^|`X4N9cglnnRs?*GeS)JbG0n@|$+!)W(N8Gx-#* z8s$vetox%^vF~An^u>6MO&oa-ZNo(D%ua8#a!A(X50xo+`%HV$l|&1M=on$9DK7kO zW;LJwh(_ML@HfWJ>&3$K!+U1Au>nEb83$<*>rTIxmIHo^J9&8AX7Dve_HYNBWqiSR zv*wXl;H%D}hTl7D{)jzd5I-+i#uCVPAf3~0LH-iAY5M{VxZDnENJKI)d{eU6$8nHd Q73e<(Pgg&ebxsLQ0L{~9f&c&j literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fa238f8de733fc09a11f0fb87eacb21cad686e3f GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Z#-QbLn`LHy|p{{h=D-M!-)^g zM6`mlyJi}MESe$conSwEC6^=Xg@Xt4EiUT%%KxcnWAi%)LnrQe?(TU5E$ zJqkLo@4d6;)7%SlicO7|PI;$y=#0tv&wri&9eB#=v0bR|@q`lTTgjE4UYfjV&ji0( zPfN}G6c_!J31Tw?gH2C;{iOG{&gN_XEB~pyY;twIYRpgf2Ssx4A3pZ{SNc&qJZ1am l3jVczpZMD^TQV^0c*JU0kZoG>dZPfy2v1i(mvv4FO#tjIdqDsI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..263f797355d36556de8c5472a55fe21f191b7925 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>(`OLn`LHy|tIO*+8J}q4FuI zDJ5&3-Rc!Dc-tj-qrGnurvS5ssGzTq^~2-K_xSg&dGELEmktw9D-i5?I;T54eaDqe zIvc;JK6$eHsocB0;@P<$%@@AjwWKDJyWpH__S%Z~OW*%~KWXlQb=iWR(T8lGIwbq# z+zxYjV)@6S@2bAyc>|uq$MYxUIdCkD;-CFI^6Ur2mfB*eJKB8u?#iDGynO-H86eV0*%qfq{X6LElIXLq0Rm2E#rkvTVWuG?wx( zyuN#!;jqPShKuKJVaQKkf8;++9Y79XK^M?i%ENH&<~@oG)mo~=aPa0*hJ)M4Z~y}X z1A~^j5=9Om1z>dmHZZZb6+`?-Al7UBTd>I1SIfX@H4ik(cn`XqK%J8vh1%D zKLf)mG95swW!Nmo7A+VKFwhsF$RZfHfX2s_CNLau;o=*rH~^Q01Ra1at_cB3qK7KE zpwC~9VAR<~vNPC4vSWx7od^kmI0Y_-I0ZR|MGwBAL?bp!Y2pBMhin$VMU;A?9I)uY zH@p_&0vFE_b_7ulz-I|Qpl_r`mcCIi3P!;w7+C-S%l<7K>kr;%00000NkvXXu0mjf DGh$t5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4022576f4edfba60105ff9c349c4386250237984 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Cp=voLn`LHy}6OM*@34uadI1L zo^aK%lYVQ8xi@gk)z%7LFga)mXO-HnC;!O zB5>wh_l@th0cS$b?mYYDN*$B$+O6H)Oc1jf7(6Z~tLlILep;I=BGR&I`!%=yZ5OgTe~DWM4f!!Bba literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c369df8d2cf92395c3f95f0205ed766f861914b8 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=M?75|Ln`LHy|t0I*+8H*aq=^< z4{Gmh{mPPL#S#Q}t&WM+@;2$rNfMm@sowU|XXB850iZ4*Xy^~QS~oXw$?>V}Y5EJ* z?=NLa>bX2!LCN>$E-sJNkv)bo#|6LD?w|I?O;^=KR6!{$e~+Bq^F1}v1#G^oQ-Y>d zJ)XxG?0kn*^*aw*)#k*T-G@yGywqFdtwLx literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..78a710de7493102285d3c3dcc83157fbc5701c73 GIT binary patch literal 330 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFbaCQIEGZrNluVpU7R4oW02q? zo?-p(!T;9o{1ZlJ9O7FZUffp80|LL?vLrsuY&4VjW;iibn6KdBBk8vCOI18Yaeh4F z=kFexFn`~_6ZNyK8e|SM>49ahn|}*RdBMt-&h~8fC!Y4ae=2twK_)GdIwxY;AkuJ^ z@rJ|v{W5J47mvBCM1H&8IlnPcbS9s|Rim6~#_xZ3DE2*MV6GMH(rIes&Zx9_jRJX>pjtBg z1ZOWbDP-8?Y}TDDb~MF0;bL=sh3*m74OiJyEE(pj{$SW9RVdQa6llQZ#%RUB&}iZ6 V%C2t^L}*2^I<8Td&`^GLfes(&GZ-jYqQt7N}IMn8clC?IPH- z%b+^D4TyOP7YQpW3aC9eCGhOPfeo(?=S|5tlBVe^)9`M>S()t}LH<*iKO8mOXHxu8 zCedBsDMOKv8Z$F<^S+5vk-yvyYJgmw!pPunY%u$<_|exu4>5SU`njxgN@xNALit}0 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..27f428832adebf4ece79e7412691ed49fd36c6eb GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=yF6VSLn`LHy|s~-$&jb@p|E#A zfMM9SgvK`$Cb4en;1){|;ZIoQ!I5Dxk6-CueuMh$^1G)u0X2fa>Zx&$ZyWE)Ue2Yp z_t?LRfTOmB-={qG;@fca)7M*B+Xw zew~v3Rf({zf0EZ38TVHGd=mpPlYyZj((3ecM3EWY97|F50%<}WhwX94O2f{N^{qxEwWmpH#? zKK@y=hBIxOReU+4(noKN@7F>PWo-?cA5~~v9LgKrFmrDaU**D8yJr4;TE<(y=ft1+ zQu97XI(>QU`bo|G-eYv2W|LpzRhQeV(p0U)%ry literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..14eb8b6ca8ce0265124d5da5a3352d0d64c53ff6 GIT binary patch literal 320 zcmV-G0l)rV zmiNW`wtLRoIeQOKC=`FDksZv=i$nyG)H27^5iVl@K(B9*^XYg*^qNvi9}q!=YxfSr zYvXhb$@zS}Pkw4ZhE{eUf(Xw;TxqF5gy$p1WtSf%F#rJCpk2v88CU}xzU`6OWVkRiFNEwhRCcyuQ3WY+U$npZ~h)Sj( S#B06)0000qPmXgwx+E0H_aG*u z>AF+QgGZK!`V>wv{?Iwd{-t-t=&BCQh4Ux}{!61@w#=^oqpiVuLy|gK+-|mHtbWT(V^wr4$q(R z)!u14cZBWqWp_nZM6Sx3?6psOt=7+Ve@ZJD7&hEy{!yIQTd*u438dN6)z4*}Q$iB} D7yfKM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..57468a3b1b5fe6f6d9a66e4059bdd80a226efc32 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=hdo^!Ln`LHy}6OM*+8H*Q9Jm; zM9E7j9X<~X_lPVyC7?G$VRlUOlt)1>CK{WHI9mAstuIP`S&_adxnH;-5pN=0BSeyKjd;$jxPC_T4eFLH3Algl5 zliR;kamg8PAm0i1CIJ)*#hE8hj!4L-~c%0LQG=?Mkcif|7aau|6a<(z@_8Aw zd+%xNsQxlp<3=VkgYfq^=CTD_L~S30;rS0)78&qol`;+00@#C A)&Kwi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..446d606c89a16e6907f7c0b53e95e087626d7f81 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 zOp90<|9%n`5ddms@O1TaS?83{1OT(l BAh`el literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0d9b28188e69cf13575b58ae8909e50f45b6c416 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPc#V60W zaAcOFz_;S*4>qzg#Jx2=fBvG|@5U+y28ZxT+$*0l{(X6CVzopr0Jf_j AsQ>@~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8f39716ef266b18cdbb7adac7b4399f3b1bcab85 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 z{Vac@n}pTFq#yRnLa!6AGS_hxOT=L=5G`2f_);OXk;vd$@?2>_7f BAou_P literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0b18a29cdadc89a0e601167b1e0472629d169cb0 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJqn<8~Ar*6y6C_v{Cy4YkP2`jC z43v?X`b&QHkFB%6KX~&x{rjX8HDS%JOvVV0s}C-|WKVyualb|ByLRK$#)mq+vJH8f zo1W%y*GiH1_?LC})9)uX&q-m=(0O`LtM2VH?M*uA2?~aSes6M*N^+GHGB7hU zANE_^X(2l){IW+i`vU70q0^EQ9y%TKZ0cLLD%`4hBsOQRWQOyknJVed-;00p@bF9! za9|TZfA`R`IluTEwo9;m>AiBI=zs>q(M${)Yt2vm3Xy#X^bmumtDnm{r-UW|#ExST literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fa238f8de733fc09a11f0fb87eacb21cad686e3f GIT binary patch literal 293 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Z#-QbLn`LHy|p{{h=D-M!-)^g zM6`mlyJi}MESe$conSwEC6^=Xg@Xt4EiUT%%KxcnWAi%)LnrQe?(TU5E$ zJqkLo@4d6;)7%SlicO7|PI;$y=#0tv&wri&9eB#=v0bR|@q`lTTgjE4UYfjV&ji0( zPfN}G6c_!J31Tw?gH2C;{iOG{&gN_XEB~pyY;twIYRpgf2Ssx4A3pZ{SNc&qJZ1am l3jVczpZMD^TQV^0c*JU0kZoG>dZPfy2v1i(mvv4FO#tjIdqDsI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..263f797355d36556de8c5472a55fe21f191b7925 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=w>(`OLn`LHy|tIO*+8J}q4FuI zDJ5&3-Rc!Dc-tj-qrGnurvS5ssGzTq^~2-K_xSg&dGELEmktw9D-i5?I;T54eaDqe zIvc;JK6$eHsocB0;@P<$%@@AjwWKDJyWpH__S%Z~OW*%~KWXlQb=iWR(T8lGIwbq# z+zxYjV)@6S@2bAyc>|uq$MYxUIdCkD;-CFI^6Ur2mfB*ePCCc zs@~Q+CCk8M-K+Mf#3RmE`K@fjI{_~pcE(AU7|a-oSc)tiirE{2Y?w`0CNNfA^wC-1 tW#+=i7+~l-&D-su2FQC349v{T3^TZc>P7aPR;C literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..601d8927fbd166d56cbe88520e4780d0bb1078ec GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ*PbqpAr*6y6C_v{Cy4Yk1sZU% zNf-nj7O?I=@!#OvLfO-vMw2^dO`FWDQO3Z`%_Y$o`>;wwcEDubP0l+XkK+~INc literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cc8c846f3890bfdc891b099b858a19dff763c461 GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzJx>?Mkcif|7aau|6a<(z@_8Aw zd+%xNsQxlp<3=VkgYfq^=CTD_L~S30;rS0)78&qol`;+00@#C A)&Kwi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..446d606c89a16e6907f7c0b53e95e087626d7f81 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 zOp90<|9%n`5ddms@O1TaS?83{1OT(l BAh`el literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0d9b28188e69cf13575b58ae8909e50f45b6c416 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPc#V60W zaAcOFz_;S*4>qzg#Jx2=fBvG|@5U+y28ZxT+$*0l{(X6CVzopr0Jf_j AsQ>@~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8f39716ef266b18cdbb7adac7b4399f3b1bcab85 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 z{Vac@n}pTFq#yRnLa!6AGS_hxOT=L=5G`2f_);OXk;vd$@?2>_7f BAou_P literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..21a07b90c88011ce52a10dc0e0080ff954516383 GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1D-C9Ar*6y6C_v{Cy4YkP2`jC z43sf@e5O9<(V5?Nhi;w@x15}!Cal?&$r#~r^}=&~_H^;wnii$+*E{DoCW`jTHson; zdU_(zQJ7sr`ecIW{?i8>rae`$e(-Lmdc@I_Tjw-39&x$xT>p5&0)3}#sUp@5jg5_p zevRDAo!=RdlR@^&&(nrEV*6dU)m=K>I9px<1iG%U1{~3!r+i*; p$#munvBM4fCQ3!}L0ucjz`!h~cHUL{LlV$044$rjF6*2UngH)BUDW^p literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4022576f4edfba60105ff9c349c4386250237984 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Cp=voLn`LHy}6OM*@34uadI1L zo^aK%lYVQ8xi@gk)z%7LFga)mXO-HnC;!O zB5>wh_l@th0cS$b?mYYDN*$B$+O6H)Oc1jf7(6Z~tLlILep;I=BGR&I`!%=yZ5OgTe~DWM4f!!Bba literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c369df8d2cf92395c3f95f0205ed766f861914b8 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=M?75|Ln`LHy|t0I*+8H*aq=^< z4{Gmh{mPPL#S#Q}t&WM+@;2$rNfMm@sowU|XXB850iZ4*Xy^~QS~oXw$?>V}Y5EJ* z?=NLa>bX2!LCN>$E-sJNkv)bo#|6LD?w|I?O;^=KR6!{$e~+Bq^F1}v1#G^oQ-Y>d zJ)XxG?0kn*^*aw*)#k*T-G@yGywqFdtwLx literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..60c7f9975de2ea8c505f8f0ce70dca9a7f91a4ce GIT binary patch literal 300 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ&z>%hArY;~60D08M0%PU*?N}T zk~e#NratG!_aq{x7$GtkPjUgn3mdKI;Vst00jwi2LJ#7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a80b8ec86080cf69037136ce3a63194186ae8042 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ=bkQ(Ar*6y6C_v{Cy4Yk1sZU% zNf-njp0GhO{ommmtBrg-j3#%^nl_nPql|%>nb~>%ei;ysx=cm_J==b z_DiOi{CLpkP%aTF+wg`%!l8@>r1-S*;cr5sTrSHQB|Qz@zGyhG`RCOnB@{eTKlxq7 zvO&OMTg6YU^hKwcCUGl8Xyn)xc0auEX}(6$k_ew|%*)o>Hwp62Y%~ke4D>8wF>42V ds7-}|!S-d;%+#-nlYm}k@O1TaS?83{1OVitZ)E@g literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cc8c846f3890bfdc891b099b858a19dff763c461 GIT binary patch literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzJx>?Mkcif|7aau|6a<(z@_8Aw zd+%xNsQxlp<3=VkgYfq^=CTD_L~S30;rS0)78&qol`;+00@#C A)&Kwi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..446d606c89a16e6907f7c0b53e95e087626d7f81 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 zOp90<|9%n`5ddms@O1TaS?83{1OT(l BAh`el literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0d9b28188e69cf13575b58ae8909e50f45b6c416 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPc#V60W zaAcOFz_;S*4>qzg#Jx2=fBvG|@5U+y28ZxT+$*0l{(X6CVzopr0Jf_j AsQ>@~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8f39716ef266b18cdbb7adac7b4399f3b1bcab85 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 z{Vac@n}pTFq#yRnLa!6AGS_hxOT=L=5G`2f_);OXk;vd$@?2>_7f BAou_P literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fa5fa930c1048146ae70e8e30c451413a0bbac84 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJjh-%!Ar*6y6C_v{Cy4YkP2`jC z41BY*=1_gkBYVGpEt|jlYp9>}Q412e%(P*`s>E&1B6H?eB}jJ3v|C!gm2Jq=-1PKB zprbJR4yleL(femV%+fjSS$5zZ_xg=pld~gTe~DWM4fvP@Tv literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..27f428832adebf4ece79e7412691ed49fd36c6eb GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=yF6VSLn`LHy|s~-$&jb@p|E#A zfMM9SgvK`$Cb4en;1){|;ZIoQ!I5Dxk6-CueuMh$^1G)u0X2fa>Zx&$ZyWE)Ue2Yp z_t?LRfTOmB-={qG;@fca)7M*B+Xw zew~v3Rf({zf0EZ38TVHGd=mpPlYyZj((3ecM3EWY97|F50%<}WhwX94O2f{N^{qxEwWmpH#? zKK@y=hBIxOReU+4(noKN@7F>PWo-?cA5~~v9LgKrFmrDaU**D8yJr4;TE<(y=ft1+ zQu97XI(>QU`bo|G-eYv2W|LpzRhQeV(p0U)%ry literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..463e51db962491c9c6bd1ff6bef48cb5b2518f50 GIT binary patch literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJPo6H0ArY;~60D08M0%PU*?N}T zdcU*gP<_rLd%u4zo4@;OsNaea3zFSnyQ!h@*DvM&`tx?TD%DMXXu8s^kx|%kmJxHV z#Mj;{0Y|P>x}Gdz@KpTpt=(w8l(;&x=k+-*)hsWH0vY3#HJEPr)fY-u@ z|9L!mEYEVHizz4Ja=)<#=fntyB94Y88MYc-g_jL6ryUzq*q6vfw1v(Av6pDfcq?%9 zL6$>Y*77c92L+!4qRX8Ry;+<2o}r{YAjy&=U=FWi-;Fbc-5gUxiWqbhm43^yTmdKI;Vst0O1sK9{>OV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..65470ecb3f4a291c38659035a75869e701ead328 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ*PbqpAr*6y6C_v{Cy4Yk1sYsp zR5s=L7-RR)zGtuPrUn(`nJY3aEgO>94S?WGSx3^0w*s!ynj<{6zB&0h{C_aNPV?tj zUKhzAAj7&L#G!=4rt;sb|C67u52*S6_=&%T^i9DfEli$)8(tmGV*`R6t}@Tw@XSuP zODr%IXtid#n;25cut_(O-FyLPZ5q4n-C*#&?)hAXEe`hJ~`Kk%14tn$r{xD73|44!LwzdSEtt` i?Mkcif|7aau|6a<(z@_8Aw zd+%xNsQxlp<3=VkgYfq^=CTD_L~S30;rS0)78&qol`;+00@#C A)&Kwi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..446d606c89a16e6907f7c0b53e95e087626d7f81 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 zOp90<|9%n`5ddms@O1TaS?83{1OT(l BAh`el literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0d9b28188e69cf13575b58ae8909e50f45b6c416 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPc#V60W zaAcOFz_;S*4>qzg#Jx2=fBvG|@5U+y28ZxT+$*0l{(X6CVzopr0Jf_j AsQ>@~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8f39716ef266b18cdbb7adac7b4399f3b1bcab85 GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzeNPw1kcif|7XvwglFkPcJ#R~1 z{Vac@n}pTFq#yRnLa!6AGS_hxOT=L=5G`2f_);OXk;vd$@?2>_7f BAou_P literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6faf9c056761c97601108ed6a97e368629c7807e GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJot`d^Ar*6y6C_v{Cy4YkP2`jC z46HeQ{*k@e$Hm)^K6rEF^=uEL$(QK*PAaZ z+TS{r@t&ciJs`=FnOSltgKWXsJ4Ze|X8E=SXi$NkR$@XzLkok^j*31T_X%$pO1cvr n?sx3!ECxC;(16R0kAdO3oBoyPm0kKkPcV48`njxgN@xNADaBrZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..683e37bb459ba44411f199541d26baed92580acb GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn`LHy|t0|kONO^Vz=g{ zR>=&BCQh4Ux}{!61@w#=^oqpiVuLy|gK+-|mHtbWT(V^wr4$q(R z)!u14cZBWqWp_nZM6Sx3?6psOt=7+Ve@ZJD7&hEy{!yIQTd*u438dN6)z4*}Q$iB} D7yfKM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..57468a3b1b5fe6f6d9a66e4059bdd80a226efc32 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=hdo^!Ln`LHy}6OM*+8H*Q9Jm; zM9E7j9X<~X_lPVyC7?G$VRlUOlt)1>CK{WHI9mAstuIP`S&_adxnH;-5pN=0BSzjx+mxWXZsBJpIIDP$*{}<2QLJ>E=y@6Dt zz<`MyO__la0^j3$a605iTN&*gfbI}VEC&IKvmwY4KTg~tLM4?Pz`3Xd zOoKuI8K4)?K&FbYP&&;Se!3;<9|Ngpp){?`Bi002ovPDHLkV1ms` Bbw>aI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d3ded3558d034c7387bba39b359f643731bc4475 GIT binary patch literal 292 zcmV+<0o(qGP)*D3Bsl_`Lq@?U7zLw%8~_0N{8&lrf6dka0000)# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8bd96119f901f630c71dcb4bf73a65c5c08bd517 GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^*8>L*gt)kT{`^^riDBu6 zKkPtp#*!evU)e_1!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTT7rG~wsrE_PuvFhd( z5+}@`Jo3@@I^)~AVXA1%-A53q$FDN->3sEmGX3P43U_coFFl)p^$OP!QEV^ g65<+SRZ|%lc6&1ZQJChV22{o1>FVdQ&MBb@09q+ipa1{> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ced9c03bce1ac912389284f89008e8916f94eedc GIT binary patch literal 435 zcmV;k0ZjghP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5skk5~Gc66ML03VEi!&v&s2C_}$i>F2Dj*?j*NgxF0KiE^K~#90?c2)@fRO4nn(Zu002ovPDHLkV1fuy!L9%R literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b0ad909a71f7664e0e8c45e95f89ada95ca49c17 GIT binary patch literal 992 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGo4OJl#B`&GO$wiq3C7Jno3=9=> zLXU6cI%FWg_Q3MHi2Ylwq^k#?ig`}td27v5WXQgCYD_>)HM{!HW$TZZ?rD{*xwq6-`IMrSrvjAj4+7?o;6!n@2e|!e9u~# z$*&OHp!mZ=MAJcDdh4v$f9<*!g>ScYUeB1q{GA~?cWLqITN+mA{-}!nJ*i?}lq(Rga(B{$KQ}`thCi zVExbRY!xB#W&7i6SQ&hLeHUKMO025-btgG$t=J)hJr~=)%(nmeOpou|_2T*a16S|7 zUT$~j`Jcx1jFYY1@2-Dr;kGiwY4_cC_pH9FdN!H(w$Hp9{@lP~XK_pO->-L`GauM| z^k~!j=k;&pE>uf!9KP`O-Mgf;v}M0PA3p5N@Z#R|WiNaGf6|kyvidaZ{$|p5kV!;po^D=s``FIub=Quk&x(&LeE0GD#5wi_ znMtL$EovAygdX(VJMZ^b#;c#Y4&SVLIXU&*pJzA!RLea}zs1bJz(1?wv4o?*g1dR; z@9*8d?JU6JF^NT3SorW6IjQWrrA#KX>z<`Y&56Eiwyv<=c>C9%)1OTbk9mCl_QW~s zuU<^C;#R_l^TIedV;{ z&y+tno|9%Pie_FVcg!vpt?9Up#JeE+$R_v=EN&%YY>`#*be zUH!*|%*tOtvwr{lW1L^R&v4zwm(PE(d|TDAalc)ItV6nE3YWt&1{C5Of4u(Db^1B4 RjeuE}!PC{xWt~$(697O~yt@DZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..294f3267803d02be7d518d1ee0e67e1600241a16 GIT binary patch literal 648 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;VDk5LaSW-L^Y-q++(Ql`4hKtD zEfkXS=vt^~#pN2%THL5SO^I9gL)y2lKZZX%?cVYMbs~cw9k literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3a4e9e8f9d2857077e34aa0fedfd83c49b154e06 GIT binary patch literal 539 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;V0`51;uumf=k48tnYR-p8WJ^2 z+G4C43(Gg;M=n^NGl_GPllqC3++V`@6DLVJl?5mW2z$hIwY;A4y)w`2#QpX0dmda~ z&j>V*2+*+ZMPTw-yU#o$4v;J2qQ&f3?_Z#zAI z{d~KxKR+zruwQce{Qml9-cWWo{_3&!^R`!izniw%@=W|D`_1?HKU`e& zKxW(Rw{KSdW12{z6Hv70e*5?$|9pG>uaCdy&yTOSkpGt_GjHFl`fWd-*Zo^v_~Y9L k&HM9-2wrST42~P{oM)RB+%WZDs5?l3r>mdKI;Vst02o!ewEzGB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a28788ca44053628f29985dcb49b4c610d51ca8c GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|t_KbrFzONc|Nnn}o&Ig0 zAY)08UoeBivm0qZPF__=M2SmkadJ^+K}lwQ9s@(goZzs6qSEhQf(t%=eWK;9t99jJaWn(XeIgchCnG~WBymE(vy0NaVy{>O(x3TKx z6%tD(b{ntNFfEak-(VLtgaYP|`fvf=+ nn|VSMlhRTtwi}Yl5)2G6sf;Um<*b(jl`?p``njxgN@xNAi!oFp literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a41875a41caaa0772921eb97016238ab4c993f26 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*8>L*{QLLs^XJcZ?%a9w z=+T1*4-OtY_{vxkq=T^}$S;_|;n|HeASbsfB%;J6wK%ybv!En1KaYW-Voq>aK~d@V zFTn*Lzdq6O*3~+9=6vvmP=kxc4<6~9_t8AbP}I}A!@@Yo__DE=!kkBwj!X(s2wu5E zLETta*Iw7Rv)fp8^9l)#v=c{XhE16Ealo zF)=wog7peRPm@D~j>3|ZB};mA9!ZHw&B|(0IWR3}PMVMW^@;op_Ybj%UKU!u0H}?@ M)78&qol`;+0C!AjAOHXW literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e8bfce8645c29ab39404812c1f622131a887aeed GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|uKyYS1A)DcPETUOE1)1_ zNswPKgTu2MX+TbPRY*jMOKNd)QD#9&W_}(6L&conu!5q}?_YuoK7M_o<*loA?#%h% z4WR}XjUPPHIq#!+lA)-lcZY>>knv?>FNHaeCLNg+q7bZUX>4n+>)Y9Fth#xH#FFlA z+pu)hg#f;%bvlQz~ph5;uS3j3^P6i literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4635cb206cd102822ba4f5eee9b1a46a31ea776c GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|t_Kbru-DP~|NsBAh~m3I zLB^6GzhDN3XE)M-ob0NQh!U67;^d;tf|AVqJO+k}Il*BCMWx@r1Q&e#`b5iHSL@uF z^T8WJ4K5l#c%*aQNAn~@QBUs<3*#W;%f?;`a~@4PGATqMSkuzj)?U}Qv)fp8^9qS2 z-QC7(H4M!~kC;6P3M=?p%s88yA*@cSCUeV+NT9W{o-U3d7QM*{609W*IlLTZ(+@lB hOcLRVGjIuJWoVUQluo*MU;$7egQu&X%Q~loCIF$hQmOy| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..294f3267803d02be7d518d1ee0e67e1600241a16 GIT binary patch literal 648 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;VDk5LaSW-L^Y-q++(Ql`4hKtD zEfkXS=vt^~#pN2%THL5SO^I9gL)y2lKZZX%?cVYMbs~cw9k literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3a4e9e8f9d2857077e34aa0fedfd83c49b154e06 GIT binary patch literal 539 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;V0`51;uumf=k48tnYR-p8WJ^2 z+G4C43(Gg;M=n^NGl_GPllqC3++V`@6DLVJl?5mW2z$hIwY;A4y)w`2#QpX0dmda~ z&j>V*2+*+ZMPTw-yU#o$4v;J2qQ&f3?_Z#zAI z{d~KxKR+zruwQce{Qml9-cWWo{_3&!^R`!izniw%@=W|D`_1?HKU`e& zKxW(Rw{KSdW12{z6Hv70e*5?$|9pG>uaCdy&yTOSkpGt_GjHFl`fWd-*Zo^v_~Y9L k&HM9-2wrST42~P{oM)RB+%WZDs5?l3r>mdKI;Vst02o!ewEzGB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e8bfce8645c29ab39404812c1f622131a887aeed GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|uKyYS1A)DcPETUOE1)1_ zNswPKgTu2MX+TbPRY*jMOKNd)QD#9&W_}(6L&conu!5q}?_YuoK7M_o<*loA?#%h% z4WR}XjUPPHIq#!+lA)-lcZY>>knv?>FNHaeCLNg+q7bZUX>4n+>)Y9Fth#xH#FFlA z+pu)hg#f;%bvlQz~ph5;uS3j3^P6i literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4635cb206cd102822ba4f5eee9b1a46a31ea776c GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|t_Kbru-DP~|NsBAh~m3I zLB^6GzhDN3XE)M-ob0NQh!U67;^d;tf|AVqJO+k}Il*BCMWx@r1Q&e#`b5iHSL@uF z^T8WJ4K5l#c%*aQNAn~@QBUs<3*#W;%f?;`a~@4PGATqMSkuzj)?U}Qv)fp8^9qS2 z-QC7(H4M!~kC;6P3M=?p%s88yA*@cSCUeV+NT9W{o-U3d7QM*{609W*IlLTZ(+@lB hOcLRVGjIuJWoVUQluo*MU;$7egQu&X%Q~loCIF$hQmOy| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..431b489fc307e9bb8f1c4bf94bbdd6691cf72f0c GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)*ApjB%$$|_bqB-ijSP=g zG2C0uaCHI0*;x!nr!Xj$e)$Vj##j>M7tG-B>_!@pqwneB7@{#TIYFYWA&|k>Awbf% zaRTQqCUz0KY=K!#TTDV&d7jEQ0X>K0v>A7v&Hgj|Hw-dchfEpP~g8YIR9G=}s19FNz zT^vI+CMG9H#5i#Do_~|nqm`f}(WEs=BTjBo!;y4heSMKqV+W3o_UY5b+e{As>{<8p z>C&fy9HL_D9zJ}ykb{+Hn(o4-OFg(GW~A?EYpYV=G)URnq9n;_RNBVf#l+S&S9UIw m29r&;_@bZh7BU=GU}u;yNx~<18mlePdInEdKbLh*2~7Yp6H41R)v!JF0Um(A$O#nh;! z%6WLYHa5of_4PhJ%sV^GL`2Machlb5+>49CBqXQn>++h@=`JqCpPkKea=b4u#4$0( zH#f{SHpHHt(Sd-#B_*3MFvcz}#4j(sEiJhi7?vq1y`Z1RZ*RIB9H0{ujWaXMgo4r7 z(%G=A%Y}r>aB#YHb-gPBs}2r=Dk{CNtjdUo$|nJ(B_*{O7?b@(_x}I@00DGTPE!Ct z=GbNc005jxL_t(IjqQ)e7J@JkMG2OP1>>lg7z;LR*cI&U|9?txoy6mwyM6cEGhmnnG;|ZV6f_b2hES3^iYwr8@W~+(p_8~@xA&t|v~M;NhuLQraLTHIIj< zK~L|9y!o8O6Vj8?4z6#Q+B>(oL2^#a9h)DaA3lBL7BFb>4d`fyZgq7zdPG&_qvphEkMSTk`^h;#6B#^R{an^LB{Ts56kJI$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3d9d62bdc55ffaff7fb8ae0ccfdb14351b7707ce GIT binary patch literal 305 zcmV-10nYx3P)9TZjv(0qARx@gIj|0(CK!5YU~ji6gO6&3Lz`OmlU5KhFfcF*=}R#z+I*jC4j?NRu!|T`%>g8Z0LbU;BA^8LiE0iY zDFi$jcmDtR<}CvVQwxw30ui%08TNF3`~Uu@Ac)II4L6XS2EtpeFbJ~0r-t3+IRFF_ zx^E7w1E>i`+XJKR0aEJ%hPR)8Fff4dC>R!ifq?-4ZcRdy!2Zq#00000NkvXXu0mjf DuycEa literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..63c8cd434614ce57a62a5949a9bf6f22b4b0b384 GIT binary patch literal 333 zcmV-T0kZyyP)x~&0_WzRk4`OTle!@8G26bJ`L`VV1a$#N$1{o1vhMCv@Q`dH48~_4u zK7I$&_Ik2ZcL7lj5aH)!c>C!)we2R}0U#jE$2qVLpcNn~4bTD*<$%52rVLv0!UN-g z6{+7D7&WvR%ECkj#sQ)}84T|(J_9=fVKwfq?-4y7EiH-iAQ-00000NkvXXu0mjfXRL+s literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c29e78f22316c4e0d01a83da81a44920df55e5b3 GIT binary patch literal 318 zcmV-E0m1%>P)85kH`L198uCtx^$f#D$oyQn73eU8%sKi|A% zV5d*?g8@bw@MPTiALIxarZvC_fr#0h40}4i{eS;ckm2v+O&}pgx`qG`zFmT2Z7PLV6;6j_|iaHMK>cT4Lo`Cd0<>L3Pu540RsaA0O1l(u#MIX Qj{pDw07*qoM6N<$g2!TiLI3~& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..703fc2a4676cf3617fbb67a8b8237d01f364cfc3 GIT binary patch literal 279 zcmV+y0qFjTP)8o!?~&bmQAS24jD!n_;|G9tVTH&`JKp}Pa#eEd#Ndodj#!q3U@ z_7nXb!Gz2a=Hnb#2Mh!lJZWHWw<&{`yzsy|fKfx6p)5>f;2iMo;xn)#R;1E5Dp+8Q zEsuUOGCaD^z`)?nz`(GK{tjRlF+vg^00%HIJfxeYSRL^5&D()>K&nK zi2=Emq#FpdQu+UDTfl!v!wpuM{~)#_+Y`pdv&89Rp_T(cmdl9ng4z4ufE@CKD9~Aj^gMI0w!Fq*_jO2ap4XR~pcg7iQSpY%p*RC<_x|VARlNSdmJ6C{WD- zAWK1(zq|O1Ve{u8q6;{x6+~c5m%joV$*sUav_7gi0M$}?`a1yG(ytG0(%%8dmiqFp z`=3r^MMpIUfGlN}^GNw3G=}T?$~0uHwD~LBkn{37yZOua3@P5VmDm6J9}j+c z@d%@W_srD45-d0G8}FF%SYI%661P%Xag(n9i(~SCOo|yeVD{(o_iSU&c-EkvZ`WKH m^Z@&v`xOtf|Y47~mH z9jiE9900Ohn2&Sd9DvJmx;X$J7#V3mOJ0~^bF;y~IiM^|gn>~*n_)#NW+>3y0U%33 zmcP6BjA8TVAdG^K<^>Vh(&ewfR>EV93+l0jQSB)87HemVSM3ll~4sw$zt*-T!p7 z3XtXw09nc`>&GC-{+_|59J55Ec`k^U%?Y+Vp&K*!>EZwoz-2kz9Domuwg*Pr19Wk~ rlQ*BiIIW_a=B@BiFbYTm3=9kaX-Ptu+J!dW00000NkvXXu0mjfV`F?* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8645a8c3c45dc5b1242fc380c281a70a2186593c GIT binary patch literal 292 zcmV+<0o(qGP)1ltO1_Q$lR+;}G_Myv9z;?6H(*YpMWkh%xzW@9U7h|HQ17P6I$L|B@fVZE% zGl=kW4x9so`8ZMd0}=%T?tlSJ16uOJ412px2hIUyVImBS8rlQnfEB6V!IrHwNK;Lh!v4AKI8 z1Lpu@!SHmz-@ktc)&b1S%meEHQUJ{yprWeI@btqcg6c+d!Ked$=%c<_-;RP5N7y!|(Eb2}*9VP$(002ovPDHLk FV1oGBYLfr} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..805da9bb87bcb511d22e4b276c8ddf8e25f4aee6 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k33x*Ln`LHy=BPPdc z=CO4f>gx}0-xlY%^0dG6OqKe_f`o1@P&HioY)?`Xa?>-cA)rmt-TF}WLbZbcXfzasmbx#-X;G8$}WW{v^Pv?o(Zx1}L5`AP+C3Q+A_@!&d;?JSe`om)7 c7#PlcV_>eRRDSNbVJ*lEPgg&ebxsLQ0CS>wG5`Po literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a7b46b6b93bcf4b1844da88ecbaf16edc2193675 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=?>t=`Ln`LHy=BOC$Ux-S$K?;w z7K#h#KVaQ6ad!C1*?eh)TO+64ytyU*xAuZn*Cd4XmTND3*Dk&@ zu5m$ox!27tEE}J&KrCcn5d1jvkXhIp)tayM2R6^}{-F1u@X4Eb;zt!zmQ@u8Cz&_( pB}U22(O!5p_(qt#90P;NA=b|aYm^h%Uul4h@O1TaS?83{1OOWSd|?0p literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..780937baa524284f6accd5046394f02901c850eb GIT binary patch literal 491 zcmVL`O2xB4Cy*UH%`&mXwfSaCUZNWQ19Ms5ug@(5`kl)f|It zDY_jXN3g(M#EsB|tPt4%VjY9aQe-<|fCW>CJjak?DM1Gi>lm0LKx|ShCCLG}90LMH zMMeMl`1nY+6d5p)r;U1GXgh#|gJWPFKn*~V1K8NuD0Tuk7hJq>jzJ?X3NH9)(K2dy z4g*L9rNV{o+`frg60(aJ!6oHl|1&WBhmO;HOWY7+~3u7)!YokkZU;2!&J* zJcP5@MKuwQAtPjPTFM}g#QuWnfS+&PA{-#XfW%h8>KJk?{rcc0lDIU&0s00;47dBb zv08-c7$XK;fEY`kt(y&Js}?Os4FP0;9MrfR1M>kXmSO`0>jL5&Lz<w?j`V8BCw1=KbNHO(1{5KZyheUW%I!2mIJ0WwfUvIEvH0B1wEBVd3G z#}I2N41nweFF002ovPDHLkV1f~}$9Vt% literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b0f0b08560f6bbd7198908d0e3f768621bd3abc9 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*8>L**y+lMi;D+ZsXUt` zd@Pya*S3I`1e@7@3|(Da#l^*b=K}r#6*HCu`2{mLJiCzwV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLFGeu?VPMS3!x3GbOXA7$|7S#hF%=n44M*)tHi+lUNB7*P#e< zDJ!`8xqw{>0N27PqQu21V*mgEz)3_wRCt{2+sh4tKokW~5I2(~7@lO1b9Ohx3AlQ9V48-e9gPVt=_|J9`d3VU>ioZPX}kXRk@q1VLOzCknz#-C zz`A8myxHremxlZnvMO=@kNp4uU}feGcg4@7f8;Gh(Dm2R3;@74vKvXE z^6|51P%72Jy8aRJ5b|^4di?!8>(&4Oc#9RG{txkgAk>6})?nkm5RV_k?Dzoy0Bncj c2LM3*UgEwC7hi#zNB{r;07*qoM6N<$g27L~9smFU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..64d7e1dc751e5aaa24f60ecf27419cf25315963b GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy1_3@Ht_Kbr=xS55)0Me-*(T6R zCCX9r*(Bj#+X7y$PyBtax~r?p&CM-7KK@uT!~Z&l1(B+b0aJil85m1~{DK)Ap4~_T za#}oH978O6-}Z0hJ8Zz=QnBi6h`*lN3v6Za4vXDoooc|rezt4L!kF(2GzqI&u zAnb*(`}&ea!mHUQ>&=>YfZ@^qk1AR}(tbMKOAvi;eyVBptK|%{r+-gAS8+G`((5vZ zZF(Q9Ry8*E#(uvodE$>ws=(A24I4O89{POC`FHc-k!hFh4fUh)m_=EW4uE{h;OXk; Jvd$@?2>=N7ZFB$t literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..353efa3f395a6167f2bcc1f68b75b1b6b2f5c950 GIT binary patch literal 769 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;U^?OH;uumf=j~m?ERjTshKKbk zOP5B>yeDDJpYUo+*(~OY#s`8b5mjt!x9~>1W7KJ8zo2}he~Dq2q~e;{y_NIZQxns= z^8ekfOkDjJXdDW-6LQ(=yJ`Q=OP|~Mm(3TycSkn)|LHx~=B&25^EdV1V#9Cte}Dg6 zeKqUjt&r=UHAWE_tWP!%8WX5+p^8)?w=eA=$_uAZe_v^m@ z=Z~w;o{x|Ee|hir&krZ}OV8i`r2lLE?q7el=2ggj{waNjhui=2m+8mv_$!bbD_8?z t?RNVEyEE literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cdeedb4c24b6843544fa4ca348296f2536b90cd6 GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;V0`N7;uumf=j~lXFJ?!Hwuh1% zw`>vSSJ1R|*e1MY?H+f5euX&aH#tWy$tYDZSZ~}Szp+!{rpClx&ikKBcAwq9`80R* zSrMRd#DJo!`=)NcwkZD0n-$wm{=WY8ulMWP@a8l2D|0`Y{Q2{;WY>p(|D3O@nIAs? z-gx)g+@g=We{Nm(FM}!J^@Bh5s8{~HWb?vtIpQq=3{xAHTdBasZ{vR)P=oGv2 VvzR7}3vsJKlAf-9F6*2UngAYTyTJee literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e46afbfc8948a26438bb480c578595fbe336df49 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|t_Kbr2yt=olwq*4T%-aN zWGo5t3ubV5b|VeQ$*l^BC~-+GPAM56C74hRQml(aKXo~Pqe&swa%S6 zAG{&d;G*$^M>^+yG*2=V_4MwrFb*=lZ0w~l=h37ilR^}NH7$*8H)`1H`gV33t8QK) zv82D-c&&z^x#$tICqZEaUyB)M^DxZVD(!C|?N|u3Sl-jcF~p)bIYHuxLh=Gx11>i6 lgeWGZrBZA+B$Xu?7-CWxSMthPF9#}R@O1TaS?83{1OPC_PGbN7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..917591545536d7fc4d279f57f0783e9c04076d28 GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvxd5LK*8>L*bhWA3>B`)^Y!hgu z66L7*Y?AP=Z2>RWC;q-y&DnDHDo`b3NswPKgTu2MX+Vyrr;B5V#>C_ViK>P`Mqh^; zoKw#~$?DLWAfwc9D1E(wQ|JUcTgIy_-9;g+N(WbPN%+paAj+{ov%n>ELDRAZM^;}( f=E+Ql7cetiE@0oNEz*?>G?c;9)z4*}Q$iB}j4C`n literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9c3943fbf26ecf93db9b406f4955db7941abaa35 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=dp%toLn`LHy}41a$w9>RV!v}r z3ga{e+ZngE+B$HGIi&1TGw4gR`d6EOqgu)6-M+>QW}q$*h`N+I=WA8pCR=+y=R40d zpW4pfCEs^>`PMakr{{d>`fm|&J#@mS%xTx<1AZFZmtX!w1&&=LGiJ#v sysp~Qb=qLs_SfI5&!y@E?JrYTnzyNvH{Q*6Z!5?>p00i_>zopr01r%D7ytkO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0f4ab68d1569e959c7cd17c2ad9f83e6a37ff345 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC==R92;Ln`LHy}6P1kO6~BpmgBU zqzP{t*c17)yngi@P)K9vpVVb$!l~(}6m{z_xSiX1U{qlFvR> zYR=2w*=ce;I4W+xe7oTt@0Ih4!*>_XT(*O)D|(^N-g5rpzaM5ZRt2t|Tr9o*w|c@709Ovok K=d#Wzp$Pz&BwsrK literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b0f0b08560f6bbd7198908d0e3f768621bd3abc9 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv#Q>iW*8>L**y+lMi;D+ZsXUt` zd@Pya*S3I`1e@7@3|(Da#l^*b=K}r#6*HCu`2{mLJiCzwV=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DLFGeu?VPMS3!x3GbOXA7$|7S#hF%=n44M*)tHi+lUNB7*P#e< zDJ!`8xqw{>0N27PqQu21V*mgEz)3_wRCt{2+sh4tKokW~5I2(~7@lO1b9Ohx3AlQ9V48-e9gPVt=_|J9`d3VU>ioZPX}kXRk@q1VLOzCknz#-C zz`A8myxHremxlZnvMO=@kNp4uU}feGcg4@7f8;Gh(Dm2R3;@74vKvXE z^6|51P%72Jy8aRJ5b|^4di?!8>(&4Oc#9RG{txkgAk>6})?nkm5RV_k?Dzoy0Bncj c2LM3*UgEwC7hi#zNB{r;07*qoM6N<$g27L~9smFU literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..475a2792a99d3e0e49633b847f109972c668b92d GIT binary patch literal 249 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv-2k5u*8>L**y+l&B-jL6sYE$y zKAR-`Yg@p}^@+dlRd;oDxw*N;$HyN_X82#nupm-(&BE8`ff^Z0g8YIR9G=}s19GZ7 zT^vI+CMG9HR5b)L_&S^r@NMi=TIDdoc$L_;5);gyg|52RJ!81gwYunG0WO=Mx*Jo6W_|Q`Mu*UU_8fa!!Kc`@IzR_LUM=tnz-Hz tn~Fr$yQZ#|*kN9f>mcSlbvYXY!^;igHeBUi)j(G;c)I$ztaD0e0szBeQoR5G literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..353efa3f395a6167f2bcc1f68b75b1b6b2f5c950 GIT binary patch literal 769 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;U^?OH;uumf=j~m?ERjTshKKbk zOP5B>yeDDJpYUo+*(~OY#s`8b5mjt!x9~>1W7KJ8zo2}he~Dq2q~e;{y_NIZQxns= z^8ekfOkDjJXdDW-6LQ(=yJ`Q=OP|~Mm(3TycSkn)|LHx~=B&25^EdV1V#9Cte}Dg6 zeKqUjt&r=UHAWE_tWP!%8WX5+p^8)?w=eA=$_uAZe_v^m@ z=Z~w;o{x|Ee|hir&krZ}OV8i`r2lLE?q7el=2ggj{waNjhui=2m+8mv_$!bbD_8?z t?RNVEyEE literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cdeedb4c24b6843544fa4ca348296f2536b90cd6 GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;V0`N7;uumf=j~lXFJ?!Hwuh1% zw`>vSSJ1R|*e1MY?H+f5euX&aH#tWy$tYDZSZ~}Szp+!{rpClx&ikKBcAwq9`80R* zSrMRd#DJo!`=)NcwkZD0n-$wm{=WY8ulMWP@a8l2D|0`Y{Q2{;WY>p(|D3O@nIAs? z-gx)g+@g=We{Nm(FM}!J^@Bh5s8{~HWb?vtIpQq=3{xAHTdBasZ{vR)P=oGv2 VvzR7}3vsJKlAf-9F6*2UngAYTyTJee literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e46afbfc8948a26438bb480c578595fbe336df49 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0L3?#3!&-4XSoB=)|t_Kbr2yt=olwq*4T%-aN zWGo5t3ubV5b|VeQ$*l^BC~-+GPAM56C74hRQml(aKXo~Pqe&swa%S6 zAG{&d;G*$^M>^+yG*2=V_4MwrFb*=lZ0w~l=h37ilR^}NH7$*8H)`1H`gV33t8QK) zv82D-c&&z^x#$tICqZEaUyB)M^DxZVD(!C|?N|u3Sl-jcF~p)bIYHuxLh=Gx11>i6 lgeWGZrBZA+B$Xu?7-CWxSMthPF9#}R@O1TaS?83{1OPC_PGbN7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1e13cc11161049d423655cba5352c071bf8e7410 GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)*8>L**y+l&B-jL6sYE$y zKAR-`Yg@p}^@+dlRrgNmI|5Y3SQ6wH%;50sMjDV~=jq}YqA@W!L87W5kipmCgn(~j zr_w5i3C63$ww0K$Cgw7(P+PHlp_V|IQ}BYMj&%+VCagS%GPn%>nsP8O=FVdQ&MBb@0IUBrng9R* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9c3943fbf26ecf93db9b406f4955db7941abaa35 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=dp%toLn`LHy}41a$w9>RV!v}r z3ga{e+ZngE+B$HGIi&1TGw4gR`d6EOqgu)6-M+>QW}q$*h`N+I=WA8pCR=+y=R40d zpW4pfCEs^>`PMakr{{d>`fm|&J#@mS%xTx<1AZFZmtX!w1&&=LGiJ#v sysp~Qb=qLs_SfI5&!y@E?JrYTnzyNvH{Q*6Z!5?>p00i_>zopr01r%D7ytkO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0f4ab68d1569e959c7cd17c2ad9f83e6a37ff345 GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC==R92;Ln`LHy}6P1kO6~BpmgBU zqzP{t*c17)yngi@P)K9vpVVb$!l~(}6m{z_xSiX1U{qlFvR> zYR=2w*=ce;I4W+xe7oTt@0Ih4!*>_XT(*O)D|(^N-g5rpzaM5ZRt2t|Tr9o*w|c@709Ovok K=d#Wzp$Pz&BwsrK literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a98c989fb0b6b500febac02f1a6cc3926239f78f GIT binary patch literal 2891 zcmb7GdpK0<8lRCV>6F=RjAUc5-8V9%$P7|KQ6sWLNXBiXM8p_VCZrtYen}INLdY!{ zOq=aK*r#X=hSZ=f<1(X}mKo+O`|RgDyJtU7=Q)3@?|avJzi+K~y}#f4d%s&Jo$Pi> zD@sEkke&9&Y_Z_{Zu64b3XY0D1y6(1O3Z2Z2wVRve&IovB7(v$LLkxivtGAeY`20R znI03$s(U8X04Jt3x!U2sn8>=QIqFB3THR&bU^rVB9xE%*af+m2(Vr_&K{8&^UHi%? zRFm3s`iEB>=7R1Xb&J$a%&qEJC31(IPbubk(S-M%(^iv>b3PR3-+X_+OF#8=QPZ9E zpW2paH}bdYDOLv66#bID)k1M0XxTa;_|}f5hEqyMFDrEV$|n8ANW84jRV15)RdTqj z-T7DJyi&^L1D(^dNiIrGUl|HX;)F-C4Q^wH5k#m$d4#U~%g)0Ph_sx&t@Y{X`y3W6 z#A8mmd!;&z_m3Bz$zkuZk1I-;UC2mEY<4^*@4Tl{{Lr&j(ipd+NzK|L@gfrLfSR&a z4oApjZO?4hNN9lVkvL_{+C6_aeV4aE^Wix9bG80%>mlAj%%maQ#4Z(W#|4&^e(nPd zLc_xLLQ-i@q9B3B(o#~VtgMnHBy42iMyROxcZ)LEIjohcR^)d&stz42%7quhOeDF$ zMVMYfmWA6j3I9o5dLlTCBwxDHocufv3pEq2_xc#+>c<51h%=}|aSP38F}(fr!sDJH zPWObGfw7n#ByPviFbAnE_$9soaW6iY-8~?KtkmT>V_%3|o{@m%&rShB$k>zZgeVIA z>`m-U5*&xV>T*u3IfF2G_`Y|}@vbq3Tw~&O!+c}8moYbF35yiiS2OCeu8zw(qscYH zoU2;p1Qd$fo0f-(f-QWG+22$fO6@4Jj9s_pvU{~?gMcG%oZGxP zel2IJGA{1&zbtIfzzI5qDp3_>?x@FUv}~b0HzV@ic7;ujwT{177!mdcp0cn47Y$-o za*RF|4!-_4GpZafc$Sy9{^bqth(7{+L*yVORytoWu7Y0UR=DnMRT>YViSyaABm(!- z1MemhL_Tfl#%8AB#Uv6OCP~&-Rkejek$(l@YgdtrH==%UB97A}w2|`A5x@pcHcK=M zQ-2RdlI^yK*Ktz=CRpJDQ-|au7Feq&n#DSX4BwCC9Iqk(yXz;`kEZO#y+o1`FXNgc zYFe{YRd%96V28q&%f{{zh{V!^?s*5koN_F+fHfq%X%$gia0SdSJ|hK_yYwe2CHi(X z!rLDuy!q|zDqoW6!E^JN6eG79^hrwXQ@Kl!Dr_c277QIlXXeTrL#vrze0$;XFb~>m z=uDI=G?}-!`E#8n&q<_EyvSqrq;<2jc)Qw0Gnq#Qyr2a}lvGi4OzQ&^+BnDI%qum3 zzD+~L1{~sx7Kvip<}la(0JJKwBa5R2bQ*1bY{k{YD%lYW`M;89JeUa4{ZxeMeXJXx+ zKZPWJx>c8!X}B^Upy?i&iPF3xJ(P>Lg|gzh!TmMmlL(mgN_xvwK}KOM{tdHCk)2;c zn%@I;czUMw=>og6<9CzuF#LR964#M?BKL6>@s<4-UByk@i=MzL+X?%*y=P`odnMp! zzeu|`0C;vrHQhTJTCty!O5kPz_d&vlu*souMovbqux z@~(HP2;Lrir|21lD++P7s+(7mEC(z1*R$7C*ae+GjGpB);?HuV1KlP;P`A*IwJ|B% z;umgp`p2#J=c+{Rw|y~Q7(w-7M$Zor<6tIK43BLtipR#Gcsn&lojkjKVswHJJu5A&i;+a_4mapf_mcU+O-Qf zekX7xR@~4pZs8B(OIex}5q5@g5&bZaSs}>y7g)`B(d@I-sg{N$ff?UzEYxEuBE7PQ zo#Aal%jQA7TPb(wbY-y+!~a4J3tbJzQ`R>^YF+aP+}pE^S`rQ?7LH?%A`I&n07DDD zfR@NE`xV@*L2HCbmOsp{xa{$@>ojnMnotEO{{A>Ay5&8Wjm!!HW3{Z|$O=33VKJLpeahxpm+Wt>B`5GXUZZEAFUQcjpA}Z3?VG*VCi>oZnd7!`kL}!j zNtLAk@_OOk?h^VywaGTU@3&!IBaHOUb<{teyj`mA-B0h@Rx!DHHTlP%-bDbrtBJT9 z2?pflkMB(COc4*h&GIg9q2gjWNJW$~Vu{;mr)_s(B#;Ov zh=u(D^1oLEMp{VqFxYy1Ih5&KHOze0^NLMT2%n(}OBkP+4%E={tm<)&6L!XK-T129 zY~4NYD$%*>fCRnqMhm5}I);kIjANb(=gO;cdVo63697fqD>j%9-0c4Yf93~59X~Q1 zs`r%lsFLKGKXjD%lFP6tECoA;^5oQL|HcN$gk5&T&TMncn9j#EjHMaM;(l88+UXmj z`Ppi)4Lr*E(BWIn^eas_#*7*ImK%fdac9N+q_j3suqi+q$OL6elH8;L`yV3yHQ=E1 zpY-d>fbyQ;4q&Z%p5n}Ax&A069iNU{vnGSZ`K;*N>fGsLP+wfBZgI+mM0FZj2O1Th z&cX&bBb*LcHDpnL%(56bR4Y>&E92e`;BmOcHb0!ajk_xwA*YAYo3@|1o$LK^{T!V^ zJH|ZEMi}@k0Qg1pcBGQ<*Lic5!A;ro%A<^@`8i`giPrRZJLGB>)r(WA2$69c>`z>o zsV&Vy4NShyk?6_G72bv31a2?J6B;1*aMAezfja`AoUL63?bInE&AIs1eYW#JAUk7< zElR^3#`A?4tm)-T=(CNMBb(9|hTX8!^LYc}=iFu-KWpZjZ}J~qyV9Lu>WkhBu=RL( zGE!12{`fynA>UHEVA0KM)#qBvCt)TEdVloJA`~tuK^xa6QwgbY4+x*xJJdv*Sq#a9 zC#ws8q>qBXx~xX+U>W{^KXWHVLh-r)%zmRpBOOnunV)&S2K}yZI}$%ou(eN!QGI~I zbvn8+fM}A#w15;@IJ8w;PS@xA$HNe5E%}pi%N4xqxwC&7qq$(v`&8iYwLq9>&P|hjm(Zhps%ArgoinVGyPO+L99f*p=3S*wgxri*5 zV@^BJoI)vNwmF+wY|Qpu&-b6-AHUc4_xt0%@9TBl_kF$Y*Zulj@B6wRdbm06mi=88 z008WEcCz;rkA=UQ^e%CqMuX{zhosxyzR~s}QCA}2e?`N?!vKId+~XcQ*^h>MB>R8% z>ewuu@AQ6O_Y_2a*_^b~_+(;*<~~sP%11fU#b!0u>TjVu9roGEY?egQkg$!bUmha; zM8a#Nc4j@Tehicp1}*v$b1d(cOS$*mHly#?n=0)L%}R=I2yCZrB}}W)7k`wt1rixr zan}sZR>Y^g>uhi59fw=Og{Od6sy(f-I4}zB_=ITQh^22eeMb=!h?1LNz zV-m;c){^2{g+CwDH}MMf!lvt%%g!Pvt^h7WM>0MI?d;ik>=7dO0Ll3DNlcDq{@j&4 zP}`xq@9cn1SD+(%7^;SkZUh%7@XZTZ$fDnB0;LRf3s{eHLm%|16Oh=E+1yg7t-kGz zIP7fMVya+I71x|ZK#ZdRzICCy*O$MKKV`yZ@;O#3A#_sreq;p>aXg3(5`r7eWLm0#qN)ypX8%) zqG<=5^&KV0bTz%(n;Wm7rxTtlv`qbJ6th}1;(H3B_+A_GGw}4Z!k-{iWMr)ee^AL* z3PNr7AYXvC97m}#&UUyTzw9X!jjbl-z-+Jv?o7*8lVwO(Vwoquw%7$lt+kjbwJ705 zB&4S4+2ttV`6e>h{?65OYl*LfB}GNWEdt{GH>Aa`o0Mxc^-F2~mM%BQwu}(R*x?5++$B&vf&)6ikZCGxTN=!$jOJH zV|af{?i7kt001}O?9y`g+{Q%5K(iu!&=DWJ`tssH%mTt|`sDUxBTN(UsD(R^d>e42 zw|Wbgkp~+0%{%z<|*%_k?$Hf#VIp$$&Z_t%-dH(6+pFl1qBOa8Si=a!R_S z`jS`eT5q)yq!z>al;1%jIrYrE_3~29&mU`MYymLO3`8>9c`JyCFmd2G0SnS8*CQIU zQmvF;t87<{mqsr)vU00$hHY{ODb|+D8yDik_kG&_air?)KHt^sSH6U+dvAq*e>7J) z$|iZy2m;i=(e~bI1yPAmC>%Q|FE7s% zu!0(Vg0Rx^n3ws}96Pbf2rN}q*XcDl1>qq6g%p!_L@wVe>e!7gtgDvF-t%L5JyHHvDz# zqUFZX`W3S^D%HT-R-yD-Fyu+skJ(SS9h6k#dG_(BA%&aJ}_FcV??!P@?y86AvnfW4A=x&k@_?gz>WRr-u}f_fHI0xb3ifl>)o zlKpzJnJ^bBR%^j@yE zPwz*qOBmy`XlPsJGtL)963WwN3z*|hfkD*QocW7VS8a6g+nC;?j5=@zzxaP!Y+f7$ zQBOY6DC_j2%%rcF!$uaoPs>E)<~Z~P4G$^%%X`^aosm+1wUM5xTFNwh$x5B}oE_D! z4@VT@Ou|$oK7Lm5$H;cqR%xV~N>`YZni71X6(~7+fVtmO4ir-W-o_0_%G@-dt=Um}O&1Epl~fkj;Z2zG7CZSCU$AguA{$X*w8Ta(ebmWKNSWOs{& zN~RaZsC=fdT=rk}h9#e@N*EdN)Y4pcJ*mEZdT3koEOcA3#LGGqD0HN1An3uXxUuvt z!=x26lk0D8H!qKBN~M%@z7UpZoS;mD;7ss&z|a;Llys&i@E~M;4I|vcrhFxyhxq$; zwiiyx5m-oJPJSr=^bY4n(V-{wwwQn=ffHmZ$>`T>^QT2}-e?|o=p0A2r(NvABg&aV zIfw>eN&L)Qrk`J-h{~wY3H$_D{b)an(;JK2;k%MG- z@&WreY~z4YauriOYKUyKq=5^sd)J|&3%iC?7z;}^{&LRATKN@0-%N@jU%|IC?eVZw zjm~io0JOi-2ZTf~-g%Mxhs|u!;LmN{cIe^#7{9}g%)P~5V+SNu7mt`a?kkH*;b$5v zsXr{w%X8=(P%Mt+m9Gzl1XVI&G4%2&<_Io{i#ff5LSs|yBV8Fp`D9ArIqopV2L zo_-yj;jAG`u{^6Iz#!!cBUjfzZCTpd*Ok29s3DcIQ*FLv;u`@LVgh|g!Jg07);5#N zK5()Epan*L9In<7G~5n8qZ1-SQUmqRiDrc&sWxGozt|^ z5hJIgqoajxrf2ekIZjye%5wipGVdj--f#C4`aA#XOz^^k)nv@-C1o+cbaYNM@{$yL zwTCLYV*`{I+%0+Qcm#c61zFH4ERKu^i~`6%pdI9izT{0O0U@H{U50LZz}o^#1!CTiX;tJ=E}XY zk*F_(*Yg)5m_a;wv8!aqr};*bCKksz@;bLjZ{`t>qv_UXq)Vu*x=NpQ_4s8rMyu=- z(}u$J$EZQnOHl(HU0+m8^}w|$-YVTJj$Mcsc;R&aJRen6#HB}6|n)Zw8Y&u!g!=RU)Sv)xKPr_Q<91kO&Za}GI%jgv%#)bc+=W-Q3Osf|B>xaLP&1Z@~hX7{>H~TlIFDLyQ DA0KMl literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9f38c2ad6783e88dd45ec2c0bf0312c45dff1ef0 GIT binary patch literal 626 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEV6yadaSW-L^LCb@_hAQ#w*4z6 zD|9t$a5N=cx6*i(R9d+0{{i_2FV;A|eD>g#(l73kf}#ss6tv1VWOFxN^%N9!ZReS| z-E?VJjNTW$@>}m49cDl2`(CZTmwWGYiMB)_x+Ur!vi*7G{(1H{?(HnCc| zKxX5Sz8zABAH~m`pSwP`D}v2LeE*EIQTD%#JfuI!ceBSX>fZOBeP>MHvCEmiw2waj z{PS4)i~d>9Tl^Wi>}P&`u_|QI>D%A!%|Bg`Z@s|K^QR`UZbr-9S=h9f&rCO5Yxz3&aKtSob;lV2`_^5$cP;Ae?~j=q zSu1~WmY!1jtMui|!|CeFmT{()?6X}`pf~wsL@t}>9uCg+Y>o?}{2yu53;)UAz$lhs zz$Kl~$hMdiCdYTS$B%a932d#G_!?gI`QAPMk|#n_>=-rVm=r@&_b)M=zTgT&&mKPE zlDxCp^O-|tFR-4zAXO+N)k$a}Pwwgi{=x>1b*y4759IF54pDM_ZN%}ABTONoaY3t3 zg5t}7wo9oSW*T@jCLFc(?K>;}sP=uJO&mGfh8Qyq8t$m z3}#;Rv6`~*t-1i4ra*+lGKF)C=cH&jcQY#6`ejvQEC_S>_-K#diVo&m3v_=u#J>n` j4+F<2C{hKKez7c^t-RUk+LeRAw8Y@)>gTe~DWM4fv4a#O literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..305151c79ddaa7ced5c47e721fe9ac956131345d GIT binary patch literal 783 zcmV+q1MvKbP)2P9P|%i3rtcU3X~dzGg0dym$9O-OqV2xK1ASyK4{Gc zBPb(=4^CtwmNq8R=xM75@3snuVdcYgjvMFTy|{7jyyM@PUB=n9XLeEK5S1)Wd3& z7{~Y=zM>YSS70anaA6_-tgV3!hp7RUW!0^K9C#!erErJCAqrPyKn~pJ z^JRof8j#vtV!tba6J>P@*aP=)6aDDlv3S80v(R>u}dcAPF-6`>SJPwUU zgYZT!e&-b`f)j}@Oz$}{@lU72-1sE&E}TorJ?M7Jf=j)OL>Cj_P7~7rs&qPhTwaF5 z+J)HaI*N<(q0KJ{@j1;G&+5tia%Mirf0koFvITm*9-o%J(m~+$XKLx(*?JvYTM4YJ zZHCy$D){kq%o!}Js0{KZcB=?4(R-l1y`8h!Y|v^CAel_k*iiQ!pl%vnLt`PWR$HFf zuFtFIJ#=QHzhLRK<7i2dTz2LPxLhvWz14~nbv3wTsKM~W8yatGtSR4_N1$ZHH#W0| zXEYE91Yoz@8QL*xVgCjd9&)g?`?}n z^LDV;Q|II1`ub$f?@yQh|Np;dNr9SzOoFrd^ot2*Ky{2IL4Lsu4$p3+0Xf-KArU1m zsl~}fnFS@8`FRWs6?1~a3W`d1{f&ad-Lqdyd;Cs(;Vp+r-4yW}F`I)0v5Z;m%Jn V&dHm4>;OXk;vd$@?2>>Pueue-5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..adc3efaa85d7bcc06a8d23a5a98b647ed93ef316 GIT binary patch literal 1244 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;U|H zS6|JNKa#dtv&i88ulM)=?m7PS*QuJ%zvtZ7Z1A7IfB&DChu@vPo`3Y+j-Su?ZU6Td z|9if>|9kk-_j`bR%lqt!N3!fVtY6DAJac1k5oWl^;$Xrk;7crX%SD!eVnywpZo&<3 z^RE;LG=wKTd+_sT<@G=1uhz-rw0-tEqk7A^ytX#>t4!(KeA{0=Jr6%zwfpg0$e}+= z{=iDveTD)K{W1q$ezat`XvKQrO?rO$7X7$yo3~rv@?K#(|7TGx!=jyb3>RbM8zR>6 zJJ^umHmE-w6l2A<2E|QeIQHSm^?kf&uUQE8_-`z4FqAnk>+|s<=^v33?=F~EaqQH2 zu&39!KUdnmeY^eNukG#akN97_zJ1|bzW&$JS6%K*2?DYF4+3_b6J==LQMv2>|IN3b z?mESMXWixcn00%Z1N@5bw(YL}_pkom-Q%11|Ly$zSHNfetgm0sO8t)Nf3@@TTAKE&V_vHs1nP;48ODN)%a#+b+kz;RD@^HI@i?mKdntk=|#e3O4pM7t%|9gJpvTgGB z{=E6QcR#aFuKk{$H$TV9KbU*&r)fs#&ZW=h@8S*K_5bWw#yFJES9eU|?Pm?2vD9{ich zb6~Z?`l)}!Hnd!3w7L6!f8O-hTIL(>e*Cv1CY~-SUsjv;O3|wfBGUmj3tO$9!eajV4g0xvzdOJu8l} zmcd*e7*+g-?ybDG`+&r~+N^tR`_ik~NsT?TE{346LSs92#w!***W`mvJ2LPod;Z}; zWIR7MNJh9GP;K}5*)Il{;#y#_gaR5aM(T*!Gvv8VY;kGsUk{S=boFyt=akR{0ALFq A#{d8T literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d17b3fa7d59f5bdcbf6ebbf5d31292cc0e7c713a GIT binary patch literal 513 zcmV+c0{;DpP)h@cAT>WviHkEOv#1y-V93Rp zR+N~V3SwITMN@MUD?!3KD3D88!PU&kXr8W0IZd0{_BBgf35W!;J2Bh&XVKWvYgpe)a+WCHYbO4Ye=kNNyvjWPxm%kLq za(RGY=wa>uFF(X+=`mvZa7*bnU;uumf=j~m?yvqqP#}cJW zUrmx$C~VH_*?8nibjlmv8M`)=CcI~pUhYuj=GSv1RhLe{=Sn-z*~V z^1kQ(`IFTyJqK9?1rJQFCim@nZDoItIcNLr$(Gl4t_@qAxBYf+RC#drtYuZDdi*-e z7xyoCa`4;d_T(KK@{D-wKU_+`uR7;%y*(S_nI&JCVosgzTRKyvVd-8rIkEd!uZC`P zO<>f!taF~>T%FEUmG?|nOZV<~yuI!B`~SZ_*8Tt9etLGKSkh&a|8xF7`*m99^Yp6! zXa5)1{nxvoa-QMvgMSWY@9+Kl_5JKyk;})<|1XIxt9$u7|KI)p<(IZQ{${>;=bmWw z&%}K{|IdEkY>;%d^lh`jCeDToCWToH9cm1VNMX)>bFJg`*Ize3|CW92l{ej^^5{H9 zul$LzH;oMALX8-@`&B z`D`h>j^DxLI=jNO*USR`3@*Y5UBj8VTcY^+_S?C?9=n8wuD-hJ_S>?rLGs;St7<>w z+AteCz8}#?h%4hvmYzdZatp?v`?szh@{?tt-i-47^77?GkCj^&FVw@7wBKDxt zQi~zo@!Ziu#y>l5*WZo3_h!GD?`Hl*xwj+5p1nT)`|loLvbk0Bx&3GCby=JLD;Vr* z{`~v0{QKSK>+h%Se*A3q|4X0ee>HpY?Ay9|zt7Fi|L1*9zVz|7-1)}LX@xJ?6H8-% zEA-@$lSqIGs+)Jgle{BOBt#uLk7oRKerBM>&^@vEX*nXbm4z_;{rBdu+}o>{!Bnw^ p?flOVe=)ce*FrPeIsed5dq&Nf3pD2(Y5fQi^mO%eS?83{1OVCyp;iC@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1ba524e64a687f2f7d1319e59b15e2c127798176 GIT binary patch literal 919 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zf+;V2<;2aSW-L^Y*S`-sJ*`V-F=t zUrmxO;JqQl$rrTk-hyE98CDyNiv*XXJQ4BGITIPtn`64r_tJ?8H~w3^|E#mX>%-EG z^*cB(KIa4)NeFCMyz2F>&4-SzUX}HJd&ScW_S<9h&cA%%SgvS>+En0+%Sqsv<=Cv&K`!k7UgX+ilgDFfmjQ)PTP?uO*d;6c&{PVXJ#JZ0v zs6TssKmJyw{rY_E&;QS@f4yt^&wH%5K0W+<`>gP%ueZM++cIaDS;Mo05?g_#UrL##{Ma|& zEnPGz@@>Dv>)IKrCY!y_l{2MfuV+y8XHr*CtrYYzVKk^Z{zpRgzn;Kx>Cd*JWlR>= z|9+``+y36l{^{@cNxv;`?puE7!sqStH`i|zK5+cJy^m? zr+V{GVe{{gXa9ec&G7r>=I7-XZT3AY?5o`Oo4LjNCb!A_^WW?4?sh=)DvQIG)nER8 zNGWE;?MFl)?5JqJrpEQ)h}XI*d-dmEY-FP5YBb1AvHP*~{Z0ePi?@DvNA^WmIljJS zDO2%1=Eb`d#-2)NgPne24Z;%)KS?!Y{1bZ7pE#%E mh(Cni$X9@z0gfdb&HTgoYU8qM(dw#$AQ?|rKbLh*2~7ZuI)8lt literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d31ec4c6ca9606b89816eda6f27ee948bde8772c GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC3+0aSW-L^Y+$8&O;6&$3AxN zXk%U?p2v{hkuhD-sIl~p;@ky$=Q6XrdF%5~VPf|TzsiJj-+TVcw+MLjy{}!eyBKKH zf31mUYHiouDu{po{O<44(310Z`mXo+SFY=Fygu72?pDt1ck^~FTkE&=)Ps#3Tot>{ zY&!D%=K8Zgrmbi&*b#SRhg!0%PZtwUN`NaPo6(9z49t=tfenp3t27Qcu!V{wC^Tzv z8BA~#WtBLw0H?BxTsL&j=k8du=5trZ<;%~PRvauSQ;7fZ@8{*-t6$1qwDU)QzH}z2 w`9I^sHx4~_pB%sTr{bI{(Cr{_;JfAXch3I|SZp%R#)1SqUHx3vIVCg!0Mjmt_5c6? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ea202863595dcfdfb0de6147a46e93b3a01f58da GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvtpJ}8*8>L*xVgCjd9&)g?`?}n z^LDV;Q|II1`ub$f?@yQh|Np;dNr9SzOoFrd^ot2*Ky{2IL4Lsu4$p3+0Xf-KArU1m zsl~}fnFS@8`FRWs6?1~a3W`d1{f&ad-Lqdyd;Cs(;Vp+r-4yW}F`I)0v5Z;m%Jn V&dHm4>;OXk;vd$@?2>>Pueue-5 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3d468a47ee241d7228169b2f4b3b264a4e83e820 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU}W@kaSW-L^Y+$8-a`fgt%>Y` zhAcwC4w9U+dK|>9rX?_#Eokl&TruH}5v!2%1*=W2N>ReH<$?d!cT5ra_PIGkoE>Nu z2qXt_%r!mI{oQV@ef|7Pe;4iYdOKaj_1~x9PKCDzPjBM+T6NRbK3r(`SL2B>He!MD zeT(*2#Vb8@;;6TEc|ASc;fuThi%5b(vlf@Z1V>R;i4zODn0QhGTp8JnRxDy*mJA7O zXyjR?alnBs6qhooT1KVEg_-AXoB77aZ>}|O`=2w@R#x^&NyYZaQt6m?{qNrkZn`e@ mMO$FMZ3aI-1H*))me(29o2bXmoM~bQ@`R_WpUXO@geCwZ5pD+n literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..386827feef12fb05c06005aef3412a3f5252ebf9 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU=;9laSW-L^Y*48*C7LuV;|k- z*t9H|UZ87nRoJ5J3!9%_9^bpXT`xKBw5*GBI_SK^O(7AfvJl$su&cvo3C>9V|)Sfk*BMl%Q~lo FCID`jgWCWA literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..05f31271366b0ff18492d14a06ba0a21f5bf907d GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzCr=m0kcv6U2@gTe~DWM4fkq;!D literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..87af9277bb94955ea26ce84437bcc8a785ae9e39 GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzH%}MGkcv5P&u!!dO1K1?PUCs< zZ)&pv6Z4J+)b7tiHr%IQ?@~56?n0!xW!K!s<7Pm!7^D{DB Zm;4&SBe3-{>vo`t44$rjF6*2UngAwEDr5iv literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b77569d5ed307778d7c061d70afecd181c699dc8 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7*7|+kcv6U2@z4X&WazW?%yXNl8hOf0NbyPZ+g#N= t-J_FdbDucZ_9V)J%k7{B$gm5H46OV44+Z~N69BY_!PC{xWt~$(697Z!FE9WA literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..17835faabb593aa5da23adb8609fd25fed67c730 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=F`h1tAr*7p-dro#V8GLGvEdzu z>;mNt`;#X0TwoNaaOuDQ*j9Yo=%n1d1J~;S1Ll^I7{WV>U>Mr>mdK II;Vst00ka8!TQ*R}vnVeoYIb6Mw< G&;$T-ry$J$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8d45040219aaf73d817a4f8af5dcb0b91fcf75d4 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzCr=m0kcv5P&u!!dO1K32=twp? z-q~L?LAsG~jgH3BulpxGd2YbWz;NLGvFr&mqbIq#?A-nPm5qV*McL_BPBJnaW&9q% V#l}*}JsoHogQu&X%Q~loCIEtsD0=_^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ea42dcb835a85ecaa072d4fdda37b6deec37f7a3 GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzKTj9Okcv5PFKpyJV8G!LsFT_w z-5|KBeyU?03tK_z>0FPA&-QaE&b1I^WMF8R-@CnWRn@he>i5Q<--+z7QoOCGsZ#pr iKKGi#&)FFmVuhbE@y0zBf4vWAGJ~h9pUXO@geCxLA}uHY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..09a2afe7ffacc4d08e544f0ed625d9a3278f79e6 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ08bakkcv5PFD&FeV8G)N=+5

UHx3vIVCg!0Gn7aD*ylh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..254a948543f3494a18c51b49577c6105dbac82a0 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJAWs*^kcv5PFCOGe9d>Iwx5(adc~@{Wgc9&pW7I3_iQW`%9=Fq$aB`J mk6)SAi@gy4^N5L|fjRlF@UDkf_Wc3sVDNPHb6Mw<&;$U7jWQen literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a0f0bf3cd782e2cc231ce4711326780cd6405f51 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJAWs*^kcv5PFK*;*NZ@D*^wE)g z$X59Olw%$X+lED(1-tDpzMrZht|!3A!0<1xT583r&w2A^9$#|6j`Jp;XJWNbef$E? msNe6VB4_yq^v5DaHc(evZa(wO%4?CAYUKspmmj#tDOw)i`JLOt tsJve1LuRAVHV0dqZ4R{u^~D$%VlFg^9ZI}{p1E3)c Mp00i_>zopr00sypYXATM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ef8ed318b5d3583bf41750582ef6160a1928074f GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzKTj9Okcv5PFBoz;C~`DBY+85W z8RMS+Gw(#%Is^;uX_9%Q``^5?t4ouSf#E^A<)t_8-i8=&mRy~+cW$H-dylKqr<3oC i{P`?&qwEMC-ZD7nbNZ}GCG8^)wnhJ4zO>q>{`d?z}LuF$Z*$* pVY+JxH)Bj^!HKp58W5A17z)|N4sra7UkbE^!PC{xWt~$(6996XE3E(k literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e04fec1a7adb08997ebb692da6388407237a8f9c GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJG*1`Dkcv5PFBoz)IPkb!6x0b` z7yGV$)5|Sq7~hy4a*J@C6W+GrH>ZM<(x>v^R7<66^K6ZytM1RyW@K;>dN=RfdkuDm z42Erw4Z5X7Cn(*F<1P4pIkb%>ruNGXR*!8uk2Z@72u_rZ=$DDRZ25v0Xd{ECtDnm{ Hr-UW|&#O1O literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f778f0e8caa51fd035e19d18878395f3daffb06a GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ2u~Nskcv6U2@p=4YY&7)78&qol`;+04Fmp_y7O^ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c8ac8a9188e05e1721b579592b17d0096d1b5da1 GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJNKY5Xkcv6U2@ox-G?V9g*SZ(Jj>YP)cTB1g17OafP|%D p!)c{mtqkiX6`W{0paC(6iJ>n_rfEi};7y<<44$rjF6*2UngH%GG6Vns literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3041d36349affc28b8361f6e07c60df60ffbb4ed GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzOHUWakcv5P&n*;WP!wQx&}fod z_kY&8#Ptp3?*(|64z4@pqjX7%fg$Ev`LR&b@Yu9}mP*GCsy7_3vH!=;ly>{p1E3)c Mp00i_>zopr00sypYXATM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f7bf191cd5695582228cdcd957c23ab23b44f6e8 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzXHOT$kcv5P&u!#wa1dZV=&H15 z%9~&7&)i%d&LGda*tZrkh&3X6ltktVtXFuOr%upfYzbRVPlj#B5 Y7Y{DBySxUcfW|R+y85}Sb4q9e0Cc%4&;S4c literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ef8ed318b5d3583bf41750582ef6160a1928074f GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzKTj9Okcv5PFBoz;C~`DBY+85W z8RMS+Gw(#%Is^;uX_9%Q``^5?t4ouSf#E^A<)t_8-i8=&mRy~+cW$H-dylKqr<3oC i{P`?&qwE$g2DDe_`qc<{b&>cb8TRnhYOZpCR~@Au6NXX^3L^8dDt rb;j0Bx(@FbUzd7u_dvQd1B1!k9?7sL-#U_jHZXX)`njxgN@xNAtKT#T literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..73194d0316dd37c416550c2555398a4663d6db69 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC{Gv1kcv6U2@MC-ZD7nbNZ}GCG8^)wnhJ4zO>q>{`d?z}LuF$Z*$* pVY+JxH)Bj^!HKp58W5A17z)|N4sra7UkbE^!PC{xWt~$(6996XE3E(k literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..49f87ec81e3ad5af7e77f1a1b4261cf181150d9a GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa8DP1>MPQN|w!Cae3Oxa4liF2E%^%R1pn3xi(w o3o)i0MF%JFHiEPt)R16hNUs+w`uX4dG|&nLPgg&ebxsLQ0QF8R4FCWD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4a2e33d1cec79628c58401228967d676bab8da4a GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz7f%<*kcv5P&n^^gVBlfC$b47O z%HjL`Wy~e~0U8EZ@0c4_a(YZs@vJY;Id!*|F-6Vzvsc5asN8w8KN-sj&fjS}U8O;~ Ytd%eI$N6*|*hIt%q%j z=P@-fZdjux`oQmdKI;Vst0LQyP0NaBrN`fR=j59+7=bF=RZ2s@>IH}DX3qY(OO1a{n(^ly-~RbP0l+XkKY*#Z8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..461ca8a00e4121df32da70c62c763df60bdd79da GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kcv5PFKpyJV8G!LIBAxk zM8n_Z9~pWa-iJ(#iQsb4`=6a5AkzUzyF`?VH?v`P2agoy%mXY0gF>F831O`u6KbLh*2~7ZE Cxj4)K literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fa9681675f88aa0c244c94839f79389717409d1b GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR8JSjkcv5PFK*;LV8FrRFlm;c zM8n_Zi4F3N_f{(H+#u3%C*oIjhQJ<&mX3~&7a}t)%f9V>S6}$eQk|jU{O7c13>UZx zLZy`#{fREuKd&2~AeWVP`c~{cE(8AXtEq4G)Rlw;D;eYzW#mJ5@_h$d$l&Sf=d#Wz Gp$Py|SUAD} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d22d725b23044120167a072bf864ab80a6dd3aa2 GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR8JSjkcv5PFKy&KV8G!LIBAxk zM8n_Z9~pWa-iJ(#iQsb4`=6a5FsH{AsJP3hc;1`pyZ;}}ac(GT==iZGKkZyc2J4Ph zy~#bFo)>-pbmtTI8t1b)(YsGaGhTbRYS-GkPZ<=HJ~0Rw$|%OT%r5|%!QkoY=d#Wz Gp$P!r?mhVc literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c1ecde35717f31acf44e1cb4eaa82e8476c94f38 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJG*1`Dkcv5PFKy&J;K0EeF!`3C z%z?kl3mfd4{x0Q;DHPznF7xO5jgC4OK_w+6E7!EXxwY$m$Iq#icrb^7!A@Ssn7tva zVf8Hu!Kd%bzJI#&iS^mSv~6qdK3&W3xga$5+PfkpCBcd8%+4~(sh>9P0NTjl>FVdQ I&MBb@0Dyiw+W-In literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ca017f3dfb784c95742e33b2f02edb8439dd5646 GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJbWaz@kcv5PFK^^L;K0EeF!`3C z%z?kl3mfd4{x0Q;DHPznF7xO5jgC4N*N%=3zlk%G)9=6jC!Q|Pme5el#PFkL;~5!- zD8_YJ$u3j=-@bdg__X+p_E|SKl}+EybmnkqY2@zHogFSNa&O{f)celcO#)iU;OXk; Jvd$@?2>>p-J^ugz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b233efefb5365ccf1bb24fb57cdb625f15e04064 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJTu&Frkcv5PCvW6EV8FrRndSC@ z;a#*U5a=9T;=D{A>hQJ=*hs+aN}$a=bSTp?_^s&U%yXFWuxwy#9ou)ncTvWpg Ppv4THu6{1-oD!M<8oNLT literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8bff06bbcfd5eec2274eef89d00d748576799785 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJdQTU}kcv5PuO8%WP~c&`us+=_ zf#KWyHb$#M`yY3gTe~ HDWM4fJTM|J literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cbebd909c04dd2ff345367839a5c7fd82e64cc60 GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzcTX3`kcv5P&l&O_aNuD%$ji@c z(DGruToa>26QfOIzK~{U*{sQHCZALAoU~;B?s-$v(@M<+4{92J{`ZBkVO7-f-?Ixn bg$}Sas){i8R)?hljb!k2^>bP0l+XkK{zfT= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8e6c3165b7fbc589773fe21e2c4ec4dcdb887bd6 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ5KkA!kcv5PFYM+#5WwN~aPpOM z7WRUcH}R=JYJy0nKI3YW=h-Yj53+kqQhAwvTqP#7+~vaEH?N{z&(bUKI~0F-ceRzY oL>Hon3(;)9>8$Y+kuIJ;m6HulIvC#Uo+plSUTao-k!Ch3dYO7 yer9;L?o7=Z?I?Q%Pr<_9?8!af{xUL5Dq)PiBe&B{&F}`$A_h-aKbLh*2~7YM;5E7c literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ea53b81a3c5e26e8c40e47f0bf71fb682e5d4562 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ6i*k&kcv5PFFEoaFyLSf*k&vw z(9rVJK9q@R9}CMFhwaPO*y{Xz@8l%>!&6XENompkQ)i~leEWLN;!QiQhhJSS^dM$q z&6jOD2l#>+8TMRz%Xr3z!RA`mOXZ%9ck#QcUvhMIykJXG*Y)<5dszvzkHOQ`&t;uc GLK6VWSUThY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4a2e33d1cec79628c58401228967d676bab8da4a GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz7f%<*kcv5P&n^^gVBlfC$b47O z%HjL`Wy~e~0U8EZ@0c4_a(YZs@vJY;Id!*|F-6Vzvsc5asN8w8KN-sj&fjS}U8O;~ Ytd%eI$Wmco8=kmHnyZg82 s8?0NLx2kbp1;@j}t#N)FiVOwJZ@H|h)K>W}13HSq)78&qol`;+0BCPWeE((^R$nv%g*ns*s6c#rJGvB sU9C@=SDg2nDS7A2z30~VGdHN%7Rd6lX3oDE1=Pmi>FVdQ&MBb@07!~7t^fc4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2fc23931127066210bd67f9251183155a5a0352a GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJL{AsTkcv5PFKy&)FyLW1z#dq| z!vElJ`X`Qe3%Q&Gk4AHe*7wf7e%y; z_BoFC9bE3bfAwyC@j2bt2a$GmH*I#ecXu!xV9hztpZG7c`V7!A22WQ%mvv4FO#snq BJfZ*q literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ac1569544dec83a4c0649d94f6b63a17f756dbdf GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kcv5PFKy&JV8Fw2z~5t~ zph?5``JT!v{I%K>V)h(RWcep$dOli$Q3(j-Z{J8ro0oI#%!_+-dG|fF=XN=ADW*K+ z(A6Tgzszg5{@!q>*6R43ORV#r{ylX(vNpzrg+Z^ri$A$fFYXc0HU>{uKbLh*2~7ZM CIOwsVf7Lr_pKP@sWtLH*e?>&%-|-oKeM_3S^}hTYSj zwOx@vVb;%)zhG-w&*quBujgpXKDZeZI^FcQh2X@F6TGZvpUXO@ GgeCyP>^sE( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fd2d3e93df5cd55e45388109d75c0bf565155df9 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ3{Mxwkcv5PFKy&J;K0FpVg7_m zf-(pGrWdjNULxdVaY)jq@I(A#(Rp1Q0)m1UwUi#cIpbaZT;S?6hJq0Ln#@njwlvzW zF>cts{n^q>ydmA^XWVO;nfo*BYGTc^t$YRgdP;{Qa{XLb7{q^^ms_uNdr~6MP6kg` KKbLh*2~7ZSs6G1t literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8cba3a1dcb672c4b16184ad8da4934867290b60b GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJWm(Lkcv5PFCFAOV8Fq8;r^w? z$|((R>?bQ%F?&#rt5 PXfuPStDnm{r-UW|rx83; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0555a85408e4f477285b4db91ee1c29e83800a9c GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJLQfaRkcv5PFBx(jFyLSfh_VR-~P1SiWxK{>_h%N3oemZjiEA!@kFP+cjYy(+gh5yssOi9@rJr{EO{ZRc>j` r-0-=p8|x}L9+uU8Vi$0#JI^UvXsU4c?W9#eCoy=s`njxgN@xNA6JSax literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..999d333ab8435e12d73dd3a080706d31c840719a GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz3r`ovkcv5P&l(CcDDW^l6a;hr zm@g2-DSF_X;YNcG_Rl7HXEPi~{+kvOT72H<^Nrq)!q1Ehf07xU)7hEso%?+bXa<9) LtDnm{r-UW|wwffO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2e0e54fd48677b06ddfc0068cd36f7e8a510e6ce GIT binary patch literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzLr)jSkcv5P&n*;WP~c%XctO-? zse6!^nG{P?Z26;fJ0=E(hU3RxZdeue{>+^38@d6nq{lA3#ggF)78&qol`;+ E0IZ83vH$=8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..83730172400d309d5545a0875159cb802d13e457 GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJFi#i9kcv5PFKpy(aNuxzxV(D9 zQPFAUR!ge`?uv=29Sf71{k?R;2X+R}Nh+SdZeEi-b*8w-G1PYNReIYxw!iA-W0fFIL2t_B?N%p zyKBzthlm0wz%9VcAR-WvkbuS8_?`P&>;9{jkbfM*4lt0G<}B9$0000FW6Otj%~{FRL;^+m8vT_Fvvinbc?R-mO}def@4%$J>|dONAbIvq-S7 s(3&~(%$v}LK+dI`JHA&2IXFz>YyT>k^jLhwEucOIPgg&ebxsLQ0Iy9p`Tzg` literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dae9d037d5744b84aa380ad29d427ccfd1795b60 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7*7|+kcv5PFE8XhV8G)Nxc!yX zcK3zu=4a&E&)7OdItD(O60-NW%*ku&hQfk^f)n+-It)LXJ$~U9a#f-7{LGuXHkUKs yTg1S+h1o-jfq8?-hEnnQ|L@&Bzf|bwTJES_VvV-54POK8VeoYIb6Mw<&;$VQ>oz9< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5f2a0244b064c53a91816e1e8314861a1c7dfa6e GIT binary patch literal 182 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJT2B|pkcv5PukGeMV8Fw2!Q11d z=$6**DRQw(zXv?M$Gn95$>k?99F5gW9iQ<`6Hri6lAk?8seHXSMkd&>;+-u6{1-oD!MmdKI;Vst01`zbAOHXW literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fcf83be5da1ea3e8629e34c24aad7be6e430a472 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzM^6{Wkcv5P&u!#nP!Mpwm@$`C z=E6#u3#@qz(%QS3AI|!}%3+7H5Kv{nnpA$Jq`MaLvb-m~o%!?nX68C=c?Jgd-N#wk U{MsFU1C=m%y85}Sb4q9e0NN%cVgLXD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..784b99fa4413c4a75eb96c7fe224469490098b91 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzdrud~kcv5P&u!#oP~c&9bbiY! zF=3^I0e1?6l-4efl0Tu-*0@XqD*UiJ%=W~Y(nmX1O;EYL`P2Gv_C3cK7;gAY5%_F9LQ&x!p?Aj@tzYa V*N+?Ghkh0SoEZv^Jn(YVu zM8nMs)|HHG1yj{zC#s77%NG2g;5o^!JXG9hGc)rJ`^Ag`g8onAR<|gQu&X%Q~loCIDLBDct}7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..424abde3748fdcc8fd1fe8e33df08cb934a5ad5a GIT binary patch literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz7f%<*kcv5P&u!#nP~dU7c=?xD zfy4452k{dOW?^NFif8LX6;x_C85l&eZ#H*Cl*^pY@}Bf|=FjV!8TSi1Ffcx4WGGmdKI;Vst0QM3k1^@s6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d2de15aab73cdd85d179ead529644ff4f3af70a5 GIT binary patch literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzXHOT$kcv5P&u!!dO1NCS{7bCB zVR?~*SOSBzwzZJ;|J5EGPrMl#?r(kNn6}QiFI#j{N_E)3uUQAOSp*yy7+Dw&uzlOk VDsjd4`DdVU44$rjF6*2UngC_hC&&N* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b49dca12ac25628212f645dc02d1c5b73aeba5e0 GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzOHUWakcv5P&n@IVU?9M9ko!Md zOu{O!#=HmI2If8v4e1ZO)MJ?#80>f7>)G|&(`cK`>R12jI3JjB&w0tpl${fO8)yiF Mr>mdKI;Vst0Q;XLk^lez literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7a92e7c4970b2df27224071cb359fb1c53932948 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzYfl%)kcv5P&u!#oP!Mnm+>*w~ zUZTamhc%C(+FHNtU-%@42|#5Zc86)EKAU9HXOVOM_S!g028N1EX5F={EO{;h(}3~} Mp00i_>zopr0F*w~ zUZTZb(kOl4-ns6RrvIm^2&e$niDb_Va?$a8+_nAf&s|rI+3U3I85k_~r?9fkY?adm PDq!$*^>bP0l+XkK89yS7 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9ada238c7323fdfd5a7f856685db6c880cd95ce7 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz8&4O*w~ zUZTamhc%C(+FHNtU-%@42|#6a*R__OiJ5dvu>Ec2?yK7DagP`n5}1Q@SULV*iun&z Oz~JfX=d#Wzp$P!mVIu7S literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9d80bfc661ceb7e66c9e90e235ef886315c67ed8 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzdrud~kcv5P&u!#oP~c&9bbiY! zF=3^|1Xd#kTUo)NS^JHG)=USg>)LuI*hRRm6ej!zf&F?Rm6ej!zf&F?q_w}CK^ViqTgI0)z4*}Q$iB}6qX>$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1727ff5943bd19446509ea80c28729796908c152 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzdrud~kcv5P&u!#oP~c&9bbiY! zF=3^I0e1>Rm6ej!zf&F? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3974e82cdfa8fcf29821cdf9656cd436fbcb148f GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzCr=m0kcv5P&utV0N;n7JX=ao- z_*dIKp@AnU)!q4F=EwM%GVW)9Dj691d*3;x>6PnSdx{Bue$`;S=+y4>A6t24lDL@z SI(@7`N<3ZtT-G@yGywqp-6fU) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c00df70a5990d540ff77473c40de1250479f6286 GIT binary patch literal 141 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ5KkA!kcv5PFKpyJV8G#W(fgJ3 z5#@^ir<4sClnorjHYi_oJyoyD!J^IxRD9rm?A^vyQM-4&jSM~g?aiCryV+BoecTZI o-q)JZv#TSQE4k;|_a80ni^@eAA8FM|0JSi9y85}Sb4q9e04UrtrT_o{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..33d921d8f2a282d0925fed864fe1b8c20f325be8 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJd`}n0kcv5PFCFAOpuod=;r^v$ zw*m(D7ys1V3mSSRFji@`E^=~m*8eZ-dqkec!36~DZ`+*R`#sDn^4kinthMQ04c06S zJxvwz{DzywR-ToKZxxt$;mPjrO{@6MpIvh{OZ%NH!#vvx@Bj6u3K%78)cmfwRv!gg O&EV8iwuAh>T@6Nw({Z!_5qp`k}p<-U;ku$Gyo^h5l%n;B0{r@tb Z`LsT#hZnCU{sp>$!PC{xWt~$(699+0M5q7& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..61fd62c4dbe566cd2a7df8fcbc530cbfbdcb60ea GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJYEKu(kcv5PFCFAOpuod=;r^v$ zw*m(Dg8!41EgalVFxZOZOLc^JJ=~woRQHwH#l_{zM&(U+qE>6Fmb-^eEY^!=`Xaz! zz$Ii`(>e3%)SG9%hH(f+?)oVi`R@Gt)=y<_HyFzrWPgOSH$0!|erC*;znmFnGH9xvXRxE6hI&9%+8S6O!do^0e0%$DY>$^54F{;7tW rhR?(pc7{tYG)}n2f9v({>E>@d`LlMp|Jt2*&xj9d-8G(wfxl(=@~fy48wq~ z>#!^fLU;Qt>vl;B1)}y(L90mDb$jB zJdR^xW-n{4%AcmLpuX4gE=pVPKjm*Yod2jY_<62HDgvIZ*8yt)0000Ru- z4xR%X@9JNHD4qu=k7W7i7=C1t=qKh~wHEDYuO$2ZU9)mIP{WXRb&NhDQ$dx9F!Rt8U3 KKbLh*2~7aIAUvi3 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..149f77ad9aa36ae9e8f72b40677126122130dc78 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ98VX=kcv5Pubky=>PGC zppk=H!T(_Q7YwqB%oRd^95*}N@ds|cF zHi-W@G{pUd@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..78ebfcc3a44c89ba50ea42dd6d0406eff9e994aa GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJbWaz@kcv5PuWaOPFc4sNXqGt4 zoWk;Ly~IQI4+h7W~@Ey|9;jSMh~Y; zE1zv(tN5IdUoz|0{rIczJXks(eCAl=%93+BqrPlffC~%58q<#o#}A}hRsgMJ@O1Ta JS?83{1OPyZI}HE; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4f392a2288b20f85e6c9a9a667202155b2848de3 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJEKe85kcv5PukPh-aNuBluzX_* z3tIxq_w_Q3j1rBEYrg8dyO7~?FMQI6$$OX@Iy&skLT4Ej?_Sk?!pbUpoy>PA& zv0LT5mwJZIZe8{39%H%KJVPe80~}ua85r*T{lI@F=Lf%lAmaf(Z*OJQt^o6sKwB9+ MUHx3vIVCg!0OV3RfdBvi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2f666c7167c411b134fb06b54ef669402333e555 GIT binary patch literal 613 zcmV-r0-F7aP)HG%{H7=bCkx~|gB9xxT)YoRi1 z2+)T)s;bfoa8&?co@W52AApx9E|&`cAdchu@p#BMj>8K0YVFFx^(>JQLe$)>1XnjX zOQ4j}FNdV0Qs`h&q?L%G$V-Hi(FAPix$Ie%>HECJ$OlA%2=JD)-#ML5#+uiJq=L)2 zgiy(-900Tz2-oX%s{pWVJ-}?gEX%Mg%jTSS%I$VT(=F0tyii@JqGXMbY z_j`C0`&z~ZxjIRb4WVh8P!xsn{Fgmo!ydi!JZrW1F$CW@HV7!Cq;0HaS@=%e`0&SA+R?MfASw;gQKJQAK$?z2E<1?haeRB00000NkvXXu0mjfjMy4> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d21380861701d8d2a0e83b9de8315b0b1e723f30 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzHBT4Ekcv5P&pGlkFmSLa{8l$U sbaZ2L@n>ev6-*2d947sob&p)HCzP)c$+Py+*lr>mdKI;Vst04iP?%m4rY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..76a636e060da04a97f24b51ddf3f1e5679627525 GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzGfx-Ckcv5P&l&PEC@V>{f>&SaUjdo9oe22WQ% Jmvv4FO#rN literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7fd7135d5d4c9a8d046626ea6bb3e1cd46a2edd8 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzD^C~4kcv6U2@l^+6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2eb3c64ca9ed40942554c4bc7a090ddee77041ec GIT binary patch literal 281 zcmV+!0p|XRP)(%UG>Rn>q;L3%B@6izfhGL6 ffLcI?VHgSzuN_L3zE32b00000NkvXXu0mjf?Wb+b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2225e4de48d7f2bc7de750ead13a5a0fbeb71b9c GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*GF@n$XRo$d2wq6@h})O zSQiVn_KQwh_I5Q;0b@y!UoeBivm0qZPLQXIV~EDYpvgFHoM%C811?lZG&F4^MS=wqtEy5^_pI2lga3eaBO;lo z5{v8zP?ZV+n+m9#3gv<0*qYcSZIjA*xQ^qQxhxt~((xl<(RPu$o4NOV=R4p1?zvYO zSJS-6p}f%ShXf7@yz~V02~Fw~n*6`u`-v6h`hY&6NdmxwC*Q_cS{yj>TfnW#@g)_| zCp2k{rNw`fA5;lrEG5qksREJK`ra$vH6e@)(s(m^@g*?i*b){L`_g zl?Ey&2dJrt7y{kUBt9@&sw+|KD59oRx_{`BXFF^NRVQ6m0ew!BBzG%Vtqug>3fLU& zwU9NEpJ$5uQm`xmqdzSO?GkCO4s`j-CADRsm59&7n_>9ibPa^ywb}vsQ7j}sO>~wt zVR;3ncU@ZtYC^3_AUZx->>llFi=FgiC&mn_kn3mde^}< zRL4$g2eqIkBhg4WIzDNaS|6GVN~ubeoPw;CG`(KW)>rEc4m2w=7Umsq~OjgSPu&Tw6|;#2kIJ& zwEpQLJ@=SpbNNnYEdxBoaOe{HD=2%eX|lP|55S2I7rEFDfkY0^svsiXaO|b+vq`*@ z6sF1N^{qbYx;(_cv*>-_#f)l`+5mIa%4MRN?+dxYo><2ggnv9HUu{rWNo;d!pn=%z zCfgUFZ{AI^01`mL;`yaLN_>_M$zp3QOZ|TCezDBpU?XAg7B}+(<-KM?qdjfW@yYwo zlHa31@P3Cx!rzZ%yT4B*HoJ-Z(8Jpo!rb$Fi4QM{#o;A^cQ1&Z)#TTjNh0W_aCe2` zDBQlCW!nVZCpdLygZT9P%H=DU9BwXY!l6{B%&sVmwAqLTm8t7_IzH(p`+N4cKZ3E- z&#v!G>C$!2g|em4eMGWsf|(OoYX$6po8~T?heu2jP0nWK@PNLq$&8`UAF!F4cio)2 zo=2P!WKtP6y_*pSTOgS6p>8R}FDAr}Zlfq*trd9pgo-c)YYQ%{2c?gp6*YWchFZY}9kia2<=P~{P077?ZOWUDj P00000NkvXXu0mjfb4ThI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a03a31182b1513f9953168253a5405d9b45b6989 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*GF@nsCjYAS#vTNGguc3 zY6bDM_KWJ?I^qjdz*rLG7tG-B>_!@pQ|jsB7@{%pXx~BJ1_d5h?}NLiv2yg5v+kX| zqp|P7KkE+hEwT=?O)}#y{kJ=CKiTAfC*%Fq{9z0`Jp`sJ9GnsIOwg3Wts=MR-ahGd z2~j8BzVG^c)~QtX#}x+tuTQ>2Xax7aKHarziQ>F+&qve59XlS)e0X>#!wD6RU)!?g RRskKr;OXk;vd$@?2>_0~QdR%} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4fd0fb182a650be23ffd3725b3a54266f7e58d61 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{*GF@n@Eb7jXfP-wGZ@Wg z5Rwynf2++5D9cz9tTn2}pFPJy7aWd(fe$ASKb1*0zFUmhKBCJ&A1#b{=NYNa#^HpuxfPBGF(0 a14C+}(2A#<4`l-lXYh3Ob6Mw<&;$V33NwBH literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d4c3f4353f1b5f6fad3c319b473f51e1da1f563f GIT binary patch literal 823 zcmV-71IYY|P)%Ljs*bq6x6+S>BxQe!u(ObCZh}JH2p{g-_Hy z0gwPl03-ks00{s9ppSC%60Qg%5m7~7Ln;$TB2R5@;lBWE0~VvJdVcX=%**tp1wVgJ z%>aN5n5lWzcnb5_Lz2ms{+oOR+$FSq%x2-L0$Gv?Swp{XVMq&0RW&~tzrl*GbVMx zsQp5ED)$yfy1OT8bj70hTk5-8QNOodPnys5d zdv*7{mXT;ya=W!H{Vrngb*g&grLZyN{PU#Op~5;o1C$hB7#frMX_4N6&N=RVRkWzt~AJn9cK5c zb=ZuUt<`%dW2;40$yM=UH2Ku;R(NsU(co&^v)t1RcGjm&@W|R<0S@Y2a(!%>au4hXxN+^QjU?_QOtvFz&68oNd{c0j6wEI=04+OL zX&(>DQzyJMzj3kfZjG#weU)3x0Y7Wlt|0P0EZaweva!JrKzFN);?z1#S`p7zK};Nx zl{uErLOVGp41-&>%|5obc}R_$?7!q9p;}~?!T4$xbMf2*y{K=>6_sDI=%c-Icb!6B zE7RLm$JF!+<$mZ$x|!2K0!Wy>klv)k&4q~EXs#jM>F4$BEQb#_5cRI|xFk@{HWC?Z z-xVJo`BVwNNrCXER*8g<-(-uwLuG1u1$o)SvHmC@{9aP$(_;2~THxJWBvc5>yFmjj z>_vZ_XJZg1CkvDf2>ArPua-&OPv);(zp7RO*c1Th%j}Vbyu!dP3sI*sHc_JW#y$!! z3eR7Lr;b*}@5zLu>w^nrRbgMfBx`_C6qt)TR+F2?Hj6Ly23lajHb1r*2rUI=ZeF3Y z$zm+&dOS8!LL3+5GC5YfD=`}_5YG8fR~1qhHL)JDP!up1bxwDy2t%+qZ+{y2iU=u73)SUOjL%v|ZX$%JRQW9D%=w*9zd17+QMgg$ zX@>GtyY~Qk06l;nz%vIBxgC<>ug=Q<6u@8bN&lAbM53*+7NQ}Dd=ZjwuLVz3b1Xo? zUleSgL<%f}CTGqWNUP-QWa~sV)+Z(Xai1gzc#jvlcKxb45FaACT4gKT!Z&VZMw^mC z7fgLuC!k3_2<64mx~>lV)!YSYRy`IVwzS-eEKUw5E@%|$l26h)qtm0PR+Z9o8s8Q> zw-Vj{1OB*AI(ES_=c1W!qBhixXe=6zEiId!_6P3=q*NtJO+lWLc%JX0`q3`4({9$n zb*$ljW)^2I0GZg*^5Z}2x*mZxuhCrDqgJVL#$&@W&=*X8m^5(FW@9iFkjf(kTV27} zY5*`YP$dJn`dbYBY@vAnF`N44YH6ng{H@XEOYoO~oVe+e-hK^$^J5lji6(>D8uo2L zRJ_nO-KNtd`|^g+b>8b6a^ecv$$VyT?oA6x)g-?M`nFLk#Y&$yYK=p+ZATFP@~j+n zE0nVbT%2~3Slj2|GEAmyY&1XuNLYU(cgTr%i$U2MIz?_uWD?a(L zPbV92(70EowFr0bRyfeX?-X2I-6IoEm9JgD+BVG{hj1=GE-Ph)g<%unR#~}KXY8E_ zl^-iV{1iyMcy#}G-Y+c=EGSil$Z5%@4th;s>@+Y3ZFoZ_Tc>rhp5pP>(7)@GrGmoL zpvg+ga%bgM9dSue%9q%8>_^*Zfk4TLT2;tg$%>}mL{Y%lY4FN<6`>1u(iV*0I$y)K zRr~jL47bUyM`Clz*8xb|FupO+%X&wVJ{zR2WCg(Ok-SJ=`eQzBOmB$HLRLt-MBVKC zmb6_%!)st_CUH+e@G4B)^vU!>w#~YK#;4Kr6Z7kHxvu%H57GY>&(?pS2haofH}N}P WDo4kV1T@kB0000s%{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2eb3c64ca9ed40942554c4bc7a090ddee77041ec GIT binary patch literal 281 zcmV+!0p|XRP)(%UG>Rn>q;L3%B@6izfhGL6 ffLcI?VHgSzuN_L3zE32b00000NkvXXu0mjf?Wb+b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..76e9cde0155be8d241e38116270e65134e5e813c GIT binary patch literal 417 zcmV;S0bc%zP)CezFs7absu3e`}lPYyclh078Kd=aHWY8CckYZDaJx$Ia ztsbQY#Bs~&W_ET@0#>XTfSd}E-!G9Y0CD}sd_AI0bBLpfFL@yiwjT^23O4@SgaBKmg%rDneKTYuimq_ zV%Pz;m{%pPn=Y=z;mq`4*nzMbCf?q*vG1Qr0|*Q`z&7_)HIW<`a}9M47P$Ki+rJ?E z+J(0w&t$3?^Y7S$$+ayroUnZd7uC00000 LNkvXXu0mjfMzyyH literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..005accc4bf52ececaabb5ffb07dde55937ae4974 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*8>L*FnBmI=;<(IMlp2f zGeicmED2{wj4W9Q<2H+wsk!Rk!@cguVN6zArS~_+h$!e%(KfugiICEoxbVS)*8>L*Fr-B>80#`b2QbWR zXV`c~)7O?^W(Y%SqD=3Gz)U i2NXD%Jod@2ikE$wbK1~ebpsti#$CM3)tN!c`x&(;63wp=o9k;fn{uX5t z(>d?mAI*vA5(qQz&Ok>ybO*g-vL>%(24W(*+`8xBq^c@~BndGjdyQsv21>TVTZ5J8 s{{kVV*VmfvHq;v^O$>Sq0095Z6U{+9luu3@8~^|S07*qoM6N<$f}xXRt^fc4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1712791a9350df86d0f0b9fd5f21d654d38b66ab GIT binary patch literal 338 zcmV-Y0j>UtP)#2eV!dk1@NKyOD$tBK8Tp#uXbEQ`%c_G?IH zC;R_1v%3I+Kp^m6V3CtWP5^*S*ssZE}R+lWSA9s+5=ruYRAg+a0|;M@B~Q z+SH~Ttjbdy80&zLC9G#$R?S#E@4m+EA<{z934JqWJVeefVNF-KYj7gY|AHEQBjRZG k7^WN0CT1MIKp+qh9@)!mljwPIQvd(}07*qoM6N<$f+Yr&BLDyZ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2eb3c64ca9ed40942554c4bc7a090ddee77041ec GIT binary patch literal 281 zcmV+!0p|XRP)(%UG>Rn>q;L3%B@6izfhGL6 ffLcI?VHgSzuN_L3zE32b00000NkvXXu0mjf?Wb+b literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2225e4de48d7f2bc7de750ead13a5a0fbeb71b9c GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*GF@n$XRo$d2wq6@h})O zSQiVn_KQwh_I5Q;0b@y!UoeBivm0qZPLQXIV~EDYoHn z>>0*BkW6?SFyrY~;#KHQNCC16#f1n5=4vC6e_8hA5ZrQQ4m=mhbV~8X8m2XKwI55A z#Ge*mK5RHpTo7^{^Jej{%l3S=@Sb-U3Q7QkT8GudXUS3%O>7PMPyrf3l9Zs7uug!^ zOq1&sHir%%KZY~=IZsC{b>iUyghaz7dm>`y&@BkL5=gTp_W&LHhW!6taVhc+Xp8kK z#7^xCaoRI?kar->Mia~B_e)g+Le2qg^S!Jp$>GQtCSN+BdiFKSz6I%RmrlimuN6}! zKtq#DSxz`n{67$(C!sq>UME0{IMI9!4Gj%~KU{`)vGL)yivR!s07*qoM6N<$f*sMX AJpcdz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..33a963642124493273fd8a16516315fceb261a19 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*8>L*$a*jc>M&YObf#UR=@ik`MJS@~=D1enw7w(uRe%p8y@l;OXk;vd$@?2>|rNUFiS- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..be4ded4a35a330327ef1d60dc90c1ac3ad659e21 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)*8>L*Fr+as7&9Z@rCWTY}2+{eEYsEn~B$S;_|;n@wKGKN4;7sn8diOC5PJ`Nl#ECMxZlLZtE zoHz`2H8m)2a?lW1z|oS(F=hH9u9osCi#bCUaJGbP0rIAlFW{as{ZTplt_JQ2@=YoS h6gZeX_R01zFz`D{?c(F!G#6+%gQu&X%Q~loCIBcEG-Ut) literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..17f94c835b0d31cf6089215f22317e218ad4de8f GIT binary patch literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzH%}MGkcv5PFCOG=Fc4rq$ojN0 z_L5)J0`smD#+NQKPv<}7$GA4JT(8{ zw(!rkJKWz-TVvro{T-W%y4Q-r0Q0%q850*v&gOUEP;6njP#PF3{&()81np^tzJK1G z@?uw0D=bdmw#wUd3j4RR52XyUj*U(WE+$K^KUDT8^7=j5=J*e#3fHyHKYsZ5L#~KM z(A@3T0StTA-EVH!KFzh&PeoWf<4Vu@hE)AM<`y0QMNPUSFPnax!I+(NDc*tOXTF`L XyQX0(PYAxKtkbt zAiNDMgrfPb+VXb>?80$lJOXozwAa9I!doU9QrI^zqPn|cA{mi!qa7zr94BBS-imrQ z^MO^PC*DAXL%4T{VisQ38d8YL91r+R}LUExw1y3Y8@6 z&A9LoxnIJ{T6k^nB<_Df#omZ`O}x#3HF4qabvm6+;S&MXOyLAH literal 0 HcmV?d00001