diff --git a/Resources/Audio/Announcements/RoundEnd/oney.ogg b/Resources/Audio/Announcements/RoundEnd/oney.ogg new file mode 100644 index 00000000000..ef8626ffdf9 Binary files /dev/null and b/Resources/Audio/Announcements/RoundEnd/oney.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg new file mode 100644 index 00000000000..7c6d85ad274 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/bangindonk.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/bangindonk.ogg new file mode 100644 index 00000000000..686461b0f6c Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/bangindonk.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg new file mode 100644 index 00000000000..5a1dd608f19 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/filledwith.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/filledwith.ogg new file mode 100644 index 00000000000..8b81b4f8b5f Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/filledwith.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg new file mode 100644 index 00000000000..15733ecc251 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg new file mode 100644 index 00000000000..850881d5576 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg new file mode 100644 index 00000000000..bb42124906b Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/lottawords.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/lottawords.ogg new file mode 100644 index 00000000000..9401627c68a Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/lottawords.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg new file mode 100644 index 00000000000..f5ba46ae36c Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/pissesonme.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/pissesonme.ogg new file mode 100644 index 00000000000..b8969412b5f Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/pissesonme.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg new file mode 100644 index 00000000000..5af96ae4541 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg new file mode 100644 index 00000000000..0379d94f484 Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg differ diff --git a/Resources/Audio/Floof/Announcements/RoundEnd/whatashame.ogg b/Resources/Audio/Floof/Announcements/RoundEnd/whatashame.ogg new file mode 100644 index 00000000000..4cc40c8260f Binary files /dev/null and b/Resources/Audio/Floof/Announcements/RoundEnd/whatashame.ogg differ diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 5506caf6099..07e08e63478 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -30,6 +30,9 @@ ClothingHeadHatPumpkin: 2 ClothingHeadHatShrineMaidenWig: 2 ClothingOuterSuitShrineMaiden: 2 + ClothingHeadHatWitch1: 2 # Floof - Witch + ClothingHeadHatWitch: 2 # Floof - Witch + ClothingOuterSuitWitchRobes: 2 # Floof - Witch Gohei: 2 ClothingHeadHatRedRacoon: 2 ClothingOuterRedRacoon: 2 @@ -90,6 +93,7 @@ ClothingMaskNeckGaiterRed: 2 ClothingNeckBellCollar: 2 ClothingOuterUnathiRobe: 1 + ClothingNeckCloakRedHood: 1 # Floofstation - Red Cloak # Floofstation - Departmental Socks ect ClothingUniformMusicianThong: 2 ClothingUnderSocksMusician: 2 diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml new file mode 100644 index 00000000000..26d5a555f65 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Head/hoods.yml @@ -0,0 +1,16 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodRedHood + name: Red Hood + description: A hood of a red cloak, made to keep the harsh light out of a traveler's eyes. Sometimes it sparkles in the light of the sun. + components: + - type: Sprite + sprite: Floof/Clothing/Head/Hoods/redhood.rsi + - type: Clothing + sprite: Floof/Clothing/Head/Hoods/redhood.rsi + - type: Tag + tags: + - WhitelistChameleon + - type: HideLayerClothing + slots: + - Hair diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml new file mode 100644 index 00000000000..b19202b26d7 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Neck/cloaks.yml @@ -0,0 +1,16 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakRedHood + name: Red Cloak + description: A cloak made for travel and comfort. Slightly smells of cherry pie? + components: + - type: Sprite + sprite: Floof/Clothing/Neck/Cloaks/redhood.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodRedHood + requiredSlot: + - neck + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} diff --git a/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/suits.yml b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/suits.yml new file mode 100644 index 00000000000..4fefbeb07c0 --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/OuterClothing/suits.yml @@ -0,0 +1,10 @@ +- type: entity # From Upstream + parent: ClothingOuterBase + id: ClothingOuterSuitWitchRobes + name: witch robes + description: Magic is all about the spell power, ZE! + components: + - type: Sprite + sprite: Floof/Clothing/OuterClothing/Suits/witchrobe.rsi + - type: Clothing + sprite: Floof/Clothing/OuterClothing/Suits/witchrobe.rsi diff --git a/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml b/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml index cc705a5b550..1525401c478 100644 --- a/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml +++ b/Resources/Prototypes/Floof/Loadouts/Jobs/service.yml @@ -288,6 +288,21 @@ jobs: - Janitor +- type: loadout + id: LoadoutClothingNeckCloakJanitor + category: JobsServiceUncategorized + cost: 2 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - Janitor + - !type:CharacterPlaytimeRequirement + tracker: JobJanitor + min: 36000 # 10 hours + items: + - ClothingNeckCloakJanitor + #TO BE ADDED - Botanist #TO BE ADDED - Reporter diff --git a/Resources/Prototypes/Floof/Loadouts/neck.yml b/Resources/Prototypes/Floof/Loadouts/neck.yml index 482270e6dbf..93b5a9ef2ad 100644 --- a/Resources/Prototypes/Floof/Loadouts/neck.yml +++ b/Resources/Prototypes/Floof/Loadouts/neck.yml @@ -9,6 +9,17 @@ - !type:CharacterItemGroupRequirement group: LoadoutNeck2 +- type: loadout + id: LoadoutItemsNeckRedHood + category: Neck + cost: 1 + exclusive: true + items: + - ClothingNeckCloakRedHood + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutNeck2 + # Generic collars - type: loadout id: LoadoutItemsNeckBlueCollar diff --git a/Resources/Prototypes/Floof/Loadouts/outerClothing.yml b/Resources/Prototypes/Floof/Loadouts/outerClothing.yml index 9bb5ec1c9c6..d6e9f3e0a12 100644 --- a/Resources/Prototypes/Floof/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/Floof/Loadouts/outerClothing.yml @@ -87,3 +87,13 @@ requirements: - !type:CharacterItemGroupRequirement group: LoadoutOuter2 + +- type: loadout + id: LoadoutClothingOuterSuitWitchRobes + category: Outer + cost: 1 + items: + - ClothingOuterSuitWitchRobes + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutOuter2 diff --git a/Resources/Prototypes/SoundCollections/announcements.yml b/Resources/Prototypes/SoundCollections/announcements.yml index b3336f9cf82..585797c68eb 100644 --- a/Resources/Prototypes/SoundCollections/announcements.yml +++ b/Resources/Prototypes/SoundCollections/announcements.yml @@ -26,3 +26,17 @@ - /Audio/Announcements/RoundEnd/susguyeatscrew.ogg - /Audio/Announcements/RoundEnd/this_drink.ogg - /Audio/Announcements/RoundEnd/truth_imagination.ogg + - /Audio/Announcements/RoundEnd/oney.ogg + # Floof added sounds + - /Audio/Floof/Announcements/RoundEnd/bangindonk.ogg + - /Audio/Floof/Announcements/RoundEnd/haveabeautifultime.ogg + - /Audio/Floof/Announcements/RoundEnd/newroundsexy.ogg + - /Audio/Floof/Announcements/RoundEnd/seeyoulaterokay.ogg + - /Audio/Floof/Announcements/RoundEnd/dotheballsgo.ogg + - /Audio/Floof/Announcements/RoundEnd/filledwith.ogg + - /Audio/Floof/Announcements/RoundEnd/iknowwhat.ogg + - /Audio/Floof/Announcements/RoundEnd/iwishtherewassomethingmore.ogg + - /Audio/Floof/Announcements/RoundEnd/lottawords.ogg + - /Audio/Floof/Announcements/RoundEnd/theballsgothard.ogg + - /Audio/Floof/Announcements/RoundEnd/whatashame.ogg + - /Audio/Floof/Announcements/RoundEnd/TimeForANewRound.ogg diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml new file mode 100644 index 00000000000..757635444fc --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml @@ -0,0 +1,37 @@ +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakJanitor + name: janitor's cloak + description: An exquisite cloak fitting for those who save the station from messes and slips. The unsung heroes who work thanklessly while we make a mess over the bar. Pure angels of patience and an iron will! ...It's also waterproof! + components: + - type: Sprite + sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi + - type: Clothing + sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi + - type: ItemSlots + slots: + item: + name: Plunger + # insertVerbText: cloak-insert-verb + # ejectVerbText: cloak-eject-verb + whitelist: + tags: + - Plunger + - type: ItemMapper + mapLayers: + plunger: + whitelist: + tags: + - Plunger + sprite: _NF/Clothing/Neck/Cloaks/janitor.rsi + - type: Appearance + +- type: entity + id: ClothingNeckCloakJanitorFilled + parent: ClothingNeckCloakJanitor + suffix: Filled + components: + - type: ContainerFill + containers: + item: + - Plunger diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..6a090ee541c Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/icon.png b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/icon.png new file mode 100644 index 00000000000..3ac84622534 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/meta.json b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/meta.json new file mode 100644 index 00000000000..bd53e417c59 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Head/Hoods/redhood.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Goliath Cloak used as base, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875. Modified by Memeji Dankiri.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png new file mode 100644 index 00000000000..cdf97f81d12 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/icon.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/icon.png new file mode 100644 index 00000000000..9e1aebb0395 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png new file mode 100644 index 00000000000..d4fd8db4bac Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png new file mode 100644 index 00000000000..1e1008748c2 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/meta.json b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/meta.json new file mode 100644 index 00000000000..de450048eb5 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Neck/Cloaks/redhood.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Goliath Cloak used as base, original sprite by TechnoAlchemisto (https://github.com/TechnoAlchemisto) and modified sprite by FantasticFwoosh (https://github.com/FantasticFwoosh), sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875. Modified by Memeji Dankiri.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..b797c8dce44 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png new file mode 100644 index 00000000000..acdc1b394b2 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png new file mode 100644 index 00000000000..a93d4a5af03 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png new file mode 100644 index 00000000000..0ee8f623627 Binary files /dev/null and b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json new file mode 100644 index 00000000000..76513321794 --- /dev/null +++ b/Resources/Textures/Floof/Clothing/OuterClothing/Suits/witchrobe.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/pull/36039/commits/b3bd70ae925ecbe7c625f70c4c3d09d3ed2ed32a . Inhands were made for SS14 and available under the same license", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png new file mode 100644 index 00000000000..b2f820071c8 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png new file mode 100644 index 00000000000..ab239662ab5 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png new file mode 100644 index 00000000000..721476f5923 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png new file mode 100644 index 00000000000..cae5a2d0e07 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json new file mode 100644 index 00000000000..5ef8985ec58 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, edited by dvir001 on github", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "plunger" + }, + { + "name": "plunger-equipped-NECK", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png new file mode 100644 index 00000000000..978c7a77800 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger-equipped-NECK.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png new file mode 100644 index 00000000000..53f0183cf19 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/janitor.rsi/plunger.png differ diff --git a/RobustToolbox b/RobustToolbox index a9aea7027f1..ec794ce4e46 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit a9aea7027f1840c83bcaf1c973caf099745f9eed +Subproject commit ec794ce4e4693069d3b3ebf7a88ead5ff2f860e0