From b9d9f01d3938946901b1c425624e34898ee3f315 Mon Sep 17 00:00:00 2001 From: Swept Date: Thu, 15 Apr 2021 21:21:10 +0000 Subject: [PATCH] Cleans up janitorial content (#3802) * Initial * Adds a drawdepth for hydroponics * Maps 2 buckets in * Moved the bucket into it's own yaml * tg sprites for bucket and you can put it on your head now * Cleanup timegit add . ! * Applied Reviews * Attempts to revert the changes to Saltern --- .../Constructible/Specific/hydroponics.yml | 2 + .../Objects/Specific/Janitorial/janitor.yml | 62 ++++ .../Objects/Specific/Janitorial/soap.yml | 93 ++++++ .../Objects/Specific/Janitorial/spray.yml | 85 +++++ .../Objects/Specific/Janitorial/trashbag.yml | 32 ++ .../Entities/Objects/Specific/janitor.yml | 293 ------------------ .../Entities/Objects/Tools/bucket.yml | 32 ++ .../Entities/Objects/Tools/light_replacer.yml | 19 ++ .../Janitorial/janitorial.rsi/bucket.png | Bin 228 -> 0 bytes .../janitorial.rsi/bucket_water.png | Bin 142 -> 0 bytes .../Janitorial/janitorial.rsi/inhand-left.png | Bin 0 -> 339 bytes .../janitorial.rsi/inhand-right.png | Bin 0 -> 342 bytes .../Janitorial/janitorial.rsi/meta.json | 16 +- .../Specific/Janitorial/mop.rsi/meta.json | 23 +- .../soap.rsi/deluxe-inhand-left.png | Bin 0 -> 286 bytes .../soap.rsi/deluxe-inhand-right.png | Bin 0 -> 294 bytes .../soap.rsi/{soapdeluxe.png => deluxe.png} | Bin .../Janitorial/soap.rsi/gibs-inhand-left.png | Bin 0 -> 290 bytes .../Janitorial/soap.rsi/gibs-inhand-right.png | Bin 0 -> 298 bytes .../soap.rsi/{soapgibs.png => gibs.png} | Bin .../Janitorial/soap.rsi/inhand-left.png | Bin 0 -> 283 bytes .../Janitorial/soap.rsi/inhand-right.png | Bin 0 -> 291 bytes .../Specific/Janitorial/soap.rsi/meta.json | 108 +++++-- .../Janitorial/soap.rsi/nt-inhand-left.png | Bin 0 -> 279 bytes .../Janitorial/soap.rsi/nt-inhand-right.png | Bin 0 -> 287 bytes .../soap.rsi/{soapnt.png => nt.png} | Bin .../Janitorial/soap.rsi/omega-inhand-left.png | Bin 0 -> 202 bytes .../soap.rsi/omega-inhand-right.png | Bin 0 -> 294 bytes .../soap.rsi/{soapomega.png => omega.png} | Bin .../soap.rsi/syndie-inhand-left.png | Bin 0 -> 283 bytes .../soap.rsi/syndie-inhand-right.png | Bin 0 -> 294 bytes .../soap.rsi/{soapsyndie.png => syndie.png} | Bin .../Janitorial/trashbag.rsi/blue-icon-0.png | Bin 0 -> 216 bytes .../Janitorial/trashbag.rsi/blue-icon-1.png | Bin 0 -> 242 bytes .../Janitorial/trashbag.rsi/blue-icon-2.png | Bin 0 -> 265 bytes .../Janitorial/trashbag.rsi/blue-icon-3.png | Bin 0 -> 278 bytes .../trashbag.rsi/blue-inhand-left.png | Bin 0 -> 373 bytes .../trashbag.rsi/blue-inhand-right.png | Bin 0 -> 389 bytes .../Specific/Janitorial/trashbag.rsi/icon.png | Bin 529 -> 0 bytes .../Janitorial/trashbag.rsi/inhand-left.png | Bin 0 -> 369 bytes .../Janitorial/trashbag.rsi/inhand-right.png | Bin 0 -> 385 bytes .../Janitorial/trashbag.rsi/meta.json | 73 +++-- .../Janitorial/wet_floor_sign.rsi/meta.json | 23 +- .../Tools/bucket.rsi/equipped-HELMET.png | Bin 0 -> 357 bytes .../Objects/Tools/bucket.rsi/icon.png | Bin 0 -> 220 bytes .../Objects/Tools/bucket.rsi/inhand-left.png | Bin 0 -> 302 bytes .../Objects/Tools/bucket.rsi/inhand-right.png | Bin 0 -> 393 bytes .../Objects/Tools/bucket.rsi/meta.json | 26 ++ RobustToolbox | 2 +- 49 files changed, 530 insertions(+), 359 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml delete mode 100644 Resources/Prototypes/Entities/Objects/Specific/janitor.yml create mode 100644 Resources/Prototypes/Entities/Objects/Tools/bucket.yml create mode 100644 Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml delete mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/bucket.png delete mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/bucket_water.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-inhand-right.png rename Resources/Textures/Objects/Specific/Janitorial/soap.rsi/{soapdeluxe.png => deluxe.png} (100%) create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-inhand-right.png rename Resources/Textures/Objects/Specific/Janitorial/soap.rsi/{soapgibs.png => gibs.png} (100%) create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-inhand-right.png rename Resources/Textures/Objects/Specific/Janitorial/soap.rsi/{soapnt.png => nt.png} (100%) create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-inhand-right.png rename Resources/Textures/Objects/Specific/Janitorial/soap.rsi/{soapomega.png => omega.png} (100%) create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-inhand-right.png rename Resources/Textures/Objects/Specific/Janitorial/soap.rsi/{soapsyndie.png => syndie.png} (100%) create mode 100644 Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-0.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-1.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-2.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-3.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-inhand-right.png delete mode 100644 Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/icon.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/bucket.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/Objects/Tools/bucket.rsi/icon.png create mode 100644 Resources/Textures/Objects/Tools/bucket.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/bucket.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/bucket.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml index f72b2ca022..e6fa7387bc 100644 --- a/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml +++ b/Resources/Prototypes/Entities/Constructible/Specific/hydroponics.yml @@ -37,6 +37,7 @@ - type: Sprite sprite: Constructible/Hydroponics/misc.rsi state: soil + drawdepth: FloorObjects - type: PlantHolder drawWarnings: false - type: SolutionContainer @@ -70,5 +71,6 @@ - type: Sprite sprite: Constructible/Hydroponics/containers.rsi state: hydrotray3 + drawdepth: FloorObjects - type: PlantHolder drawWarnings: true diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml new file mode 100644 index 0000000000..f518bfcd67 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -0,0 +1,62 @@ +# TODO: Add description (1) +- type: entity + parent: BaseItem + name: mop + id: MopItem + description: A mop that can't be stopped, viscera cleanup detail awaits. + components: + - type: Sprite + sprite: Objects/Specific/Janitorial/mop.rsi + state: mop + - type: Item + size: 10 + sprite: Objects/Specific/Janitorial/mop.rsi + - type: Mop + - type: SolutionContainer + maxVol: 10 + +- type: entity + name: mop bucket + id: MopBucket + description: Holds water and the tears of the janitor. + suffix: Full + components: + - type: Clickable + - type: Sprite + sprite: Objects/Specific/Janitorial/janitorial.rsi + layers: + - state: mopbucket + - state: mopbucket_water + drawdepth: Objects + - type: InteractionOutline + - type: Bucket + - type: SolutionContainer + maxVol: 500 + contents: + reagents: + - ReagentId: Water + Quantity: 500 + - type: Physics + bodyType: Dynamic + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.40,-0.25,0.25,0.25" + mass: 20 + mask: + - Impassable + layer: + - Opaque + - type: Pullable + +- type: entity + name: wet floor sign + id: WetFloorSign + parent: BaseItem + description: Caution! Wet Floor! + components: + - type: Sprite + sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi + state: caution + - type: Item + sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml new file mode 100644 index 0000000000..1692f32614 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -0,0 +1,93 @@ +- type: entity + name: soap + id: Soap + parent: BaseItem + description: A cheap bar of soap. Doesn't smell. + components: + - type: Sprite + sprite: Objects/Specific/Janitorial/soap.rsi + state: soap + - type: Item + sprite: Objects/Specific/Janitorial/soap.rsi + - type: Slippery + paralyzeTime: 2 + intersectPercentage: 0.2 + - type: CollisionWake + enabled: false + - type: Physics + bodyType: Dynamic + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.4,0.3,0.4" + name: "slips" + hard: false + layer: + - SmallImpassable + - shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.4,0.3,0.4" + mass: 5 + mask: + - SmallImpassable + +- type: entity + name: soap + id: SoapNT + parent: Soap + description: A Nanotrasen brand bar of soap. Smells of plasma. + components: + - type: Sprite + state: nt + - type: Item + HeldPrefix: nt + +- type: entity + name: soap + id: SoapDeluxe + parent: Soap + description: A deluxe Waffle Co. brand bar of soap. Smells of condoms. + components: + - type: Sprite + state: deluxe + - type: Item + HeldPrefix: deluxe + +- type: entity + name: soap + id: SoapSyndie + parent: Soap + description: An untrustworthy bar of soap. Smells of fear. + components: + - type: Sprite + state: syndie + - type: Slippery + paralyzeTime: 5 + - type: Item + HeldPrefix: syndie + +- type: entity + name: soap + id: SoapHomemade + parent: Soap + description: A homemade bar of soap. Smells of... well.... + components: + - type: Sprite + state: gibs + - type: Slippery + paralyzeTime: 2 + - type: Item + HeldPrefix: gibs + +- type: entity + name: omega soap + id: SoapOmega + parent: Soap + description: The most advanced soap known to mankind. Smells of bluespace. + components: + - type: Sprite + state: omega + - type: Slippery + paralyzeTime: 7 + - type: Item + HeldPrefix: omega diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml new file mode 100644 index 0000000000..5241d2d310 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml @@ -0,0 +1,85 @@ +- type: entity + name: spray bottle + id: SprayBottle + parent: BaseItem + suffix: Empty + description: A spray bottle with an unscrewable top. + components: + - type: Sprite + netsync: false + sprite: Objects/Specific/Janitorial/janitorial.rsi + state: cleaner + - type: Item + sprite: Objects/Specific/Janitorial/janitorial.rsi + - type: SolutionContainer + maxVol: 100 + caps: Refillable, Drainable + - type: SolutionTransfer + transferAmount: 5.0 + - type: Spillable + - type: ItemCooldown + - type: Spray + transferAmount: 10 + sprayVelocity: 2 + spraySound: /Audio/Effects/spray2.ogg + +- type: entity + name: spray bottle + id: SprayBottleWater + suffix: Filled + parent: SprayBottle + components: + - type: SolutionContainer + maxVol: 100 + contents: + reagents: + - ReagentId: Water + Quantity: 100 + +- type: entity + name: space cleaner + description: BLAM!-brand non-foaming space cleaner! + id: SprayBottleSpaceCleaner + parent: SprayBottle + suffix: "" + components: + - type: SolutionContainer + maxVol: 100 + contents: + reagents: + - ReagentId: SpaceCleaner + Quantity: 100 + +# Vapor + +- type: entity + id: Vapor + name: "vapor" + abstract: true + components: + - type: SnapGrid + offset: Center + - type: SolutionContainer + maxVol: 50 + - type: Vapor + - type: AnimationPlayer + - type: Sprite + netsync: false + sprite: Effects/chempuff.rsi + layers: + - state: chempuff + map: [ "enum.VaporVisualLayers.Base" ] + - type: Physics + bodyType: KinematicController + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + hard: false + mask: + - Impassable + - MobImpassable + - SmallImpassable + - type: Appearance + visuals: + - type: VaporVisualizer diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml new file mode 100644 index 0000000000..b325f2d340 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/trashbag.yml @@ -0,0 +1,32 @@ +- type: entity + name: trash bag + id: TrashBag + parent: BaseItem + components: + - type: Sprite + sprite: Objects/Specific/Janitorial/trashbag.rsi + state: icon-3 + - type: Item + sprite: Objects/Specific/Janitorial/trashbag.rsi + - type: Storage + capacity: 125 + quickInsert: true + areaInsert: true + storageSoundCollection: trashBagRustle + +- type: entity + name: trash bag + id: TrashBagBlue + parent: BaseItem + components: + - type: Sprite + sprite: Objects/Specific/Janitorial/trashbag.rsi + state: blue-icon-3 + - type: Item + sprite: Objects/Specific/Janitorial/trashbag.rsi + HeldPrefix: blue + - type: Storage + capacity: 125 + quickInsert: true + areaInsert: true + storageSoundCollection: trashBagRustle diff --git a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/janitor.yml deleted file mode 100644 index da5dff0f2e..0000000000 --- a/Resources/Prototypes/Entities/Objects/Specific/janitor.yml +++ /dev/null @@ -1,293 +0,0 @@ -# TODO: Add description (1) -- type: entity - parent: BaseItem - name: mop - id: MopItem - description: A mop that can't be stopped, viscera cleanup detail awaits. - components: - - type: Sprite - sprite: Objects/Specific/Janitorial/mop.rsi - state: mop - - type: Item - size: 10 - sprite: Objects/Specific/Janitorial/mop.rsi - - type: Mop - - type: SolutionContainer - maxVol: 10 - -- type: entity - name: mop bucket - id: MopBucket - description: Holds water and the tears of the janitor. - suffix: Full - components: - - type: Clickable - - type: Sprite - sprite: Objects/Specific/Janitorial/janitorial.rsi - layers: - - state: mopbucket - - state: mopbucket_water - drawdepth: Objects - - type: InteractionOutline - - type: Bucket - - type: LoopingSound - - type: SolutionContainer - maxVol: 500 - contents: - reagents: - - ReagentId: Water - Quantity: 500 - - - type: Physics - bodyType: Dynamic - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.40,-0.25,0.25,0.25" - mass: 5 - mask: - - Impassable - - Opaque - layer: - - Opaque - - type: Pullable - -- type: entity - parent: BaseItem - name: bucket - id: Bucket - description: It's a boring old bucket. - components: - - type: Clickable - - type: Sprite - sprite: Objects/Specific/Janitorial/janitorial.rsi - layers: - - state: bucket - - state: bucket_water - drawdepth: Objects - - type: Bucket - - type: LoopingSound - - type: SolutionContainer - maxVol: 500 - - type: Physics - bodyType: Dynamic - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.25,0.25,0.25" - mass: 5 - mask: - - Impassable - - type: Spillable - -- type: entity - name: wet floor sign - id: WetFloorSign - parent: BaseItem - description: Caution! Wet Floor! - components: - - type: Sprite - sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi - state: caution - - type: Item - sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi - -- type: entity - name: soap - id: Soap - parent: BaseItem - description: A cheap bar of soap. Doesn't smell. - components: - - type: Sprite - sprite: Objects/Specific/Janitorial/soap.rsi - state: soap - - type: Item - sprite: Objects/Specific/Janitorial/soap.rsi - - type: Slippery - paralyzeTime: 2 - intersectPercentage: 0.2 - - type: CollisionWake - enabled: false - - type: Physics - bodyType: Dynamic - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - name: "slips" - hard: false - layer: - - SmallImpassable - - shape: - !type:PhysShapeAabb - bounds: "-0.3,-0.4,0.3,0.4" - mass: 5 - mask: - - SmallImpassable - -- type: entity - name: soap - id: SoapNT - parent: Soap - description: A Nanotrasen brand bar of soap. Smells of plasma. - components: - - type: Sprite - state: soapnt - -- type: entity - name: soap - id: SoapDeluxe - parent: Soap - description: A deluxe Waffle Co. brand bar of soap. Smells of condoms. - components: - - type: Sprite - state: soapdeluxe - -- type: entity - name: soap - id: SoapSyndie - parent: Soap - description: An untrustworthy bar of soap. Smells of fear. - components: - - type: Sprite - state: soapsyndie - - type: Slippery - paralyzeTime: 5 - -- type: entity - name: soap - id: SoapHomemade - parent: Soap - description: A homemade bar of soap. Smells of... well.... - components: - - type: Sprite - state: soapgibs - - type: Slippery - paralyzeTime: 2 - -- type: entity - name: omega soap - id: SoapOmega - parent: Soap - description: The most advanced soap known to mankind. Smells of bluespace. - components: - - type: Sprite - state: soapomega - - type: Slippery - paralyzeTime: 7 - -- type: entity - id: Vapor - name: "vapor" - abstract: true - components: - - type: SnapGrid - offset: Center - - type: SolutionContainer - maxVol: 50 - - type: Vapor - - type: AnimationPlayer - - type: Sprite - sprite: Effects/chempuff.rsi - layers: - - state: chempuff - map: [ "enum.VaporVisualLayers.Base" ] - - type: Physics - bodyType: KinematicController - fixtures: - - shape: - !type:PhysShapeAabb - bounds: "-0.25,-0.25,0.25,0.25" - hard: false - mask: - - Impassable - - MobImpassable - - SmallImpassable - - type: Appearance - visuals: - - type: VaporVisualizer - -- type: entity - name: spray bottle - id: SprayBottle - parent: BaseItem - suffix: Empty - description: A spray bottle with an unscrewable top. - components: - - type: Sprite - sprite: Objects/Specific/Janitorial/janitorial.rsi - state: cleaner - - type: SolutionContainer - maxVol: 100 - caps: Refillable, Drainable - - type: SolutionTransfer - transferAmount: 5.0 - - type: Spillable - - type: ItemCooldown - - type: Spray - transferAmount: 10 - sprayVelocity: 2 - spraySound: /Audio/Effects/spray2.ogg - -- type: entity - name: spray bottle - id: SprayBottleWater - suffix: Filled - parent: SprayBottle - components: - - type: SolutionContainer - maxVol: 100 - contents: - reagents: - - ReagentId: Water - Quantity: 100 - -- type: entity - name: space cleaner - description: BLAM!-brand non-foaming space cleaner! - id: SprayBottleSpaceCleaner - parent: SprayBottle - suffix: "" - components: - - type: SolutionContainer - maxVol: 100 - contents: - reagents: - - ReagentId: SpaceCleaner - Quantity: 100 - - -- type: entity - name: trash bag - id: TrashBag - parent: BaseItem - components: - - type: Sprite - sprite: Objects/Specific/Janitorial/trashbag.rsi - state: icon - - type: Storage - capacity: 125 - quickInsert: true - areaInsert: true - storageSoundCollection: trashBagRustle - -- type: entity - parent: BaseItem - name: light replacer - id: LightReplacer - description: An item which uses magnets to easily replace broken lights. - components: - - type: Sprite - sprite: Objects/Specific/Janitorial/light_replacer.rsi - state: icon - - type: Item - sprite: Objects/Specific/Janitorial/light_replacer.rsi - - type: LightReplacer - contents: - - name: LightTube - amount: 8 - type: Tube - - name: LightBulb - amount: 5 - type: Bulb - diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml new file mode 100644 index 0000000000..893a9baaa2 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml @@ -0,0 +1,32 @@ +- type: entity + parent: BaseItem + id: Bucket + name: bucket + description: It's a boring old bucket. + components: + - type: Drink + isOpen: true + - type: Clickable + - type: Sprite + netsync: false + sprite: Objects/Tools/bucket.rsi + state: icon + - type: Clothing + sprite: Objects/Tools/bucket.rsi + Slots: + - Helmet + - type: Bucket + - type: SolutionContainer + maxVol: 500 + - type: SolutionTransfer + transferAmount: 50 + - type: Physics + bodyType: Dynamic + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + mass: 5 + mask: + - Impassable + - type: Spillable diff --git a/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml new file mode 100644 index 0000000000..4eb4e78b29 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml @@ -0,0 +1,19 @@ +- type: entity + parent: BaseItem + name: light replacer + id: LightReplacer + description: An item which uses magnets to easily replace broken lights. + components: + - type: Sprite + sprite: Objects/Specific/Janitorial/light_replacer.rsi + state: icon + - type: Item + sprite: Objects/Specific/Janitorial/light_replacer.rsi + - type: LightReplacer + contents: + - name: LightTube + amount: 8 + type: Tube + - name: LightBulb + amount: 5 + type: Bulb diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/bucket.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/bucket.png deleted file mode 100644 index e4510dbe16f28a7662a6e6da29ccd98a22cd18e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvl>na**8>L**aTITEj%>;$V0zG z_oRv_vw|Go_6;WP-Zy)tUY%ob&F#7L>h39^dd89YmS~d!+RWhT>gTe~DWM4f+ksAG diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/bucket_water.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/bucket_water.png deleted file mode 100644 index 5f97bfaa5ec52b7ed32c8892a52ec730e0ae8353..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(i*8>L**aTJiCA#a^wsNdI z%dq{b|CJB28NV(76)=_r`2{mLJiCzwVS)S0G*Q%k+OHL(YuZGynf@ zee<8;%ztNR=djXp?#nX&fzpg6L4Lsu4$p3+0XaEUArU1msl~}fnFS@8`FRWs6?1~a z3W`d_>gDYBM8I{GvxDt*Xa$;0to1r7Z%p~w8VGWm%z?+mc zTwDTglGfzC$T*PF+Z1TPHG#3uh>7vRQdYf&#XSxTGN~*~3Hr(tcsLH|pFc3i!NZY} fk#%t@%SvE432>Zfkt}Ed+RWhT>gTe~DWM4f1FLn! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3757bcdf6e1e747014d3b9dcf4597e473708c422 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e=>VS)*Z=?j*ZVU4pUIFjWA@Dd z|6AYuXE^iU+1WX)wEX#OlSe>hj3q&S!3+-1ZlnP@IaMJMB`&GO$wiq3C7Jno3=9=> zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5 zQiwvZrlq>6q5f8n&TeDX%_}69^mZGs)i5*{J!1AGD6HUXF{3mOL-}f{7jKuax&!Sk z^mK6y@#suWkYGK`!@>1HJT>IdDhCh2b16r%^d@N-hp~DrQe(RzqR`EjY^=c0Il0Hz zkx6K|#Ox*}mfedPXG?GB?rRD(C}LQwz{u*6%E;HSmBW!Of}26*z#E?vEMZP=8w7(6 k_&G4Tvn!hSFflPO=>2EE@kZdpETH8Kp00i_>zopr0AMwG5&!@I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json index 18cd89285b..80d57ef5eb 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/meta.json @@ -1,16 +1,12 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 }, "states": [ - { - "name": "bucket" - }, - { - "name": "bucket_water" - }, { "name": "cleaner" }, @@ -19,6 +15,14 @@ }, { "name": "mopbucket_water" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json index 4301060d22..63ecea88bf 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/mop.rsi/meta.json @@ -1 +1,22 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "mop", "delays": [[1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "mop" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2b705e1c69487671c205121b89aa214cd96e0b9e GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(iS0KHpx%m0{gB@8>m)6fY zKDXlJy!KV52Wx>6j3q&S!3+-1ZlnP@`BfniB`&GO$wiq3C7Jno3=9=>g2M`mO22;z zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=1GR4p57f6#zDrHjlC4+JeqW5QiwwEN(=jq z3aX~dwmdKI;Vst03N<%_W%F@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9488bb8d1d3208e2f8ad552a1439e669f488d118 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(i*Z=?j&#BIQe*R!bR@9~S zbB@ogI61HV=rPfKKn08?L4Lsu4$p3+0Xg|qArU1msl~}fnFS@8`FRWs6?1~a3W`d< ze+e%5`1OgFx31Q?Gv|Xhgc@8le(*@=ypQHdhN7O{9Tvtx#+Qw~6y`jdbYxP9Lhwop z`;7{!rpvb|g?4rut8QK)v1D?$@mdW-bI~JaPlCbVS)S0Ft(Iqq#zP@SRb>7JhJ zElszz#cxIX-EXZv#^wADD9u#5>eukTAW;zSx}OhpU1#ZF(){z zps4iwm*9erU!Q1s>uQ}lb3S-OsKG_!2aj~l`)HnIDC+6mVPPC(eA(DbVa}sTM<#_R z1h2HP->6_~yfUJ*+gNq;3W+8C-NtJ*49!K4m^}#!EBIQ>IGcxIPPBB|OZ#7~K#OfW zT^vI^I+GJ5SQjU}U~)^9U~XrcW>CT=l~C@QzJT$WTgfpEkQ@h7Oe>4b11*&Y4B?85 e?8<8VS)*Z=?jPfm_|n-o-MsCv4m z=Xy)iZEf*e(SG+^tF@f6KLeF9mIV0)GdMiEkp|@CR)s{AxTF>*7iAWdWaj5FFjUM5 z4l5`s{r)Am;N#aPTHd-^=gyoD-VkbV(fGk5o%24LCmD)*dUseD2N_>B_EMPhXws2M zAqv4OE$lZc*cz{l=E7BkM~VVDywo%YiHS1ZtB z7f%<*5RcB}1PRu~2^>srscQ}~6^MCDgt4yUG!WaZ9mcB4XdqUs9L6ff6w&H_P(y;X qnN#4*@{Uam><&{{Ee>?(b2G^NWw|K$@XBJKc?_PeelF{r5}E)3u4*6v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soapgibs.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs.png similarity index 100% rename from Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soapgibs.png rename to Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs.png diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..d6478b2984a017821b4b91ba2ce86c12f792f78a GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ei2$DvS0EkS7nZ-fCU-$W@xj6+ zr)e_1!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9#$F0@9!)wjDMTT7rG@=Qh4n6- z-Nve$S4b@B?lxYlVQ4OT#Oz5>Si#p~#@XBqF~(AhV_P@(0j;(1ba4#v=uA$KU|pQ> zg2~NQg1Mb3Exd$n7pLM29+Lwp9p^wYB0P=_t0y!t$F#B>Vv%WOk?Gms#KfSro@wf} Tvlp#_<}i4=`njxgN@xNANkU@y literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c5827e19cd7790ff919f3fe738643400ae07f8c0 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ep#Yx{*Z=?jXJ=IPbS-&s|M`Y> z2aX-Rcy!%yF`z7CNswPKgTu2MX+TbPRY*jMOKNd)QD#9&W_}(6L&conu!5q}?_Yuo zK7M_o<*loA?#%h%4WR}XjUPPHIq#!+lA)-lcZY>>knv?>FNHaeCLNg+q7b~&!hWN| zdY8^_W7W+oB$jk{8?V(cG#5Q$_9Q5*;A=7CY;J}aW2wclt(*IR*1CAQIEHw1CMQU+ zE>7TJa&ujCh^atqvvwG(8e@U5(*`Yp(uR#Qcs6PUh#kq@IVCOo8)q-J> g&H+ZZnn(r)?Koy_CYuSDf#xxIy85}Sb4q9e0A4U>B>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soapnt.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt.png similarity index 100% rename from Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soapnt.png rename to Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt.png diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..116e5ff355c11e4342d8d72d81280ff04b78a701 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=6FprVLn`LHy|r7k*+78hz+uq< zUR4LjD~`@n9A&>Ku&ZsGKe5GrmZwOj{=`MMff^VX6mHL(rn*bc$w8p?VWjo~ zDKCasjaEA%_);UL|_Amdr?pZzTb4Tm4MTAq~x>H~pzQud}gDs6eK0VWZn?r_Ms?q(K zY5a`8uGh{@T(!l9@u%Pqb`gaMiXyBWDIBhhOp;E44GwJq#0y<{#uQ{Vb+19q#!Aay yd+NjOjXz9&n$elgX18ri{dIe7plk0LZZ>B8wr72HPW3d9>pfllT-G@yGywqicx?>; literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soapomega.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega.png similarity index 100% rename from Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soapomega.png rename to Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega.png diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a7ef2bbf4d7a09a0ea25170de7ab784575a56b71 GIT binary patch literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ep#Yx{S0Fv#*Z0oGjT4=m&Q(^P z?&%3LsapsXWh@Eu3ubV5b|VeQ$*&5DC~-+GPAM56C74hRQml(aKXo~ zPqe&swa%S6AG{&d;G*$^M>^+yG*2=V_4MwrFb*=lZ0w~l=h37ilR^}NS6bL_T(HAP zU)4CYv)fp8^9qS2le>-AY8aY}9x;0o6jt!Hm~l2Q!{e1QzE^cKc!5^ic)B=-cyuNw zNU$zWc){eBD#6^&G)=P@u;%n1%FC@TH_ zCAi?@*C$%ux?1PXoDbd*YH-o`!6TjXKAI;Pih6o?SQrNxUpDqqnDc1Tkx3y6!7DB7 zH!j#=q_1im+SzTax_O1flF8l1Yc&kbMUR+02?{ItTFf|`m*MeB8Q-hA8N5KNT|8YJ zLp(Z@6C_v{CvY&irLH-|R3PRp5XQQW%RnrcBaC$wpMltHr7%`crifPegBlX7&71;f nmUnDoV0W0pYH^@LpPM1!B=dykS)xmT<}rA>`njxgN@xNAUnFL& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soapsyndie.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie.png similarity index 100% rename from Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soapsyndie.png rename to Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie.png diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-0.png b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-0.png new file mode 100644 index 0000000000000000000000000000000000000000..7cfc89fa66fce2e8f00f59ee550081753b56e4cb GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)*8>L*2qt&gu75W3>L#>rX;q3=ruI)>DK`v(S MboFyt=akR{0Kzj$ga7~l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-1.png b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-1.png new file mode 100644 index 0000000000000000000000000000000000000000..e629ae8013bc82401c25c0ed69b2b58741d41a11 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)*8>L*2qt&gu75W3>LlTI9v>QV~mNLxKYX_oe#sVo7kXQl?S9+^5N;46o= z=3*`mP0@uChccEdY0(Q<@}xs6An0Dl8{zLo--Y;9Y=z|XGMM!Ap6bb-VA9po(_rcm nlGT&da8%=9Sut-R3j;&d3E{E=mY_hOgBUzr{an^LB{Ts5+bB;2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-2.png b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-2.png new file mode 100644 index 0000000000000000000000000000000000000000..bccf0b4657237af6b2a37aa0a102672a22dfa393 GIT binary patch literal 265 zcmV+k0rvihP)SD`~6+Y>z+Zx(;ZkdHrqLX`Tev|F{C zXeHR5PAf+oteGU)^=2{>?61~b c_m=vRo~G0#GuMZg;{X5v07*qoM6N<$f{RvhMgRZ+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..cc6966d6db3eb5c4b379b252f246db8362b475e1 GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(iS0F8z-1Yw{gIN7Wm8Fj* zr(Ou%@!bEAauiU4u_VYZn8D%MjWi&quqq^?#3i*jxhS)sBr`vcfuUkfa9BZ6>GvSI(O!L@P<%>i^dNg>74h`Jjqbh)4RjMILP?2v6sS}N0W|B3Q-8w)Ld?| zb&1AC3uR5i*v@Wa)y*p;mQ3$9UaMhfE_%f5Nl;k9*J8%md<-hbWSQJwW$y-BKGD;~ zF~p18SjN>3YhXsdjjH(1cY)&f~Lw(m=a}^AkyLi!ErrDSl46=&OPiR#13>EgQu&X J%Q~loCIHj>jS2t& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ecd930dca2ac3a0d136d9d54631b4298c2f15d30 GIT binary patch literal 389 zcmV;00eb$4P)TA0I005y$L_t(YiS3jz3d1lE1a;8|P9{+u3DWxuhO_$w>j4J;{|!kI%iMC{CPgsX zO1nECHCpGIn*L9GRCKPl>i)6;l)TYwlr zK#eJ96R0tT5G=rso0`rdIt1<>JQ5x24Z-hD;{YCkbpa1R6ulu)0JuqE?eUG}#o8l~ jvj#E%pDAGN-S6}UUAqtc+{Ixm00000NkvXXu0mjfL;9e< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/icon.png b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/icon.png deleted file mode 100644 index 329b0019c6295d8ec457b1c964c728654acb28e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmV+s0`C2ZP)*coUqFq!?GivYV3#z(-oTgH!f>${c(>Wkuj36|q!6G^jR2lNDPE|oW$Uw! z12>+=v@LLk+#w|uhr0Cbpa_M066DBL||rw5c(Vu z*#bfc{cg7dGoxu5SZmQV4PuM{@;i|20q=dW-|s<01G%;Kg#7jSt$%%f>t_>vp}2Mv zh7kIyssI4T;}PEbLP`I990nm8PvJ)~kedq7%AIqA^NleeA{b);AX~&$n@~iC>c=1=5YcK8 zt39CA>zQlCQzBxFVCF?nWOcwfH%U%JIjQmlq}y*yE+PN`W*&ZHW;o|iRn_8AEDBI^ zUA4ezwU@dfB7@i^5!oixn@&nLj@2h?kS&0j&yqJybF!55e-S~~b+h?qry$+;+G_nw zNz!9Tzw0$!*P(6OixaWffwY3Uu7?WKN>lPn@f=nkL0#7<%knJwxLS=>_|g%qx*MiR z=BiFnmgOQjuwoPH2yHf-NusgH6m8oAn0`{qTE(j_9ARk{U;RXME8P9P;341>5u_@& TfhGId00000NkvXXu0mjfe2weT diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..921ddce2419f953ca54b759f587cdd838de7940e GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e(Ey(iS0L@`>iYjFLrhFeZEbB{ zUS3a6k0Rf)R-go9NswPKgTu2MX+TbHRY*jMOKNd)QD#9&W_}(6L&conu!5q}?_Yuo zK7M_o<*loA?#%h%4WR}XjUPPHIq#!+lA)-lcZY>>knv?>FNHaeCLNg+q7b}tiN;0? zWlh7_&TeDX%_}69^miMt)i5*{J!1AGD6HUXG2?6=hFKS+qiWYbs|H#;(bL5-#G~`= zl#RR%3L>nIVhtH(4E>O1ZpHIA6ld+o@-@s^b?)ei6AhhIcpVddi%sc6fNugjGb&;(35n@Bf4LD-QDC z``~c+c5pY7>%u-35O#CyaB0z)5@nMh(&7QZaXm*^*JKOMJ?tXH4s;xYr>mdKI;Vst E00eD|fdBvi literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..53d05d2b23ff6fbde977356761f01bcbc8739366 GIT binary patch literal 385 zcmV-{0e=38P)s?&eSLjyZf=Z>j70NvxBvhE0d!JMQvg8b*k%9#0Bw3ySad{Xb7OL8aCB*J zZU6vyoKseCa&`CgQ*iP1LEPujYFI z005y$L_t(YiS3jz3d1lE1a;8|P9{+u3DWxuhO_$w>j4J;{|!kI%iMC{CPgsXO1nEC zHCpGIn*L9GRCKPl>i)6;l)TYwlrK#eJ9 z6R0tT5G=rso0`rdIt1<>JQ5x24Z-hD;{YCkbpa1R6ulu)0JuqE?eUG}#o8l~vj#E% fpDAGN-S6}UUAqtc+{Ixm00000NkvXXu0mjfDj1*T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/meta.json index 4c99ff9d2c..7392d46542 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/meta.json @@ -1,26 +1,51 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-0" }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/trash.dmi", - "states": [ - { - "name": "icon" - }, - { - "name": "icon-0" - }, - { - "name": "icon-1" - }, - { - "name": "icon-2" - }, - { - "name": "icon-3" - } - ] -} \ No newline at end of file + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "blue-icon-0" + }, + { + "name": "blue-icon-1" + }, + { + "name": "blue-icon-2" + }, + { + "name": "blue-icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "blue-inhand-left", + "directions": 4 + }, + { + "name": "blue-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json index 4f52b31a49..ce594e4e7b 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json @@ -1 +1,22 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "caution", "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "caution" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Tools/bucket.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Tools/bucket.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..667d2d02d63fad1d7f2e961ac83dede086e1d246 GIT binary patch literal 357 zcmV-r0h<1aP)GC)ttc@!6~s2=QdV&Fa{-$R09eEtj24zdxc~qF zheKl(7wfAP_}A4Yg-sPaJ`S33LE9I2-pLL9`N(6AKdxUiZ#-L>hn#MT9%4 zW3=laxti_b1;=&{xa<{yA(DgeN5tg?=nzc8LPolfvqMV zU?%c{Lk$dy930;>1ktrZ5IHnbw5a)nv*2me>9oKBGRPkND_7Oz00000NkvXXu0mjf D2f2!u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/bucket.rsi/icon.png b/Resources/Textures/Objects/Tools/bucket.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dec8f46e8dd7b5464d88ff9854e0f20cd136e2a5 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv^#Gp`*8>L*EM2;E;>3wXMMWVY zAxDlJ5!CTyh@8ogv5BGljD>}TgM$M@>(fT5*_=Qvj3q&S!3+-1ZlnP@$(}BbAsQ2t z6C|EEoM4!$f8s!o(jkr`IwzPIb22k|_&k^rU&*_q$w1`z$E27A z)do!522AD0AHBQU%*kECyxZOVKthk8^2dwy5ug6f@#5G&<G;WE?#E4bKU&d*Pk;d z^K_c1Cak}Ie5Wx>kdDLB{OQ+^nv})v-*zP_r9(xN@$1f1+x-bWJ@J#)tXg+FlGk5< z)3@iM%FasX`ED36Lu_Vfkp1*l)uYH@QgDVm<6p*l1NMCHT9$KskG^}AnN0J}kazs4 tDsaO+;1?6icR`VOCaqw3#trUXE3KO|lQV5X<{ko>vd$@?2>@^$b)WzM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/bucket.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/bucket.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..92a37e12b9d5f834c53a0cafc7e096262cf15acf GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU<~kdaSW-L^Y+%++(QlmZ4YCo zur1)%+MvCF`JJYA`8t_JOPbamxWcHKvqeM9e%97Kfs zV4mlcKGWwl|9mv3w%#b6d)jN==i?f3S$i8k9)GOm@9J^$_dfCMv466Sn&Xyutp2K2 zum5cI)#qychudE=&pM@-t1lKXXIsAc{pq`}$9Mhs9<}Lu`+NOxGiLAoWxgXSKkr!3&4pjNA9$Rqv#RO3ea@bF&dk}h zpZq>dyz-7^{y(=4CZ3c4S4K9Y6^j^{B|`!m8hKV}9B^O@6-iKN*5Wdl;3&!}abiIi zT-mQc#;0G4y