]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
space cleaner and fuel dispensers (#21610)
authorTunguso4ka <71643624+Tunguso4ka@users.noreply.github.com>
Mon, 13 Nov 2023 23:00:51 +0000 (01:00 +0200)
committerGitHub <noreply@github.com>
Mon, 13 Nov 2023 23:00:51 +0000 (16:00 -0700)
* cleaner and oil wall dispensers

* fuel

* meta jason

* yaml

* fixed error

* suggest

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
* fuck webedit

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml [new file with mode: 0644]
Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png [new file with mode: 0644]
Resources/Textures/Structures/Storage/tanks.rsi/meta.json
Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png [new file with mode: 0644]

index 5f3b841565d16765b34b84a68a52767d5ab91f23..8a7965fdd777526b7406d704e979a4012390c1e5 100644 (file)
       fillBaseName: watertank-2-
     - type: ExaminableSolution
       solution: tank
+
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/walldispenser.yml
new file mode 100644 (file)
index 0000000..26416c0
--- /dev/null
@@ -0,0 +1,77 @@
+- type: entity
+  id: CleanerDispenser
+  name: space cleaner dispenser
+  description: Wallmount reagent dispenser.
+  components:
+  - type: WallMount
+    arc: 180
+  - type: Sprite
+    sprite: Structures/Storage/tanks.rsi
+    state: cleanerdispenser
+  - type: Appearance
+  - type: InteractionOutline
+  - type: Clickable
+  - type: Transform
+    anchored: true
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 5
+      behaviors:
+      - !type:SolutionExplosionBehavior
+        solution: tank
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Piercing
+        damage: 5
+      behaviors:
+      - !type:SolutionExplosionBehavior
+        solution: tank
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:SpillBehavior
+        solution: tank
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/metalbreak.ogg
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: SpaceCleaner
+          Quantity: 5000
+  - type: DrainableSolution
+    solution: tank
+  - type: ReagentTank
+  - type: ExaminableSolution
+    solution: tank
+
+- type: entity
+  parent: CleanerDispenser
+  id: FuelDispenser
+  name: fuel dispenser
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/tanks.rsi
+    state: fueldispenser
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 1000
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png b/Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png
new file mode 100644 (file)
index 0000000..0d42fa4
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/cleanerdispenser.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png
new file mode 100644 (file)
index 0000000..333ffde
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/fueldispenser.png differ
index 93b557cf5a2b7184daf5ef98792f0f09269c1953..c4d31e80b26514c368620edbba02b81aadac625c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8442af39ee82b813194f71db82edd2923d97818d, watercooler Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8442af39ee82b813194f71db82edd2923d97818d, watercooler Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e, dispensers taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/846ce475b2258a4336d8895f07f2c0f4053963bc",
   "size": {
     "x": 32,
     "y": 32
     },
     {
       "name": "generictank-1"
+    },
+    {
+      "name": "cleanerdispenser"
+    },
+    {
+      "name": "fueldispenser"
+    },
+    {
+      "name": "pepperdispenser"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png b/Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png
new file mode 100644 (file)
index 0000000..f8b99b5
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/pepperdispenser.png differ