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 6fe951d8344f9acc522e514da453f2973541497c..07569efd0c2312a4a4b550701e90fc6333d9b447 100644 (file)
--- 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 0119fab5316a9ac25051794221ffc780cecb6566..07828ff5ba5cfe2304a8dd94596149c7f964b575 100644 (file)
--- 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