Make Shark Plush Janitor-Bucketable (#20123)

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 2aa92fbd96cb1d069f2c795b918e4e25f43fb6a8..6d7d7a52e74bce675bd061b9986b81e9f9adcd30 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -281,6 +281,9 @@
     state: blue
   - type: Item
     heldPrefix: blue
+  - type: Tag
+    tags:
+      - PlushieSharkBlue
 
 - type: entity
   parent: PlushieSharkBlue
@@ -293,6 +296,9 @@
     state: pink
   - type: Item
     heldPrefix: pink
+  - type: Tag
+    tags:
+      - PlushieSharkPink
 
 - type: entity
   parent: PlushieSharkBlue
@@ -305,6 +311,9 @@
     state: grey
   - type: Item
     heldPrefix: grey
+  - type: Tag
+    tags:
+      - PlushieSharkGrey
 
 - type: entity
   parent: BasePlushie

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
index e1755c9756d09089a3d0db16524ab2f092d9f137..5d90d9f1866fd2625b6de400ef1265f5a3527302 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -111,10 +111,35 @@
   - type: Tag
     tags:
       - Wringer
+  - type: ItemMapper
+    mapLayers:
+      mopbucket_shark_blue:
+        whitelist:
+          tags:
+            - PlushieSharkBlue
+      mopbucket_shark_pink:
+        whitelist:
+          tags:
+            - PlushieSharkPink
+      mopbucket_shark_grey:
+        whitelist:
+          tags:
+            - PlushieSharkGrey
+    sprite: Objects/Fun/sharkplush.rsi
   - type: Physics
     bodyType: Dynamic
   - type: Transform
     noRot: true
+  - type: ItemSlots
+    slots:
+      shark_slot:
+        name: Shark
+        whitelist:
+          tags:
+            - PlushieSharkBlue
+            - PlushieSharkPink
+            - PlushieSharkGrey
+        priority: 3 # Higher than drinking priority
   - type: Fixtures
     fixtures:
       fix1:
@@ -134,6 +159,11 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 3
     fillBaseName: mopbucket_water-
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: []
+      shark_slot: !type:ContainerSlot {}
   - type: GuideHelp
     guides:
     - Janitorial

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index c7e4c1a4371160b0719abfdc0c47379ad823644e..d4fb34b5479835506f223d423f8b929e9092c212 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -795,6 +795,14 @@
 - type: Tag
   id: PlushieGhost
 
+- type: Tag
+  id: PlushieSharkBlue
+
+- type: Tag
+  id: PlushieSharkPink
+
+- type: Tag
+  id: PlushieSharkGrey
 
 - type: Tag
   id: PowerCellSmall

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-left.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-left.png
index d3171963d5961a67f336c3c169b079fad3cadaaa..ebe28209642af6fabce7ae7410619fab0eb20a3a 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-left.png and b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-right.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-right.png
index 96c6b4d173676a84108397748a0ddfad4acdd689..996143fd7b8a8c6148b18cb7c6da6845ff08584e 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-right.png and b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue.png
index 05b87738f03e02eacc71cf724b8684e057a086b2..8bbd20f7ca012187371d763f9916eb383ec201af 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/sharkplush.rsi/blue.png and b/Resources/Textures/Objects/Fun/sharkplush.rsi/blue.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-left.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-left.png
index 560eaff4967f1b5179053c17b8540ea5ed664e7c..9c2b7bbfec38ccfde36c0d2baaa3201f54007839 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-left.png and b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-right.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-right.png
index a41be1d569d356b49004a000930b8671851ec856..c07b5c941d7bb4b4692835eea125978353687b69 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-right.png and b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey.png
index 1f733e66a4d4349e158d1289cb36d220d34708ba..a9d10a887a1470cbac821d47e22d4e9238387c95 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/sharkplush.rsi/grey.png and b/Resources/Textures/Objects/Fun/sharkplush.rsi/grey.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json b/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json
index a19aa0e5834524cf5ed06286e29c2a70d171ac22..eca1964c4dd576bf96d441e7009a7ce266cf7857 100644 (file)
--- a/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/sharkplush.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Sprited for SS14 by GitHub user Willhelm53",
+  "copyright": "Sprited for SS14 by GitHub user Willhelm53, later overhauledby GitHub user Psychpsyo",
   "size": {
     "x": 32,
     "y": 32
@@ -39,6 +39,15 @@
     {
       "name": "grey-inhand-right",
       "directions": 4
+    },
+    {
+      "name": "mopbucket_shark_blue"
+    },
+    {
+      "name": "mopbucket_shark_pink"
+    },
+    {
+      "name": "mopbucket_shark_grey"
     }
   ]
 }
\ No newline at end of file

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_blue.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_blue.png
new file mode 100644 (file)
index 0000000..de6b41b
Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_blue.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_grey.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_grey.png
new file mode 100644 (file)
index 0000000..3418a15
Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_grey.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_pink.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_pink.png
new file mode 100644 (file)
index 0000000..b585b72
Binary files /dev/null and b/Resources/Textures/Objects/Fun/sharkplush.rsi/mopbucket_shark_pink.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-left.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-left.png
index 0ab0549a15138031f958f33bdc6c26422a700d47..c489dd1b3abc1085ca189a9a0b40a07866a604b3 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-left.png and b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-right.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-right.png
index c5b64bfe74ddfc055e2a32babca2f7ddc5efb0c4..80c612e9f5ea97fc4b8ea9d59149b497d5aa1b1c 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-right.png and b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png
index 71bff9d6f23870c1b85928a0fc348cb863769170..95b5c96a9b2e6e3ad023631fecbec0aa67d78f3a 100644 (file)
Binary files a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png and b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png differ