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
This commit is contained in:
Swept
2021-04-15 21:21:10 +00:00
committed by GitHub
parent 971ee7b1df
commit b9d9f01d39
49 changed files with 530 additions and 359 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 339 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 342 B

View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 298 B

View File

Before

Width:  |  Height:  |  Size: 773 B

After

Width:  |  Height:  |  Size: 773 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

View File

Before

Width:  |  Height:  |  Size: 630 B

After

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

View File

Before

Width:  |  Height:  |  Size: 598 B

After

Width:  |  Height:  |  Size: 598 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 294 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 389 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 529 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 369 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 385 B

View File

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

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

View File

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