diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 38cdb40519..0a1c5f588c 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/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 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index bddbba129e..b9d0f4a318 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 77fdc1c080..a9a4fdc685 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/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 diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/equipped-BELT.png new file mode 100644 index 0000000000..3e636ae5aa Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png new file mode 100644 index 0000000000..5c6c99c5d9 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrial.rsi/meta.json new file mode 100644 index 0000000000..baa2102766 --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-left.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-left.png new file mode 100644 index 0000000000..3b949b63b3 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-right.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-right.png new file mode 100644 index 0000000000..9aa9548cce Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-left.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-left.png new file mode 100644 index 0000000000..4f3d279d5a Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-right.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-right.png new file mode 100644 index 0000000000..a03c058690 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png new file mode 100644 index 0000000000..46bb4a6ff1 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/equipped-BELT.png new file mode 100644 index 0000000000..3e636ae5aa Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png new file mode 100644 index 0000000000..c187486f2b Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json new file mode 100644 index 0000000000..baa2102766 --- /dev/null +++ b/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 + } + ] +} diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-left.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-left.png new file mode 100644 index 0000000000..3b949b63b3 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-right.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-right.png new file mode 100644 index 0000000000..9aa9548cce Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-left.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-left.png new file mode 100644 index 0000000000..4f3d279d5a Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-right.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-right.png new file mode 100644 index 0000000000..a03c058690 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png new file mode 100644 index 0000000000..7ffba68d65 Binary files /dev/null and b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png differ