Add delicious mopwata (#23740)

* added delicious mopwata

* added mopwata, the reagent

* fixed issues, changed color, added more possible fills

diff --git a/Resources/Locale/en-US/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
index 0116bd3c8cdeb5772c1d1da5fa7ff3c287b21144..10e7d96528257906e050a8c44497a679be4b0a11 100644 (file)
--- a/Resources/Locale/en-US/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/en-US/flavors/flavor-profiles.ftl
@@ -183,6 +183,7 @@ flavor-complex-coffee = like coffee
 flavor-complex-milk = like milk
 flavor-complex-tea = like tea
 flavor-complex-ice = like ice
+flavor-complex-mopwata = like stagnant, dirty water
 
 ## Cocktails
 flavor-complex-long-island = suspiciously like iced tea

diff --git a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
index 00091ad9fe2de8d3b3acf45b3c0448941d775852..ad0ade7c96077334886bdfe667216f39da42638e 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
+++ b/Resources/Locale/en-US/reagents/meta/consumable/drink/drinks.ftl
@@ -84,3 +84,6 @@ reagent-desc-the-martinez = The edgerunner legend. Remembered by a drink, forgot
 
 reagent-name-white-gilgamesh = white gilgamesh
 reagent-desc-white-gilgamesh = A sickening mixture of milk and beer. Makes you feel like you're made of wood.
+
+reagent-name-mopwata = mopwata
+reagent-desc-mopwata = Dirty, stagnant mop water.
\ No newline at end of file

diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
index 183fd9db03c73729a5382c703252eda91a529198..d720aab3a5c567e122a6153577fb6df97edfed07 100644 (file)
--- a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
+++ b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -20,6 +20,7 @@ reagent-physical-desc-chalky = chalky
 reagent-physical-desc-roaring = roaring
 reagent-physical-desc-robust = robust
 reagent-physical-desc-sickly = sickly
+reagent-physical-desc-murky = murky
 reagent-physical-desc-bubbling = bubbling
 reagent-physical-desc-wormy = wormy
 reagent-physical-desc-frosty = frosty

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index 6acbe12af27d6ab65262d2240244b92f5875287a..4bf07481d7a22a4bd43403fe12beafa3ce3ce013 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -146,6 +146,8 @@
           prob: 0.25
         - id: StrangePill
           prob: 0.20
+        - id: DrinkMopwataBottleRandom
+          prob: 0.20
         - id: ModularReceiver
           prob: 0.1
         - id: DrinkSpaceGlue

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
index 4637732f88d9196179669efe011812fd70e0408c..f89b56ea878c7b3b5b4a58ce739b0db3f1a7181e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml
@@ -67,4 +67,73 @@
     fillBaseName: fill
   - type: Lube
   - type: TrashOnSolutionEmpty
-    solution: drink
\ No newline at end of file
+    solution: drink
+
+
+# Mopwata 
+- type: weightedRandomFillSolution
+  id: RandomFillMopwata
+  fills:
+  - quantity: 10
+    weight: 5
+    reagents:
+    - Blood
+    - CopperBlood
+    - Slime
+    - Vomit
+  - quantity: 10
+    weight: 4
+    reagents:
+    - Coffee
+    - Tea
+    - Cola
+    - RootBeer
+    - DrGibb
+    - GrapeSoda
+    - Starkist
+    - SpaceUp
+    - SpaceMountainWind
+    - LemonLime
+    - PwrGame
+  - quantity: 10
+    weight: 3
+    reagents:
+    - Whiskey
+    - Vodka
+    - Beer
+    - Ale
+    - Rum
+    - Tequila
+    - Absinthe
+  - quantity: 10
+    weight: 1
+    reagents:
+    - SpaceDrugs
+    - Mold
+    - SpaceLube
+    - SpaceGlue
+    - SoapyWater
+    - SpaceCleaner
+    - MilkSpoiled
+    - FourteenLoko
+
+- type: entity
+  parent: DrinkBottleGlassBaseFull
+  id: DrinkMopwataBottleRandom
+  name: delicious mopwata
+  description: A foggy brown bottle with a faded label depicting a mop. It comes full of murky... vintage.
+  components:
+  - type: Item
+    size: Small
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+        reagents:
+        - ReagentId: Mopwata
+          Quantity: 40
+  - type: RandomFillSolution
+    solution: drink
+    weightedRandomId: RandomFillMopwata
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/mopwata.rsi
\ No newline at end of file

diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml
index cd2e9a237f122d40108bd1dda04d7f4d48104884..688a859f24c77018930eff4dc2b81588f2eb0c6f 100644 (file)
--- a/Resources/Prototypes/Flavors/flavors.yml
+++ b/Resources/Prototypes/Flavors/flavors.yml
@@ -534,6 +534,11 @@
   flavorType: Complex
   description: flavor-complex-water
 
+- type: flavor
+  id: mopwata
+  flavorType: Complex
+  description: flavor-complex-mopwata
+
 - type: flavor
   id: beer
   flavorType: Complex

diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
index 299126ade879a677e0c9451bcae125bdd9dc3b63..5f60d76c142f3dbf7f7b767d9c07c446dd5858a8 100644 (file)
--- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
@@ -424,3 +424,17 @@
   metamorphicSprite:
     sprite: Objects/Consumable/Drinks/rewriter.rsi
     state: icon
+
+- type: reagent
+  id: Mopwata
+  name: reagent-name-mopwata
+  parent: BaseDrink
+  desc: reagent-desc-mopwata
+  physicalDesc: reagent-physical-desc-murky
+  flavor: mopwata
+  color: "#59502b"
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 0.6
\ No newline at end of file

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon.png b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon.png
new file mode 100644 (file)
index 0000000..74690a0
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json
new file mode 100644 (file)
index 0000000..db0ac60
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/mopwata.rsi/meta.json
@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}
\ No newline at end of file