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 e4510dbe16..0000000000 Binary files a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/bucket.png and /dev/null differ 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 5f97bfaa5e..0000000000 Binary files a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/bucket_water.png and /dev/null differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-left.png new file mode 100644 index 0000000000..2c7a2692eb Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-left.png differ 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 0000000000..3757bcdf6e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/janitorial.rsi/inhand-right.png differ 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 0000000000..2b705e1c69 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-inhand-left.png differ 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 0000000000..9488bb8d1d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soapdeluxe.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe.png similarity index 100% rename from Resources/Textures/Objects/Specific/Janitorial/soap.rsi/soapdeluxe.png rename to Resources/Textures/Objects/Specific/Janitorial/soap.rsi/deluxe.png diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-inhand-left.png new file mode 100644 index 0000000000..5a7923426c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-inhand-right.png new file mode 100644 index 0000000000..b45d10aecd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/gibs-inhand-right.png differ 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 0000000000..d6478b2984 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/inhand-right.png new file mode 100644 index 0000000000..f31b5ffacf Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/meta.json index 83b857de0a..11e324ca7c 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/meta.json @@ -1,35 +1,77 @@ { - "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": "soap" }, - "license": "CC-BY-SA 3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at a407fc1f5c25cbce8b653c553f53be294d15b071 and https://github.com/tgstation/tgstation at 259acc8c81054d89f7b6bcd9ff702fdf587a19ed. soapomega.png modified by Zumorica", - "states": [ - { - "name": "soap", - - }, - { - "name": "soapdeluxe", - - }, - { - "name": "soapgibs", - - }, - { - "name": "soapnt", - - }, - { - "name": "soapomega", - - }, - { - "name": "soapsyndie", - - } - ] -} \ No newline at end of file + { + "name": "deluxe" + }, + { + "name": "gibs" + }, + { + "name": "nt" + }, + { + "name": "omega" + }, + { + "name": "syndie" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "deluxe-inhand-left", + "directions": 4 + }, + { + "name": "deluxe-inhand-right", + "directions": 4 + }, + { + "name": "gibs-inhand-left", + "directions": 4 + }, + { + "name": "gibs-inhand-right", + "directions": 4 + }, + { + "name": "nt-inhand-left", + "directions": 4 + }, + { + "name": "nt-inhand-right", + "directions": 4 + }, + { + "name": "omega-inhand-left", + "directions": 4 + }, + { + "name": "omega-inhand-right", + "directions": 4 + }, + { + "name": "syndie-inhand-left", + "directions": 4 + }, + { + "name": "syndie-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-inhand-left.png new file mode 100644 index 0000000000..fe5866f005 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-inhand-left.png differ 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 0000000000..c5827e19cd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/nt-inhand-right.png differ 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 0000000000..116e5ff355 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-inhand-right.png new file mode 100644 index 0000000000..8ff1ca45d3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/omega-inhand-right.png differ 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 0000000000..a7ef2bbf4d Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-inhand-right.png new file mode 100644 index 0000000000..0c1ae48d02 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/soap.rsi/syndie-inhand-right.png differ 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 0000000000..7cfc89fa66 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-0.png differ 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 0000000000..e629ae8013 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-1.png differ 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 0000000000..bccf0b4657 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-2.png differ diff --git a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-3.png b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-3.png new file mode 100644 index 0000000000..009d2a2e02 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-icon-3.png differ 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 0000000000..cc6966d6db Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-inhand-left.png differ 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 0000000000..ecd930dca2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/blue-inhand-right.png differ 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 329b0019c6..0000000000 Binary files a/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/icon.png and /dev/null differ 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 0000000000..921ddce241 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/inhand-left.png differ 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 0000000000..53d05d2b23 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Janitorial/trashbag.rsi/inhand-right.png differ 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 0000000000..667d2d02d6 Binary files /dev/null and b/Resources/Textures/Objects/Tools/bucket.rsi/equipped-HELMET.png differ 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 0000000000..dec8f46e8d Binary files /dev/null and b/Resources/Textures/Objects/Tools/bucket.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/bucket.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/bucket.rsi/inhand-left.png new file mode 100644 index 0000000000..7d4ac07fc7 Binary files /dev/null and b/Resources/Textures/Objects/Tools/bucket.rsi/inhand-left.png differ 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 0000000000..92a37e12b9 Binary files /dev/null and b/Resources/Textures/Objects/Tools/bucket.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/bucket.rsi/meta.json b/Resources/Textures/Objects/Tools/bucket.rsi/meta.json new file mode 100644 index 0000000000..a8847188b7 --- /dev/null +++ b/Resources/Textures/Objects/Tools/bucket.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/RobustToolbox b/RobustToolbox index c1396f1c50..6cf5fdc5d6 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit c1396f1c5001ad5052376737d18d702e01d30808 +Subproject commit 6cf5fdc5d654fb3460ea5f0e0d22c238d38ec8be