From: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com>
Date: Thu, 14 Sep 2023 07:17:44 +0000 (+0200)
Subject: Make Shark Plush Janitor-Bucketable (#20123)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=11972a00666bbf40f94bbe7e82728ac71b1e641b;p=space-station-14.git

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 2aa92fbd96..6d7d7a52e7 100644
--- 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 e1755c9756..5d90d9f186 100644
--- 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 c7e4c1a437..d4fb34b547 100644
--- 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 d3171963d5..ebe2820964 100644
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 96c6b4d173..996143fd7b 100644
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 05b87738f0..8bbd20f7ca 100644
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 560eaff496..9c2b7bbfec 100644
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 a41be1d569..c07b5c941d 100644
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 1f733e66a4..a9d10a887a 100644
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 a19aa0e583..eca1964c4d 100644
--- 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
index 0000000000..de6b41b426
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
index 0000000000..3418a156d2
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
index 0000000000..b585b72740
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 0ab0549a15..c489dd1b3a 100644
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 c5b64bfe74..80c612e9f5 100644
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 71bff9d6f2..95b5c96a9b 100644
Binary files a/Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png and b/Resources/Textures/Objects/Fun/sharkplush.rsi/pink.png differ