Toilet Upgrade (needs review) (#22133)
* Toilet Draft * fixes * toilets now have secret stash to place items in cistern. * fixes * plungers now unblock toilets. * fix sprite * new sprites and fix * fixes * improve seat sprites. * fix * removed visualisersystem changed to genericvisualizers * flush sound for toilets and copyright for toilet sprites. * fix atrributions * fixes * fix datafield flushtime * sprite improvements * fixes * multiple changes * fix * fix * fixes remove vv * moved stash related functions to secret stash system from toilet. * fix * fix * changes for recent review. * fix * fix
This commit is contained in:
brainfood1183
GitHub
@@ -12,3 +12,13 @@
|
||||
license: "CC0-1.0"
|
||||
copyright: "Created by brittmosel"
|
||||
source: "https://freesound.org/people/brittmosel/sounds/529300/"
|
||||
|
||||
- files: ["splash.ogg"]
|
||||
license: "CC0-1.0"
|
||||
copyright: "Created by deadrobotmusic"
|
||||
source: "https://freesound.org/people/deadrobotmusic/sounds/609953/"
|
||||
|
||||
- files: ["flush.ogg"]
|
||||
license: "CC-BY-SA-3.0"
|
||||
copyright: "Created by the_toilet_guy"
|
||||
source: "https://freesound.org/people/the_toilet_guy/sounds/98770/"
|
||||
|
||||
BIN
Resources/Audio/Effects/Fluids/flush.ogg
Normal file
BIN
Resources/Audio/Effects/Fluids/flush.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Effects/Fluids/splash.ogg
Normal file
BIN
Resources/Audio/Effects/Fluids/splash.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Weapons/glug.ogg
Normal file
BIN
Resources/Audio/Weapons/glug.ogg
Normal file
Binary file not shown.
@@ -5,6 +5,7 @@ comp-secret-stash-action-hide-success = You hide { THE($item) } in { $this }
|
||||
comp-secret-stash-action-hide-container-not-empty = There's already something in here?!
|
||||
comp-secret-stash-action-hide-item-too-big = { THE($item) } is too big to fit in {$stash}!
|
||||
comp-secret-stash-action-get-item-found-something = There was something inside {$stash}!
|
||||
comp-secret-stash-on-examine-found-hidden-item = There is something hidden inside.
|
||||
|
||||
secret-stash-part-plant = the plant
|
||||
secret-stash-part-toilet = the toilet cistern
|
||||
|
||||
@@ -7,3 +7,5 @@ toilet-component-suicide-message-others = {CAPITALIZE(THE($victim))} bashes them
|
||||
toilet-component-suicide-message = You bash yourself with {THE($owner)}!
|
||||
toilet-seat-close = Close Seat
|
||||
toilet-seat-open = Open Seat
|
||||
|
||||
plunger-unblock = You unblock the {THE($target)}!
|
||||
|
||||
@@ -622,6 +622,15 @@
|
||||
damage:
|
||||
types:
|
||||
Blunt: 3
|
||||
- type: Plunger
|
||||
|
||||
- type: weightedRandomEntity
|
||||
id: PlungerLoot
|
||||
weights:
|
||||
RandomSpawner100: 56
|
||||
SpacemenFigureSpawner: 28
|
||||
SpawnMobCockroach: 5
|
||||
MaintenanceToolSpawner: 5
|
||||
|
||||
- type: entity
|
||||
parent: BaseItem
|
||||
|
||||
@@ -2,48 +2,100 @@
|
||||
name: toilet
|
||||
id: ToiletEmpty
|
||||
suffix: Empty
|
||||
parent: SeatBase
|
||||
parent: [ DisposalUnitBase, SeatBase ]
|
||||
description: The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean.
|
||||
components:
|
||||
- type: MeleeSound
|
||||
soundGroups:
|
||||
Brute:
|
||||
path:
|
||||
"/Audio/Weapons/slash.ogg"
|
||||
- type: Anchorable
|
||||
- type: Sprite
|
||||
sprite: Structures/Furniture/toilet.rsi
|
||||
state: closed_toilet_seat_up
|
||||
layers:
|
||||
- state: condisposal
|
||||
map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
|
||||
- state: disposal
|
||||
map: [ "enum.DisposalUnitVisualLayers.Base" ]
|
||||
- state: disposal-flush
|
||||
map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
|
||||
- state: dispover-charge
|
||||
map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
|
||||
- state: dispover-ready
|
||||
map: [ "enum.DisposalUnitVisualLayers.OverlayReady" ]
|
||||
- state: dispover-full
|
||||
map: [ "enum.DisposalUnitVisualLayers.OverlayFull" ]
|
||||
- state: dispover-handle
|
||||
map: [ "enum.DisposalUnitVisualLayers.OverlayEngaged" ]
|
||||
- map: [ "DoorVisualState.DoorOpen" ]
|
||||
- map: [ "SeatVisualState.SeatUp" ]
|
||||
- type: Rotatable
|
||||
- type: Transform
|
||||
noRot: false
|
||||
- type: Strap
|
||||
whitelist:
|
||||
components:
|
||||
- HumanoidAppearance
|
||||
- type: DisposalUnit
|
||||
autoEngageEnabled: false
|
||||
noUI: true
|
||||
blacklist:
|
||||
components:
|
||||
- HumanoidAppearance
|
||||
- Plunger
|
||||
- SolutionTransfer
|
||||
whitelist:
|
||||
components:
|
||||
- Item
|
||||
soundFlush: /Audio/Effects/Fluids/flush.ogg
|
||||
soundInsert: /Audio/Effects/Fluids/splash.ogg
|
||||
- type: Toilet
|
||||
- type: SecretStash
|
||||
secretPartName: secret-stash-part-toilet
|
||||
- type: ContainerContainer
|
||||
containers:
|
||||
stash: !type:ContainerSlot {}
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
drainBuffer:
|
||||
maxVol: 500
|
||||
toilet:
|
||||
maxVol: 250
|
||||
- type: Transform
|
||||
anchored: true
|
||||
disposals: !type:Container
|
||||
- type: Physics
|
||||
bodyType: Static
|
||||
- type: Construction
|
||||
graph: Toilet
|
||||
node: toilet
|
||||
- type: PlungerUse
|
||||
- type: Appearance
|
||||
- type: SecretStash
|
||||
secretPartName: secret-stash-part-toilet
|
||||
examineStash: toilet-component-on-examine-found-hidden-item
|
||||
openableStash: true
|
||||
- type: Drain
|
||||
autoDrain: false
|
||||
- type: DumpableSolution
|
||||
solution: drainBuffer
|
||||
- type: SolutionContainerVisuals
|
||||
maxFillLevels: 1
|
||||
fillBaseName: fill-
|
||||
solutionName: drainBuffer
|
||||
- type: StaticPrice
|
||||
price: 25
|
||||
- type: UserInterface
|
||||
interfaces:
|
||||
- key: enum.DisposalUnitUiKey.Key
|
||||
type: DisposalUnitBoundUserInterface
|
||||
- type: RatKingRummageable
|
||||
- type: SolutionContainerManager
|
||||
solutions:
|
||||
drainBuffer:
|
||||
maxVol: 100
|
||||
tank:
|
||||
maxVol: 500
|
||||
- type: SolutionRegeneration
|
||||
solution: tank
|
||||
generated:
|
||||
reagents:
|
||||
- ReagentId: Water
|
||||
Quantity: 1
|
||||
- type: DrainableSolution
|
||||
solution: tank
|
||||
- type: ReagentTank
|
||||
- type: DumpableSolution
|
||||
solution: drainBuffer
|
||||
- type: GenericVisualizer
|
||||
visuals:
|
||||
enum.ToiletVisuals.SeatVisualState:
|
||||
SeatVisualState.SeatUp:
|
||||
SeatUp: { state: disposal-up }
|
||||
SeatDown: { state: disposal-down }
|
||||
enum.StashVisuals.DoorVisualState:
|
||||
DoorVisualState.DoorOpen:
|
||||
DoorOpen: { state: disposal-open }
|
||||
DoorClosed: { state: disposal-closed }
|
||||
|
||||
- type: entity
|
||||
id: ToiletDirtyWater
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Structures/Piping/disposal.rsi
|
||||
snapCardinals: true
|
||||
layers:
|
||||
- state: condisposal
|
||||
map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
|
||||
@@ -19,7 +18,7 @@
|
||||
- state: disposal-charging
|
||||
map: [ "enum.DisposalUnitVisualLayers.BaseCharging" ]
|
||||
- state: disposal-flush
|
||||
map: [ "enum.DisposalUnitVisualLayers.BaseFlush" ]
|
||||
map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
|
||||
- state: dispover-charge
|
||||
map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
|
||||
- state: dispover-ready
|
||||
@@ -30,17 +29,6 @@
|
||||
map: [ "enum.DisposalUnitVisualLayers.OverlayEngaged" ]
|
||||
- type: Physics
|
||||
bodyType: Static
|
||||
- type: Fixtures
|
||||
fixtures:
|
||||
fix1:
|
||||
shape:
|
||||
!type:PhysShapeAabb
|
||||
bounds: "-0.25,-0.4,0.25,0.4"
|
||||
density: 75
|
||||
mask:
|
||||
- MachineMask
|
||||
layer:
|
||||
- MachineLayer
|
||||
- type: Destructible
|
||||
thresholds:
|
||||
- trigger:
|
||||
@@ -82,6 +70,9 @@
|
||||
parent: DisposalUnitBase
|
||||
name: disposal unit
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Structures/Piping/disposal.rsi
|
||||
snapCardinals: true
|
||||
- type: Construction
|
||||
graph: DisposalMachine
|
||||
node: disposal_unit
|
||||
@@ -100,6 +91,7 @@
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Structures/Piping/disposal.rsi
|
||||
snapCardinals: true
|
||||
layers:
|
||||
- state: conmailing
|
||||
map: [ "enum.DisposalUnitVisualLayers.Unanchored" ]
|
||||
@@ -108,7 +100,7 @@
|
||||
- state: mailing-charging
|
||||
map: [ "enum.DisposalUnitVisualLayers.BaseCharging" ]
|
||||
- state: mailing-flush
|
||||
map: [ "enum.DisposalUnitVisualLayers.BaseFlush" ]
|
||||
map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
|
||||
- state: dispover-charge
|
||||
map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
|
||||
- state: dispover-ready
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
conditions:
|
||||
- !type:EntityAnchored
|
||||
anchored: false
|
||||
- !type:ToiletLidClosed {}
|
||||
steps:
|
||||
- tool: Welding
|
||||
doAfter: 2
|
||||
|
||||
@@ -606,7 +606,7 @@
|
||||
description: A human excrement flushing apparatus.
|
||||
icon:
|
||||
sprite: Structures/Furniture/toilet.rsi
|
||||
state: closed_toilet_seat_up
|
||||
state: disposal
|
||||
objectType: Structure
|
||||
placementMode: SnapgridCenter
|
||||
canBuildInImpassable: false
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 29 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 29 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
BIN
Resources/Textures/Structures/Furniture/toilet.rsi/disposal.png
Normal file
BIN
Resources/Textures/Structures/Furniture/toilet.rsi/disposal.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
@@ -4,24 +4,240 @@
|
||||
"x": 32,
|
||||
"y": 32
|
||||
},
|
||||
"license": "CC-BY-SA-3.0",
|
||||
"copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/2cb66bae0e253e13d37f8939e0983bb94fee243e",
|
||||
"license": "CC-BY-NC-SA-3.0",
|
||||
"copyright": "Made by brainfood1183 (github) for ss14",
|
||||
"states": [
|
||||
{
|
||||
"name": "closed_toilet_seat_down",
|
||||
"directions": 4
|
||||
"name": "condisposal",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "closed_toilet_seat_up",
|
||||
"directions": 4
|
||||
"name": "disposal-open",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "open_toilet_seat_down",
|
||||
"directions": 4
|
||||
"name": "disposal-closed",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "open_toilet_seat_up",
|
||||
"directions": 4
|
||||
"name": "disposal",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "disposal-up",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "disposal-down",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "disposal-charging",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "disposal-flush",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0,
|
||||
1.0,
|
||||
1.0,
|
||||
1.0,
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0,
|
||||
1.0,
|
||||
1.0,
|
||||
1.0,
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0,
|
||||
1.0,
|
||||
1.0,
|
||||
1.0,
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0,
|
||||
1.0,
|
||||
1.0,
|
||||
1.0,
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "dispover-charge",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "dispover-full",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "dispover-handle",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "dispover-ready",
|
||||
"directions": 4,
|
||||
"delays": [
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
],
|
||||
[
|
||||
1.0
|
||||
]
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB |
Reference in New Issue
Block a user