From 906edc592d1904cf2a05afc89d538095b394c9ba Mon Sep 17 00:00:00 2001 From: Visne <39844191+Visne@users.noreply.github.com> Date: Sun, 14 Aug 2022 07:20:31 +0200 Subject: [PATCH] Fix/improve smokeables (#10497) --- .../Smokeables/Cigarettes/joints.yml | 8 +- .../Smokeables/Cigarettes/rolling_paper.yml | 22 ++- .../Objects/Specific/Hydroponics/leaves.yml | 4 +- .../Recipes/Crafting/Graphs/smokeables.yml | 57 +----- .../Recipes/Crafting/smokeables.yml | 8 +- .../Prototypes/Stacks/consumable_stacks.yml | 8 +- .../Cannabis/blunt.rsi/burnt-icon.png | Bin 0 -> 210 bytes .../Cannabis/blunt.rsi/lit-equipped-MASK.png | Bin 0 -> 332 bytes .../Cannabis/blunt.rsi/lit-icon.png | Bin 0 -> 1011 bytes .../Cannabis/blunt.rsi/lit-inhand-left.png | Bin 0 -> 729 bytes .../Cannabis/blunt.rsi/lit-inhand-right.png | Bin 0 -> 564 bytes .../Smokeables/Cannabis/blunt.rsi/meta.json | 182 ++++++++++++++++++ .../blunt.rsi/unlit-equipped-MASK.png | Bin 0 -> 149 bytes .../Cannabis/blunt.rsi/unlit-icon.png | Bin 0 -> 592 bytes .../Cannabis/blunt.rsi/unlit-inhand-left.png | Bin 0 -> 147 bytes .../Cannabis/blunt.rsi/unlit-inhand-right.png | Bin 0 -> 151 bytes .../joint.rsi}/burnt-icon.png | Bin .../joint.rsi}/lit-equipped-MASK.png | Bin .../joint.rsi}/lit-icon.png | Bin .../joint.rsi}/lit-inhand-left.png | Bin .../joint.rsi}/lit-inhand-right.png | Bin .../joint.rsi}/meta.json | 2 +- .../joint.rsi/unlit-equipped-MASK.png | Bin 0 -> 527 bytes .../joint.rsi}/unlit-icon.png | Bin .../joint.rsi}/unlit-inhand-left.png | Bin .../joint.rsi}/unlit-inhand-right.png | Bin .../blunt.rsi/unlit-equipped-MASK.png | Bin 244 -> 0 bytes .../backpack0.png | Bin .../backpack15.png | Bin .../backpack60.png | Bin .../backpackmob-10.png | Bin .../backpackmob100.png | Bin .../backpackmob50.png | Bin .../beaker0.png | Bin .../beaker10.png | Bin .../beaker25.png | Bin .../beaker50.png | Bin .../beaker75.png | Bin .../beaker80.png | Bin .../beaker90.png | Bin .../beakergold0.png | Bin .../beakergold10.png | Bin .../beakergold25.png | Bin .../beakergold50.png | Bin .../beakergold75.png | Bin .../beakergold80.png | Bin .../beakergold90.png | Bin .../beakerlarge0.png | Bin .../beakerlarge10.png | Bin .../beakerlarge25.png | Bin .../beakerlarge50.png | Bin .../beakerlarge75.png | Bin .../beakerlarge80.png | Bin .../beakerlarge90.png | Bin .../bloodpack10.png | Bin .../bloodpack100.png | Bin .../bloodpack20.png | Bin .../bloodpack30.png | Bin .../bloodpack40.png | Bin .../bloodpack50.png | Bin .../bloodpack60.png | Bin .../bloodpack70.png | Bin .../bloodpack80.png | Bin .../bloodpack90.png | Bin .../bottle0.png | Bin .../bottle10.png | Bin .../bottle30.png | Bin .../bottle50.png | Bin .../bottle70.png | Bin .../chempack10.png | Bin .../chempack100.png | Bin .../chempack20.png | Bin .../chempack30.png | Bin .../chempack40.png | Bin .../chempack50.png | Bin .../chempack60.png | Bin .../chempack70.png | Bin .../chempack80.png | Bin .../chempack90.png | Bin .../dropper.png | Bin .../emptycondiment0.png | Bin .../emptycondiment10.png | Bin .../emptycondiment100.png | Bin .../emptycondiment25.png | Bin .../emptycondiment50.png | Bin .../emptycondiment75.png | Bin .../glassbottle0.png | Bin .../glassbottle10.png | Bin .../glassbottle20.png | Bin .../glassbottle30.png | Bin .../glassbottle40.png | Bin .../glassbottle50.png | Bin .../glassbottle60.png | Bin .../glassbottle70.png | Bin .../glassbottle80.png | Bin .../glassbottle90.png | Bin .../glassbottlesmall0.png | Bin .../glassbottlesmall10.png | Bin .../glassbottlesmall20.png | Bin .../glassbottlesmall30.png | Bin .../glassbottlesmall40.png | Bin .../glassbottlesmall50.png | Bin .../glassbottlesmall60.png | Bin .../glassbottlesmall70.png | Bin .../glassbottlesmall80.png | Bin .../glassbottlesmall90.png | Bin .../largebottle0.png | Bin .../largebottle10.png | Bin .../largebottle25.png | Bin .../largebottle50.png | Bin .../largebottle75.png | Bin .../largebottle80.png | Bin .../largebottle90.png | Bin .../maunafilling25.png | Bin .../meta.json | 0 .../pill.png | Bin .../powderpile.png | Bin .../smallbottle-10.png | Bin .../smallbottle10.png | Bin .../smallbottle25.png | Bin .../smallbottle50.png | Bin .../smallbottle75.png | Bin .../smallbottle80.png | Bin .../smallbottle90.png | Bin .../splashed.png | Bin .../syringe1.png | Bin .../syringe10.png | Bin .../syringe15.png | Bin .../syringe5.png | Bin 129 files changed, 228 insertions(+), 63 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/burnt-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-inhand-right.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/meta.json create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-equipped-MASK.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-icon.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-inhand-right.png rename Resources/Textures/Objects/Consumable/Smokeables/{Cigarettes/blunt.rsi => Cannabis/joint.rsi}/burnt-icon.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/{Cigarettes/blunt.rsi => Cannabis/joint.rsi}/lit-equipped-MASK.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/{Cigarettes/blunt.rsi => Cannabis/joint.rsi}/lit-icon.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/{Cigarettes/blunt.rsi => Cannabis/joint.rsi}/lit-inhand-left.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/{Cigarettes/blunt.rsi => Cannabis/joint.rsi}/lit-inhand-right.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/{Cigarettes/blunt.rsi => Cannabis/joint.rsi}/meta.json (99%) create mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-equipped-MASK.png rename Resources/Textures/Objects/Consumable/Smokeables/{Cigarettes/blunt.rsi => Cannabis/joint.rsi}/unlit-icon.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/{Cigarettes/blunt.rsi => Cannabis/joint.rsi}/unlit-inhand-left.png (100%) rename Resources/Textures/Objects/Consumable/Smokeables/{Cigarettes/blunt.rsi => Cannabis/joint.rsi}/unlit-inhand-right.png (100%) delete mode 100644 Resources/Textures/Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-equipped-MASK.png rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/backpack0.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/backpack15.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/backpack60.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/backpackmob-10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/backpackmob100.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/backpackmob50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beaker0.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beaker10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beaker25.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beaker50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beaker75.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beaker80.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beaker90.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakergold0.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakergold10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakergold25.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakergold50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakergold75.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakergold80.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakergold90.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakerlarge0.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakerlarge10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakerlarge25.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakerlarge50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakerlarge75.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakerlarge80.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/beakerlarge90.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bloodpack10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bloodpack100.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bloodpack20.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bloodpack30.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bloodpack40.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bloodpack50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bloodpack60.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bloodpack70.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bloodpack80.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bloodpack90.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bottle0.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bottle10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bottle30.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bottle50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/bottle70.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/chempack10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/chempack100.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/chempack20.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/chempack30.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/chempack40.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/chempack50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/chempack60.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/chempack70.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/chempack80.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/chempack90.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/dropper.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/emptycondiment0.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/emptycondiment10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/emptycondiment100.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/emptycondiment25.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/emptycondiment50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/emptycondiment75.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottle0.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottle10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottle20.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottle30.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottle40.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottle50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottle60.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottle70.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottle80.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottle90.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottlesmall0.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottlesmall10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottlesmall20.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottlesmall30.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottlesmall40.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottlesmall50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottlesmall60.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottlesmall70.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottlesmall80.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/glassbottlesmall90.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/largebottle0.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/largebottle10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/largebottle25.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/largebottle50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/largebottle75.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/largebottle80.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/largebottle90.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/maunafilling25.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/meta.json (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/pill.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/powderpile.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/smallbottle-10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/smallbottle10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/smallbottle25.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/smallbottle50.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/smallbottle75.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/smallbottle80.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/smallbottle90.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/splashed.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/syringe1.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/syringe10.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/syringe15.png (100%) rename Resources/Textures/Objects/Misc/{reageant_fillings.rsi => reagent_fillings.rsi}/syringe5.png (100%) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml index fa3442c6db..0e4a78bca0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/joints.yml @@ -5,7 +5,7 @@ description: A roll of dried plant matter wrapped in thin paper. components: - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi + sprite: Objects/Consumable/Smokeables/Cannabis/joint.rsi netsync: false state: unlit-icon - type: Tag @@ -15,7 +15,7 @@ - type: Recyclable - type: SpaceGarbage - type: Clothing - sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi + sprite: Objects/Consumable/Smokeables/Cannabis/joint.rsi slots: [ mask ] equippedPrefix: unlit - type: Item @@ -38,7 +38,7 @@ description: A roll of dried plant matter wrapped in a dried tobacco leaf. components: - type: Sprite - sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi + sprite: Objects/Consumable/Smokeables/Cannabis/blunt.rsi netsync: false state: unlit-icon - type: Tag @@ -48,7 +48,7 @@ - type: Recyclable - type: SpaceGarbage - type: Clothing - sprite: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi + sprite: Objects/Consumable/Smokeables/Cannabis/blunt.rsi slots: [ mask ] equippedPrefix: unlit - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml index d3bcbeea75..8c1414892d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/rolling_paper.yml @@ -43,12 +43,13 @@ id: PaperRolling name: rolling paper description: A thin piece of paper used to make fine smokeables. + suffix: Full parent: BaseItem components: - type: Stack stackType: PaperRolling max: 5 - count: 1 + count: 5 - type: Sprite sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi state: cigpaper @@ -62,16 +63,25 @@ - type: Recyclable - type: SpaceGarbage +- type: entity + id: PaperRolling1 + suffix: Single + parent: PaperRolling + components: + - type: Stack + count: 1 + - type: entity id: CigaretteFilter name: cigarette filter description: A strip of firm paper used as a filter for handmade cigarettes. + suffix: Full parent: BaseItem components: - type: Stack stackType: CigaretteFilter max: 5 - count: 1 + count: 5 - type: Sprite sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi state: cigfilter @@ -83,3 +93,11 @@ - CigFilter - Trash - type: Recyclable + +- type: entity + id: CigaretteFilter1 + suffix: Single + parent: CigaretteFilter + components: + - type: Stack + count: 1 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml index 7a006081bb..a8f323ce49 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -55,7 +55,7 @@ - ReagentId: THC Quantity: 10 - type: Sprite - sprite: Objects/Misc/reageant_fillings.rsi + sprite: Objects/Misc/reagent_fillings.rsi state: powderpile color: darkgreen - type: Construction @@ -110,7 +110,7 @@ - ReagentId: Nicotine Quantity: 10 - type: Sprite - sprite: Objects/Misc/reageant_fillings.rsi + sprite: Objects/Misc/reagent_fillings.rsi state: powderpile color: brown - type: Construction diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml index 61582d3000..00900a95ef 100644 --- a/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/smokeables.yml @@ -6,22 +6,9 @@ edges: - to: joint 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 + - material: PaperRolling + - material: CigaretteFilter + - material: GroundCannabis doAfter: 2 - node: joint entity: Joint @@ -34,22 +21,8 @@ edges: - to: blunt steps: - - prototype: LeavesTobaccoDried - icon: - sprite: Objects/Specific/Hydroponics/tobacco.rsi - state: dried - name: dried tobacco leaves - - 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 + - material: LeavesTobaccoDried + - material: GroundCannabis doAfter: 2 - node: blunt entity: Blunt @@ -62,22 +35,9 @@ 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 + - material: PaperRolling + - material: CigaretteFilter + - material: GroundTobacco doAfter: 2 - node: cigarette entity: Cigarette @@ -107,6 +67,5 @@ - material: LeavesTobaccoDried amount: 2 doAfter: 5 - - node: ground entity: GroundTobacco diff --git a/Resources/Prototypes/Recipes/Crafting/smokeables.yml b/Resources/Prototypes/Recipes/Crafting/smokeables.yml index eb73b4fb6d..afe569be84 100644 --- a/Resources/Prototypes/Recipes/Crafting/smokeables.yml +++ b/Resources/Prototypes/Recipes/Crafting/smokeables.yml @@ -6,7 +6,7 @@ targetNode: joint category: construction-category-misc description: "A roll of dried plant matter wrapped in thin paper." - icon: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png + icon: Objects/Consumable/Smokeables/Cannabis/joint.rsi/unlit-icon.png objectType: Item - type: construction @@ -17,7 +17,7 @@ targetNode: blunt category: construction-category-misc description: "A roll of dried plant matter wrapped in a dried tobacco leaf." - icon: Objects/Consumable/Smokeables/Cigarettes/blunt.rsi/unlit-icon.png + icon: Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-icon.png objectType: Item - type: construction @@ -41,7 +41,7 @@ targetNode: ground category: construction-category-misc description: "Ground cannabis, ready to take you on a trip." - icon: Objects/Misc/reageant_fillings.rsi/powderpile.png + icon: Objects/Misc/reagent_fillings.rsi/powderpile.png # color: darkgreen objectType: Item @@ -53,6 +53,6 @@ targetNode: ground category: construction-category-misc description: "Ground tobacco, perfect for hand-rolled cigarettes." - icon: Objects/Misc/reageant_fillings.rsi/powderpile.png + icon: Objects/Misc/reagent_fillings.rsi/powderpile.png # color: brown objectType: Item diff --git a/Resources/Prototypes/Stacks/consumable_stacks.yml b/Resources/Prototypes/Stacks/consumable_stacks.yml index 36f0bb97b0..ddacbfa5e9 100644 --- a/Resources/Prototypes/Stacks/consumable_stacks.yml +++ b/Resources/Prototypes/Stacks/consumable_stacks.yml @@ -17,30 +17,36 @@ - type: stack id: PaperRolling - name: paper rolling + name: rolling paper + icon: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigpaper.png spawn: PaperRolling - type: stack id: CigaretteFilter name: cigarette filter + icon: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi/cigfilter.png spawn: CigaretteFilter - type: stack id: GroundTobacco name: ground tobacco + icon: /Textures/Objects/Misc/reagent_fillings.rsi/powderpile.png spawn: GroundTobacco - type: stack id: GroundCannabis name: ground cannabis + icon: /Textures/Objects/Misc/reagent_fillings.rsi/powderpile.png spawn: GroundCannabis - type: stack id: LeavesTobaccoDried name: dried tobacco leaves + icon: /Textures/Objects/Specific/Hydroponics/tobacco.rsi/dried.png spawn: LeavesTobaccoDried - type: stack id: LeavesCannabisDried name: dried cannabis leaves + icon: /Textures/Objects/Specific/Hydroponics/tobacco.rsi/dried.png spawn: LeavesCannabisDried diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/burnt-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/burnt-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9ddec0b7bf0a0efc9c0b7e83e0dfa321587eaa24 GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|>;rs4Tn`*L z5aQzU`SWKfCZG^$pux-GO&_-yP?Km$kY6yve=Hzi!!LcH0tHVO#}JF& qZi0e)KAmx3{V~-**dS5l0TaWsNQRXwi(i(5T;S>I=d#Wzp$Pz8c0C;c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-equipped-MASK.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..50050c9c923386b08df9bca7e7c3011348a04fd0 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1jKx9jP7LeL$-D$|qyv0HTn`*L zuzUCJD;f+9UJh5>7_L+>Tv^KS|79>xeDa3mHlQ-jk|4iehW}7t&NTZ9Q1Fzei(^Q| zoVRy9`I-#`SR4`}{{4Uary(%KLn@>+S7*CUp`^TxuYvDphgk{d*8gbf`ziWZ`j~jl z{-vwVecF0*yW0KPe>4U+4Jl(%J93e=~wa*L`^ZGiLYyAMD?a z9=0TWw9lwHSiX8ystP+$uEFqSxPq?mImW*aE#vO3UbPKk+Woit=RF1K{UCgHibY*V z&Y9ZI&&fU(Pg?kvKjPjO|NWQ4^y*rW0tSY8$6tejg(3b2!`jb`HAz!G^MSaYu6{1- HoD!M%v= z3ohLBGs$p5Gxga>B+S3#^A4M;w*l4b|9yXsu2kC8z~&O3(sZLNJR=-lFYAi8h5NKz zA|-q%>^J0q!dFU9Huza_w!!a;jaYOJ?5d|X+s4T@)^bKccud$=$XB%HdDKlj>Ehyo z)Ipg;m_!K?#7mM2Yvd^tkXn??{`QUk_~t2zN0Yx!6+;|Za^m%iT9K}4sTtAJ^5vZ-916*e6p;!5peE6y=GZoN0wDT2FD{@6kGn1OUrA=948!0Rb=$D#KI+$)W&n(Lh0Lu^By=oF^{X00000008JEwOVbKDgaMwUDCpA^zZC8u3 z;X1e1?m}nJ#Ye&Wb+1=>7Tp@VqQlZa+co!JE~{?d0QGvk;VXYXJs~>&TCtMf@j>6G z&*}Kph4j31ydXa}H|0dJ_}3aUccxsjQV5eDPM?+AV@2orX3M!-ekwNegH8*=mDRoT z)#eWgl#=zWt-X=Wt*s~0On!C!Gr;7Vi+7!GJe-+Pwy!_vQ~>p4=UuXvBoYn|$RDlK z@h#a%M>h9(`K@}i^hR}~=ti~$xy=99XMo8!H-O80^y0swQ~>}0000000000000000 zbe5}`RL_czpI6$hvD%;iKGN~MlSeXNFJWNN7F{QCjs;$`=%8dD2?@*BJP zix%>O+$%3NocHJN=PN&o?B(a)f~s>PX)k=Hxv>+L&6)mqn_EEj#_zt(2LJ#700000 z000000002M;gGAL^z+SAdVb|{+cj4E^IJ!Jz2Yt3>kD9tZ~lJy7|M&nMfd&r=^^r= zHJ)9&>O9}J!v8Ebz3`_?gK1xU#{7i4nKS+I$5deLi6-Ocz2V4Cdd;uumf z=j~m^Jdr?|0}suYm^(ZO^qp3~w&7~&Y75Wc=enQ$>Hht5e}D4# z+@n9=1F6cRKYu^I@%H-c`mayFO62pcuKU0H@5|bMDU1igeE4%dho9fUcSDA8f*Qjm z7Kd339>NTnObWgXOE?=$$P`TX|N7|coc{fn{xbZLzr%l^`*|IMg(D>bP0l+XkK D{&M&@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-inhand-right.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/lit-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6d9af4e9a4862131927c53e9b9faa920b215aa6a GIT binary patch literal 564 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcaljKx9jP7LeL$-D%z-+8(?hE&XX zdv~wz;Q*1ghsjfPU%U|TZs}?=lNC)4aEww*U|ex2X!4o{k&A{5O_DyYEi9e^KL5Vh z`e&ZD3-625yt+3OXecq@NY=Bv8Mn(OzrJC4`SCJY*{`ctz54Yr^Idt=kG{=Q<$ho4 ztCD>lUpnXiox*?4$A5mWpMBqC^?5;t>h<0X?EiQ0-LPg-n8nbc#;}O9A%hyssQhw(z`Lklx-TU%&vdhAKzyJNXy~gf<74Lcf+pAU`e7(aj?$*|I`9?GU>@eH6cjnpk zthfK@Z~pX?VZScdwuSfKum7`Vzk`b~!$lSc6Gj1F2I?@M&F9~6k44ofy`glX(f`a0d8FVdQ&MBb@08A|~2LJ#7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-icon.png b/Resources/Textures/Objects/Consumable/Smokeables/Cannabis/blunt.rsi/unlit-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f8799e702a095d1efa27323c70765f10a6206ff4 GIT binary patch literal 592 zcmV-W0%v= z3ohLBGs$p5Gxga>B+S3#^A4M;w*l4b|9yXsu2kC8z~&O3(sZLNJR=-lFYAi8h5NKz zA|-q%>^J0q!dFU9Huza_w!!a;jaYOJ?5d|X+s4T@)^bKccud$=$XB%HdDKlj>Ehyo z)Ipg;m_!K?#7mM2Yvd^tkXn??{`QUk_~t2zN0Yx!6+;|Za^m%iT9K}4sTtAJ^5vZ-916*e6p;!5peE6y=GZoN0wDT2FD{@6kGn1OUrA=948!0Rb=$D#KI+$)W&n(Lh0Lu^By=oR9; z3>b+~)ad2#pOBjRZ3h@>;sB84zyJJ&^S}K1#lXYHhN1=}CdkD}mP1$wDfsmLC&PaR zNC15J{)0h)lY`;g@858FnArPo-x-)0nP?LQNfriR7w~bgBOLbQCj+wBgaaoTM^p4D e7zLwXNCE&N;wZM5h=;fU0000k44ofy`glX(f`a0d8k44ofy`glX(f`a0d8%v= z3ohLBGs$p5Gxga>B+S3#^A4M;w*l4b|9yXsu2kC8z~&O3(sZLNJR=-lFYAi8h5NKz zA|-q%>^J0q!dFU9Huza_w!!a;jaYOJ?5d|X+s4T@)^bKccud$=$XB%HdDKlj>Ehyo z)Ipg;m_!K?#7mM2Yvd^tkXn??{`QUk_~t2zN0Yx!6+;|Za^m%iT9K}4sTtAJ^5vZ-916*e6p;!5peE6y=GZoN0wDT2FD{@6kGn1OUrA=948!0Rb=$D#KI+$)W&n(Lh0Lu^By=ojJaWn(XeIgchCnG~WBymE(vy0NaVy{>O(x3TKx z6%tD(b{ntNFfEak-(VLtgaYP|`fvf=+ nn|VSMlhRTtwi}Yl5)2G6sf;Um<*b(jl`?p``njxgN@xNAi!oFp diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack0.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpack0.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack0.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpack0.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack15.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpack15.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack15.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpack15.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack60.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpack60.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpack60.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpack60.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob-10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpackmob-10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob-10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpackmob-10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob100.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpackmob100.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob100.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpackmob100.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpackmob50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/backpackmob50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/backpackmob50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker0.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker0.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker0.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker0.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker25.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker25.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker25.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker25.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker75.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker75.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker75.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker75.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker80.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker80.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker80.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker80.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker90.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker90.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beaker90.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beaker90.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold0.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold0.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold0.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold0.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold25.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold25.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold25.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold25.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold75.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold75.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold75.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold75.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold80.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold80.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold80.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold80.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold90.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold90.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakergold90.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakergold90.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge0.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge0.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge0.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge0.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge25.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge25.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge25.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge25.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge75.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge75.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge75.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge75.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge80.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge80.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge80.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge80.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge90.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge90.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/beakerlarge90.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/beakerlarge90.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack100.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack100.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack100.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack100.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack20.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack20.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack20.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack20.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack30.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack30.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack30.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack30.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack40.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack40.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack40.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack40.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack60.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack60.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack60.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack60.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack70.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack70.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack70.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack70.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack80.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack80.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack80.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack80.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack90.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack90.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bloodpack90.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bloodpack90.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle0.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bottle0.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle0.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bottle0.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bottle10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bottle10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle30.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bottle30.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle30.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bottle30.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bottle50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bottle50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle70.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/bottle70.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/bottle70.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/bottle70.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack100.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack100.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack100.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack100.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack20.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack20.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack20.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack20.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack30.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack30.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack30.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack30.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack40.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack40.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack40.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack40.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack60.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack60.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack60.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack60.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack70.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack70.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack70.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack70.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack80.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack80.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack80.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack80.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack90.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack90.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/chempack90.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/chempack90.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/dropper.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/dropper.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/dropper.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/dropper.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment0.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment0.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment0.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment0.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment100.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment100.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment100.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment100.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment25.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment25.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment25.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment25.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment75.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment75.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/emptycondiment75.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/emptycondiment75.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle0.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle0.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle0.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle0.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle20.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle20.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle20.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle20.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle30.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle30.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle30.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle30.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle40.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle40.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle40.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle40.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle60.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle60.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle60.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle60.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle70.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle70.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle70.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle70.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle80.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle80.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle80.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle80.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle90.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle90.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottle90.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottle90.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall0.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall0.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall0.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall0.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall20.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall20.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall20.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall20.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall30.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall30.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall30.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall30.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall40.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall40.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall40.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall40.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall60.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall60.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall60.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall60.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall70.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall70.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall70.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall70.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall80.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall80.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall80.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall80.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall90.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall90.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/glassbottlesmall90.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/glassbottlesmall90.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle0.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle0.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle0.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle0.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle25.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle25.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle25.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle25.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle75.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle75.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle75.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle75.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle80.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle80.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle80.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle80.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle90.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle90.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/largebottle90.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/largebottle90.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/maunafilling25.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/maunafilling25.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/maunafilling25.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/maunafilling25.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/meta.json b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/meta.json rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/meta.json diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/pill.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/pill.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/pill.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/pill.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/powderpile.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/powderpile.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/powderpile.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/powderpile.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle-10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle-10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle-10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle-10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle25.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle25.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle25.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle25.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle50.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle50.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle50.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle50.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle75.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle75.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle75.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle75.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle80.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle80.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle80.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle80.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle90.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle90.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/smallbottle90.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/smallbottle90.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/splashed.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/splashed.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/splashed.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/splashed.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe1.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/syringe1.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe1.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/syringe1.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe10.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/syringe10.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe10.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/syringe10.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe15.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/syringe15.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe15.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/syringe15.png diff --git a/Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe5.png b/Resources/Textures/Objects/Misc/reagent_fillings.rsi/syringe5.png similarity index 100% rename from Resources/Textures/Objects/Misc/reageant_fillings.rsi/syringe5.png rename to Resources/Textures/Objects/Misc/reagent_fillings.rsi/syringe5.png