From: MjrLandWhale <brandonemitch@gmail.com>
Date: Wed, 21 Feb 2024 23:26:28 +0000 (-0600)
Subject: Dispenser jug fix (#25450)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=499aa71b5e8a112195df70cef2194fbb3ae3ec0c;p=space-station-14.git

Dispenser jug fix (#25450)

* Resprite of Nettle & Death Nettle. Corrected R & L hand locations for all orientations of both plants.

* Removes chemdispensible type from DrinkBase entity

* Updated drink jug names to differentiate from chem jugs

* Add FitsInDispenser type to DrinkGlassBase. Re-allows glasses into beaker slots
---

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
index 6fe951d834..07569efd0c 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -23,8 +23,6 @@
         Blunt: 0
   - type: Spillable
     solution: drink
-  - type: FitsInDispenser
-    solution: drink
   - type: DrawableSolution
     solution: drink
   - type: RefillableSolution
@@ -76,6 +74,8 @@
       Glass: 25
   - type: ExaminableSolution
     solution: drink
+  - type: FitsInDispenser
+    solution: drink
 
 # Transformable container - normal glass
 - type: entity
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
index 0119fab531..07828ff5ba 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml
@@ -713,7 +713,7 @@
 - type: entity
   parent: DrinkBottlePlasticBaseFull
   id: DrinkSugarJug
-  name: sugar
+  name: sugar jug
   suffix: for drinks
   description: some people put this in their coffee...
   components:
@@ -729,7 +729,7 @@
 - type: entity
   parent: DrinkBottlePlasticBaseFull
   id: DrinkLemonLimeJug
-  name: lemon lime
+  name: lemon lime jug
   description: a dual citrus sensation.
   components:
   - type: SolutionContainerManager