Industrial and Advanced Welders (#7855)

Resources/Prototypes/Catalog/Fills/Crates/salvage.yml

@@ -37,6 +37,8 @@
         prob: 0.1
       - id: SheetPlasma
         prob: 0.1
+      - id: WelderIndustrialAdvanced
+        prob: 0.1
         #  - Service
       - id: CrayonBox
         prob: 0.1

Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml

@@ -67,7 +67,9 @@
     contents:
       - id: WelderMini
       - id: Welder
-        prob: 0.1
+        prob: 0.7
+      - id: WelderIndustrial
+        prob: 0.5
       - id: ClothingHeadHatWelding
         prob: 0.5
 

Resources/Prototypes/Entities/Objects/Tools/welders.yml

@@ -51,6 +51,44 @@
     color: orange
   - type: Appearance
 
+- type: entity
+  name: industrial welding tool
+  parent: Welder
+  id: WelderIndustrial
+  description: "An industrial welder with over double the fuel capacity."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/welder_industrial.rsi
+  - type: Item
+    sprite: Objects/Tools/welder_industrial.rsi
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 250
+        maxVol: 250
+        
+- type: entity
+  name: advanced industrial welding tool
+  parent: WelderIndustrial
+  id: WelderIndustrialAdvanced
+  description: "An advanced industrial welder with over double the fuel capacity and hotter flame."
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/welder_industrialadv.rsi
+  - type: Item
+    sprite: Objects/Tools/welder_industrialadv.rsi
+  - type: SolutionContainerManager
+    solutions:
+      Welder:
+        reagents:
+        - ReagentId: WeldingFuel
+          Quantity: 250
+        maxVol: 250
+  - type: Tool
+    speed: 1.3
+
 - type: entity
   name: experimental welding tool
   parent: Welder
@@ -61,8 +99,6 @@
     sprite: Objects/Tools/welder_experimental.rsi
   - type: Item
     sprite: Objects/Tools/welder_experimental.rsi
-  - type: RefillableSolution
-    solution: welder
   - type: SolutionContainerManager
     solutions:
       Welder:
@@ -95,9 +131,6 @@
           Quantity: 25
         maxVol: 25
   - type: Tool
-    useSound:
-      collection: Welder
-    qualities: Welding
     speed: 0.7
   - type: PointLight
     enabled: false

Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json

@@ -0,0 +1,79 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "welder_flame",
+      "delays": [
+        [
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json

@@ -0,0 +1,79 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "welder_flame",
+      "delays": [
+        [
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ],
+        [
+          0.2,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-BELT",
+      "directions": 4
+    }
+  ]
+}