tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Golden plunger Trolley and Bucket Carp (#38494)

Browse Source 
* Golden plunger and Bucket Carp

* attributions added
This commit is contained in:
Tiniest Shark
2025-07-19 11:33:01 -04:00
committed by GitHub
parent ee69f4e5b4
commit cd0960fbd7
15 changed files with 209 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/Locale/en-US/janitorial/janitorial-slot-component.ftl
View File

@@ -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

22
Resources/Prototypes/Entities/Objects/Fun/plushies.yml
View File

@@ -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

3
Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml
View File

@@ -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

20
Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
View File

@@ -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 {}

9
Resources/Prototypes/tags.yml
View File

@@ -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

BIN
Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Resources/Textures/Objects/Fun/Plushies/carp.rsi/holocarpplush-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 498 B

BIN
Resources/Textures/Objects/Fun/Plushies/carp.rsi/magicarpplush-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 535 B

126
Resources/Textures/Objects/Fun/Plushies/carp.rsi/meta.json
View File

@@ -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"
},

25
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json
View File

@@ -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"
},

BIN
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_holocarpplush.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/mopbucket_magicarpplush.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 463 B

BIN
Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/cart_goldenplunger.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 650 B

6
Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json
View File

@@ -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"
},