Golden plunger Trolley and Bucket Carp (#38494)

* Golden plunger and Bucket Carp

* attributions added

diff --git a/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
index bc03943a016ef24554cb5def0e410ea25a8e0cf1..df4a11a3e2b595c8bf2a2b2baf916bb50954f982 100644 (file)
--- a/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
+++ b/Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
@@ -3,6 +3,7 @@ mop-bucket-slot-component-slot-name-item = Item
 mop-bucket-slot-component-eject-verb = Take out
 # janitorial trolley
 janitorial-trolley-slot-component-slot-name-plunger = Plunger
+janitorial-trolley-slot-component-slot-name-goldenplunger = Golden Plunger
 janitorial-trolley-slot-component-slot-name-sign = Sign
 janitorial-trolley-slot-component-slot-name-lightreplacer = Light Replacer
 janitorial-trolley-slot-component-slot-name-spray = Spray

diff --git a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
index f0ab2931c0dc581a175abe06a6cc880144f0d01e..dc9976502ad290a86ebfd833623ee167c5b21757 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/plushies.yml
@@ -876,9 +876,20 @@
   components:
   - type: Sprite
     state: magicplush
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: magicarpplush-inhand-left
+      right:
+      - state: magicarpplush-inhand-right
   - type: FoodSequenceElement
     entries:
       CottonBurger: MagicarpPlushie
+  - type: Tag
+    tags:
+    - Payload
+    - ClothMade
+    - PlushieCarpMagi
 
 - type: entity
   parent: PlushieCarp
@@ -910,9 +921,20 @@
   components:
   - type: Sprite
     state: holoplush
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: holocarpplush-inhand-left
+      right:
+      - state: holocarpplush-inhand-right
   - type: FoodSequenceElement
     entries:
       CottonBurger: HolocarpPlushie
+  - type: Tag
+    tags:
+    - Payload
+    - ClothMade
+    - PlushieCarpHolo
 
 - 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 f23bd4386651d3c6ce52c3c5a2250584685c0a5e..d9d4851158ec3dcfdbcbab3adf500687fdbe7217 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
@@ -271,6 +271,9 @@
   parent: Plunger
   description: A plunger with a plastic suction cup coated in a thin layer of gold given as a token of appreciation for years of service. Still used to unclog drains.
   components:
+  - type: Tag
+    tags:
+    - GoldenPlunger
   - type: Sprite
     sprite: Objects/Specific/Janitorial/golden_plunger.rsi
     state: plunger

diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
index c095951d96b9a5a5c771880d0da60f3a46d714db..3be6fb7d6ff52ca5de309909ab4ea8b76084e922 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
@@ -51,6 +51,14 @@
         whitelist:
           tags:
             - PlushieCarp
+      mopbucket_magicarpplush:
+        whitelist:
+          tags:
+          - PlushieCarpMagi
+      mopbucket_holocarpplush:
+        whitelist:
+          tags:
+          - PlushieCarpHolo
     sprite: Objects/Specific/Janitorial/janitorial.rsi
   - type: Transform
     noRot: true
@@ -65,6 +73,8 @@
             - PlushieSharkPink
             - PlushieSharkGrey
             - PlushieCarp
+            - PlushieCarpHolo
+            - PlushieCarpMagi
           components:
             - Rehydratable
         priority: 3 # Higher than drinking priority
@@ -177,6 +187,11 @@
           whitelist:
             tags:
               - Plunger
+        goldenplunger_slot:
+          name: janitorial-trolley-slot-component-slot-name-goldenplunger
+          whitelist:
+            tags:
+            - GoldenPlunger
           priority: 8
         wetfloorsign_slot4:
           name: janitorial-trolley-slot-component-slot-name-sign
@@ -286,6 +301,10 @@
           whitelist:
             tags:
               - Plunger
+        cart_goldenplunger:
+          whitelist:
+            tags:
+            - GoldenPlunger
         cart_mop:
           whitelist:
             tags:
@@ -349,6 +368,7 @@
         trashbag_slot: !type:ContainerSlot {}
         bucket_slot: !type:ContainerSlot {}
         plunger_slot: !type:ContainerSlot {}
+        goldenplunger_slot: !type:ContainerSlot {}
         wetfloorsign_slot4: !type:ContainerSlot {}
         wetfloorsign_slot3: !type:ContainerSlot {}
         wetfloorsign_slot2: !type:ContainerSlot {}

diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 8c36cc28860bac9a44bc773474b0da6319c227b2..aa3be06694392f7082418a1ebfdb00c3e75348fb 100644 (file)
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -642,6 +642,9 @@
 - type: Tag
   id: Goat
 
+- type: Tag
+  id: GoldenPlunger
+
 - type: Tag
   id: Goliath
 
@@ -1090,6 +1093,12 @@
 - type: Tag
   id: PlushieCarp
 
+- type: Tag
+  id: PlushieCarpHolo
+
+- type: Tag
+  id: PlushieCarpMagi
+
 - type: Tag
   id: PlushieGhost
 

diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-left.png
new file mode 100644 (file)
index 0000000..7f22ecc
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-right.png
new file mode 100644 (file)
index 0000000..b5399af
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-left.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-left.png
new file mode 100644 (file)
index 0000000..234e7c2
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-right.png b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-right.png
new file mode 100644 (file)
index 0000000..d97fd28
Binary files /dev/null and b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json
index 8b92838d06f57622415d00b316d56bcaa2382b4a..60d184a0dbf2d6d212dd30cf15a58021ba4355bd 100644 (file)
--- a/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-NC-SA-3.0",
-    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, holoplush and magicplush modified by deltanedas (github), rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, holoplush and magicplush modified by deltanedas (github), rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba, magicarp and holocarp inhand sprites by TiniestShark (github)",
     "size": {
         "x": 32,
         "y": 32
@@ -21,6 +21,14 @@
         {
             "name": "magicplush"
         },
+        {
+            "name": "magicarpplush-inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "magicarpplush-inhand-right",
+            "directions": 4
+        },
         {
             "name": "holoplush",
             "delays": [
@@ -42,6 +50,122 @@
                 ]
             ]
         },
+        {
+            "name": "holocarpplush-inhand-left",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
+        {
+            "name": "holocarpplush-inhand-right",
+            "directions": 4,
+            "delays": [
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ],
+                [
+                    0.3,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1,
+                    0.1
+                ]
+            ]
+        },
         {
             "name": "rainbowcarpplush"
         },

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
index e4604b165f3991d1897a973c90eb6a2023a59fdf..e138281ef612ddb8daf0ef4664b816f91b9ff0d5 100644 (file)
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, mopbucket_shark_* by Psychpsyo, mopbucket_carpplush adapted by Psychpsyo from tgstation carpplush at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, mopbucket_cube is monkey cube taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi and modified by Hrosts",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, mopbucket_shark_* by Psychpsyo, mopbucket_carpplush adapted by Psychpsyo from tgstation carpplush at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, mopbucket_cube is monkey cube taken from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi and modified by Hrosts, Holocarp and Magicarp mopbucket sprites by TiniestShark (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -37,6 +37,29 @@
     {
       "name": "mopbucket_carpplush"
     },
+    {
+      "name": "mopbucket_magicarpplush"
+    },
+    {
+      "name": "mopbucket_holocarpplush",
+      "delays": [
+          [
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1,
+              0.1
+          ]
+      ]
+    },
     {
       "name": "mopbucket_cube"
     },

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_holocarpplush.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_holocarpplush.png
new file mode 100644 (file)
index 0000000..149f3e8
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_holocarpplush.png differ

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_magicarpplush.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_magicarpplush.png
new file mode 100644 (file)
index 0000000..17ee679
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_magicarpplush.png differ

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png
new file mode 100644 (file)
index 0000000..13988bf
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png differ

diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
index 28617ac255b2d9d64081132a6f60f60277fc2841..7e5a11d313ded1566dac76215b661eacda214367 100644 (file)
--- a/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428, cart_goldenplunger modified from cart_plunger by TiniestShark (github)",
     "states": [
         {
             "name": "cart",
@@ -55,6 +55,10 @@
             "name": "cart_plunger",
             "directions": 4
         },
+        {
+            "name": "cart_goldenplunger",
+            "directions": 4
+        },
         {
             "name": "icon-cart"
         },