From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Thu, 15 Aug 2024 19:23:59 +0000 (+0300) Subject: Golden toilet (#31049) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=84af71eb7c2cb1fe04157979f85d25cdfa8a47e2;p=space-station-14.git Golden toilet (#31049) * golden toilet * Destructible * sprite * fix * copyright --- diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml index 6a603b7deb..76ddc1d1ec 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml @@ -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 @@ -110,6 +107,17 @@ 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 @@ -126,3 +134,60 @@ 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 diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index c692c85dff..fe1d8e3528 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -99,6 +99,7 @@ BoozeDispenserStealObjective: 1 AltarNanotrasenStealObjective: 1 PlantRDStealObjective: 1 + ToiletGoldenStealObjective: 1 - type: weightedRandom id: ThiefObjectiveGroupAnimal diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index e818442b4c..08c0840276 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -142,8 +142,6 @@ sprite: Objects/Misc/id_cards.rsi state: default - - - type: stealTargetGroup id: LAMP name: LAMPS @@ -344,6 +342,13 @@ 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 diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index 092a724da2..c401ab4325 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -428,6 +428,17 @@ - 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 index 0000000000..c454906141 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 index 0000000000..c454906141 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 index 0000000000..c83f533150 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 index 0000000000..47e7806806 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 index 0000000000..fe5df9b79c 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 index 0000000000..6a650fec18 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 index 0000000000..6a79d9331e 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 index 0000000000..eef08852b0 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 index 0000000000..23ecafa9d8 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 index 0000000000..ceb04dfb26 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 index 0000000000..4f40192d5b 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 index 0000000000..bac1c76ec9 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 index 0000000000..3e381d4aea --- /dev/null +++ b/Resources/Textures/Structures/Furniture/golden_toilet.rsi/meta.json @@ -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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png index 97712ddc65..fa71c217bf 100644 Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-down.png differ diff --git a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png index 3b37aba472..429d79081f 100644 Binary files a/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png and b/Resources/Textures/Structures/Furniture/toilet.rsi/disposal-up.png differ