]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Golden toilet (#31049)
authorNim <128169402+Nimfar11@users.noreply.github.com>
Thu, 15 Aug 2024 19:23:59 +0000 (22:23 +0300)
committerGitHub <noreply@github.com>
Thu, 15 Aug 2024 19:23:59 +0000 (13:23 -0600)
* golden toilet

* Destructible

* sprite

* fix

* copyright

19 files changed:
Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
Resources/Prototypes/Objectives/objectiveGroups.yml
Resources/Prototypes/Objectives/stealTargetGroups.yml
Resources/Prototypes/Objectives/thief.yml
Resources/Textures/Structures/Furniture/golden_toilet.rsi/condisposal.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-charging.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-closed.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-down.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-flush.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-open.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-up.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-charge.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-full.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-handle.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-ready.png [new file with mode: 0644]
Resources/Textures/Structures/Furniture/golden_toilet.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png
Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png

index 6a603b7deb25290095592fb65038f64260e67ab8..76ddc1d1ecd73d4359b4835530dbd0e8af448f1b 100644 (file)
@@ -1,9 +1,9 @@
 - type: entity
   name: toilet
-  id: ToiletEmpty
-  suffix: Empty
+  id: BaseToilet
   parent: [ DisposalUnitBase, SeatBase ]
   description: The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean.
+  abstract: true
   components:
   - type: Sprite
     sprite: Structures/Furniture/toilet.rsi
@@ -62,9 +62,6 @@
         - MachineMask
         layer:
         - None
-  - type: Construction
-    graph: Toilet
-    node: toilet
   - type: PlungerUse
   - type: Appearance
   - type: SecretStash
           Open: { state: disposal-open }
           Closed: { state: disposal-closed }
 
+- type: entity
+  name: toilet
+  description: The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean.
+  id: ToiletEmpty
+  parent: BaseToilet
+  suffix: Empty
+  components:
+  - type: Construction
+    graph: Toilet
+    node: toilet
+
 - type: entity
   id: ToiletDirtyWater
   parent: ToiletEmpty
           Quantity: 180
         - ReagentId: GastroToxin
           Quantity: 20
+
+- type: entity
+  id: ToiletGoldenEmpty
+  parent: BaseToilet
+  name: golden toilet
+  description: The HT-451G is the gold version of the device. It says on the side that it is made of the purest Mercurian gold and a real leather seat.
+  suffix: Empty
+  components:
+  - type: Sprite
+    sprite: Structures/Furniture/golden_toilet.rsi
+  - type: StaticPrice
+    price: 1500
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 200
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+          params:
+            volume: -6
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          IngotGold1:
+            min: 5
+            max: 5
+
+- type: entity
+  id: ToiletGoldenDirtyWater
+  parent: ToiletGoldenEmpty
+  suffix: Dirty Water, StealTarget
+  components:
+  - type: StealTarget
+    stealGroup: ToiletGoldenDirtyWater
+  - type: SolutionContainerManager
+    solutions:
+      drainBuffer:
+        maxVol: 100
+      tank:
+        maxVol: 500
+        reagents:
+        - ReagentId: Water
+          Quantity: 160
+        - ReagentId: Gold
+          Quantity: 20
+        - ReagentId: GastroToxin
+          Quantity: 20
index c692c85dff842231c9e4e752075b411949e324cf..fe1d8e352856d7d17738ba16c0760775956729fa 100644 (file)
@@ -99,6 +99,7 @@
     BoozeDispenserStealObjective: 1
     AltarNanotrasenStealObjective: 1
     PlantRDStealObjective: 1
+    ToiletGoldenStealObjective: 1
 
 - type: weightedRandom
   id: ThiefObjectiveGroupAnimal
index e818442b4c452ceb929b628c5fc071f0de0e67fa..08c084027699ee138b00b273e0cec8188855dc38 100644 (file)
     sprite: Objects/Misc/id_cards.rsi
     state: default
 
-
-
 - type: stealTargetGroup
   id: LAMP
   name: LAMPS
     sprite: Structures/Furniture/potted_plants.rsi
     state: plant-25
 
+- type: stealTargetGroup
+  id: ToiletGoldenDirtyWater
+  name: golden toilet
+  sprite:
+    sprite: Structures/Furniture/golden_toilet.rsi
+    state: condisposal
+
 # Thief Animal
 
 - type: stealTargetGroup
index 092a724da2dde79437575c7d4b6a36030da756a0..c401ab432528e6ffa35c75bc0e6f26ea96387d18 100644 (file)
   - type: Objective
     difficulty: 0.8
 
+- type: entity
+  parent: BaseThiefStealStructureObjective
+  id: ToiletGoldenStealObjective
+  components:
+  - type: NotJobRequirement
+    job: Captain
+  - type: StealCondition
+    stealGroup: ToiletGoldenDirtyWater
+  - type: Objective
+    difficulty: 2
+
 # Animal
 
 - type: entity
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/condisposal.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/condisposal.png
new file mode 100644 (file)
index 0000000..c454906
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/condisposal.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-charging.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-charging.png
new file mode 100644 (file)
index 0000000..c454906
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-charging.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-closed.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-closed.png
new file mode 100644 (file)
index 0000000..c83f533
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-closed.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-down.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-down.png
new file mode 100644 (file)
index 0000000..47e7806
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-down.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-flush.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-flush.png
new file mode 100644 (file)
index 0000000..fe5df9b
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-flush.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-open.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-open.png
new file mode 100644 (file)
index 0000000..6a650fe
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-open.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-up.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-up.png
new file mode 100644 (file)
index 0000000..6a79d93
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal-up.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal.png
new file mode 100644 (file)
index 0000000..eef0885
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/disposal.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-charge.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-charge.png
new file mode 100644 (file)
index 0000000..23ecafa
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-charge.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-full.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-full.png
new file mode 100644 (file)
index 0000000..ceb04df
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-full.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-handle.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-handle.png
new file mode 100644 (file)
index 0000000..4f40192
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-handle.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-ready.png b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-ready.png
new file mode 100644 (file)
index 0000000..bac1c76
Binary files /dev/null and b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/dispover-ready.png differ
diff --git a/Resources/Textures/Structures/Furniture/golden_toilet.rsi/meta.json b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/meta.json
new file mode 100644 (file)
index 0000000..3e381d4
--- /dev/null
@@ -0,0 +1,243 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-NC-SA-3.0",
+    "copyright": "Made by brainfood1183 (github) for ss14, modified Nimfar11",
+    "states": [
+        {
+            "name": "condisposal",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "disposal-open",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "disposal-closed",
+            "directions": 4,
+            "delays": [
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ],
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "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
+                ]
+            ]
+        }
+    ]
+}
index 97712ddc65380c3b71547a3b31bc8e6263080778..fa71c217bf88bb0276d471fd222dc808e91f2319 100644 (file)
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png differ
index 3b37aba4729a861a0a8b57de28bad057864f07b8..429d79081f6c61f5014dd6d3241f2773d9f142ad 100644 (file)
Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png differ