From a8937db9e1588752aaebe7e7894db3ffa8ad3fbf Mon Sep 17 00:00:00 2001
From: ZeroDayDaemon <60460608+ZeroDayDaemon@users.noreply.github.com>
Date: Wed, 18 May 2022 13:21:38 -0500
Subject: [PATCH] Funny dog mug (#8224)

---
 .../Markers/Spawners/Random/maintenance.yml       |   7 ++++---
 .../Objects/Consumable/Drinks/drinks_cups.yml     |  10 ++++++++++
 .../Consumable/Drinks/mug_dog.rsi/icon-3.png      | Bin 0 -> 465 bytes
 .../Consumable/Drinks/mug_dog.rsi/meta.json       |  14 ++++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png
 create mode 100644 Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 7504751dc3..8fb2ff6a97 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -20,6 +20,7 @@
         - PonderingOrb
         - Skub
         - ClothingHeadHatCatEars
+        - DrinkMugDog
       rareChance: 0.01
       prototypes:
         - Lighter
@@ -38,8 +39,8 @@
         - ClothingUnderSocksCoder
       chance: 0.6
       offset: 0.0
-      
-      
+
+
 - type: entity
   name: Maint Loot Spawner
   suffix: Tools+Cells+Mats
@@ -73,7 +74,7 @@
         - SheetPlastic
       chance: 0.6
       offset: 0.0
-      
+
 - type: entity
   name: Maint Loot Spawner
   suffix: Scrap+Weapons
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 83fb388132..84f790848f 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -79,6 +79,16 @@
     sprite: Objects/Consumable/Drinks/mug_green.rsi
     state: icon-3
 
+- type: entity
+  parent: DrinkBaseCup
+  id: DrinkMugDog
+  name: funny dog mug
+  description: It looks like a cartoon beagle.
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/mug_dog.rsi
+    state: icon-3
+
 - type: entity
   parent: DrinkBaseCup
   id: DrinkMugHeart
diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/icon-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b733d745feb456812a9d73845683e13f26b7ca57
GIT binary patch
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004)Nkl<ZSi|j=
zJ!=$E6o#L3XEM8n*>Po~b|EB&trCb}un2-xh=si@8t^|@L?ISJ@DBuR6{fV8ROys$
zEfh3cC`i~a>}KXVoBg`iCPGRlWCig)_4#;tIUnF~I2`{wQZ(V9xl<C6_lT+kU`=YR
zonKge+B=T`zi5K7_IVUuSt(cMKs*Ne+w^hT-US{{+<{heXTR)^*R*bXmMKIOcHE;9
zT_Ya_Z*Ht^ZBEnyYt5Z*=ezWK9qe!QA`FK))7AQ;MlE~*oWzNa{<NklB4GR8O9{eR
zlz#~&3Q-<Pd`jUQ)|#(zq5}(e8?`XKZ~={4IC$~ySsq1KSzdolWoC)W%o58RG1cmI
zJik0R6JDO!5MoA%2>s(Ph$uvaqff5@sW)oj03c3uaN!P|77akie(X`Yyhso&pbz&E
z5v(<>IMG3o=7nbf_&7F0b9Q+|6vh}v!=InevxbEP%-`C&nd$ECN!}%Ee;{i&>E|8N
zG<mytd;9)hIYgc}^(5;YtYzKS=_RzODD}`i6^Fy&_-FYAb;pmd0&9|J00000NkvXX
Hu0mjf$0f_$

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
new file mode 100644
index 0000000000..f605d28ff7
--- /dev/null
+++ b/Resources/Textures/Objects/Consumable/Drinks/mug_dog.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "https://github.com/unitystation/unitystation/blob/221bbcc50edf4e63dc71ac6fd5152664a6b6745a/UnityProject/Assets/Textures/items/drinks/mug_gromit.png | Created By https://github.com/ksivte",
+    "states": [
+        {
+            "name": "icon-3"
+        }
+    ]
+}
\ No newline at end of file