Port CM water and welding tanks (RMC-14#5172)

MACMAN2003 · Dec 18, 2024 · c06985f · c06985f
1 parent 86ca4b3
commit c06985f
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 1 deletion.
diff --git a/Resources/Prototypes/_RMC14/Entities/Structures/Storage/reagent_tank.yml b/Resources/Prototypes/_RMC14/Entities/Structures/Storage/reagent_tank.yml
@@ -13,6 +13,7 @@
     - state: tn_color-1
       map: ["enum.SolutionContainerLayers.Fill"]
       visible: false
+    - state: t_inactive
   - type: Fixtures
     fixtures:
       fix1:
@@ -48,3 +49,40 @@
   - type: Corrodible
     timeToApply: 4
     structure: true
+
+- type: entity
+  parent: RMCTankReagentEmpty
+  id: RMCTankReagentWater
+  name: water tank
+  description: A water tank, holds water.
+  suffix: full
+  components:
+  - type: Sprite
+    layers:
+    - state: watertank
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: Water
+          Quantity: 1000
+
+- type: entity
+  parent: RMCTankReagentEmpty
+  id: RMCTankReagentFuel
+  name: fuel tank
+  description: A fuel tank, for holding welding fuel.
+  suffix: full
+  components:
+  - type: Sprite
+    layers:
+    - state: weldtank
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 1000
+  - type: Explosive
+    explosionType: Default
+    totalIntensity: 60
diff --git a/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/meta.json b/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/b5a595ce32f9bb4fc8abde0efe21196b3862d8bf/icons/obj/objects.dmi",
+  "copyright": "Taken from cmss13 at https://github.com/cmss13-devs/cmss13/blob/0525b5ada7da1afcd9b260e76d5fea01500d9c8d/icons/obj/structures/liquid_tanks.dmi",
   "size": {
     "x": 32,
     "y": 32
@@ -57,6 +57,45 @@
     },
     {
       "name": "te_color-2"
+    },
+    {
+      "name": "t_inactive"
+    },
+    {
+      "name": "t_active",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "t_boom",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "t_signaller"
+    },
+    {
+      "name": "t_reinforced"
     }
   ]
 }
diff --git a/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/t_active.png b/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/t_active.png
diff --git a/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/t_boom.png b/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/t_boom.png
diff --git a/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/t_inactive.png b/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/t_inactive.png
diff --git a/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/t_reinforced.png b/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/t_reinforced.png
diff --git a/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/t_signaller.png b/Resources/Textures/_RMC14/Structures/Storage/reagent_tank.rsi/t_signaller.png
diff --git a/Resources/migration.yml b/Resources/migration.yml
@@ -912,3 +912,7 @@ CheapLighter: RMCLighter
 
 # 2024-11-28
 ClosetLegal: RMCClosetBlue
+
+# 2024-12-17
+WeldingFuelTank: RMCTankReagentFuel
+WaterTank: RMCTankReagentWater