tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Crowbar, Wrench, Welder inhand (#990)

Browse Source
This commit is contained in:
Swept
2020-05-24 19:44:22 +00:00
committed by GitHub
parent 67143b1371
commit 8860ca6e2c
21 changed files with 405 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/GameObjects/Components/Interactable/WelderComponent.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using Content.Server.GameObjects.Components.Chemistry;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
@@ -126,10 +126,13 @@ namespace Content.Server.GameObjects.Components.Interactable
/// </summary>
private bool ToggleWelderStatus(IEntity user = null)
{
var item = Owner.GetComponent<ItemComponent>();
if (WelderLit)
{
WelderLit = false;
// Layer 1 is the flame.
item.EquippedPrefix = "off";
_spriteComponent.LayerSetVisible(1, false);
PlaySoundCollection("WelderOff", -5);
_welderSystem.Unsubscribe(this);
@@ -143,6 +146,7 @@ namespace Content.Server.GameObjects.Components.Interactable
}
WelderLit = true;
item.EquippedPrefix = "on";
_spriteComponent.LayerSetVisible(1, true);
PlaySoundCollection("WelderOn", -5);
_welderSystem.Subscribe(this);

43
Resources/Prototypes/Entities/Items/tools.yml
View File

@@ -82,6 +82,10 @@
- type: Icon
sprite: Objects/Tools/welder.rsi
state: welder
- type: Item
Size: 10
sprite: Objects/Tools/welder.rsi
HeldPrefix: off
- type: ItemCooldown
- type: MeleeWeapon
- type: ItemStatus
@@ -92,6 +96,7 @@
reagents:
- ReagentId: chem.WeldingFuel
Quantity: 100
- type: Welder
useSoundCollection: Welder
@@ -102,9 +107,13 @@
description: A common tool for assembly and disassembly, righty tighty lefty loosey
components:
- type: Sprite
texture: Objects/Tools/wrench.png
sprite: Objects/Tools/wrench.rsi
state: icon
- type: Icon
texture: Objects/Tools/wrench.png
sprite: Objects/Tools/wrench.rsi
state: icon
- type: Item
sprite: Objects/Tools/wrench.rsi
- type: ItemCooldown
- type: MeleeWeapon
- type: Tool
@@ -119,9 +128,35 @@
description: A multipurpose tool to pry open doors and fight interdimensional invaders
components:
- type: Sprite
texture: Objects/Tools/crowbar.png
sprite: Objects/Tools/crowbar.rsi
state: icon
- type: Icon
texture: Objects/Tools/crowbar.png
sprite: Objects/Tools/crowbar.rsi
state: icon
- type: Item
sprite: Objects/Tools/crowbar.rsi
- type: ItemCooldown
- type: MeleeWeapon
- type: Tool
qualities:
- Prying
useSound: /Audio/items/crowbar.ogg
- type: TilePrying
- type: entity
name: Emergency Crowbar
parent: BaseItem
id: CrowbarRed
description: A multipurpose tool to pry open doors and fight interdimensional invaders
components:
- type: Sprite
sprite: Objects/Tools/crowbar_red.rsi
state: icon
- type: Icon
sprite: Objects/Tools/crowbar_red.rsi
state: icon
- type: Item
sprite: Objects/Tools/crowbar_red.rsi
- type: ItemCooldown
- type: MeleeWeapon
- type: Tool

BIN
Resources/Textures/Objects/Tools/crowbar.rsi/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 174 B

BIN
Resources/Textures/Objects/Tools/crowbar.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 305 B

BIN
Resources/Textures/Objects/Tools/crowbar.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 308 B

54
Resources/Textures/Objects/Tools/crowbar.rsi/meta.json Normal file
View File

@@ -0,0 +1,54 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1
]
]
}
]
}

0
Resources/Textures/Objects/Tools/crowbar.png → Resources/Textures/Objects/Tools/crowbar_red.rsi/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 200 B

BIN
Resources/Textures/Objects/Tools/crowbar_red.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

BIN
Resources/Textures/Objects/Tools/crowbar_red.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 329 B

54
Resources/Textures/Objects/Tools/crowbar_red.rsi/meta.json Normal file
View File

@@ -0,0 +1,54 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1
]
]
}
]
}

66
Resources/Textures/Objects/Tools/drill.rsi/meta.json
View File

@@ -1 +1,65 @@
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC BY-SA 3.0", "copyright": "Taken from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189", "states": [{"name": "drill_bolt", "directions": 1, "delays": [[1.0]]}, {"name": "drill_screw", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"license": "CC BY-SA 3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation at commit ea59fb4b810decbb5996b36d8876614b57c3d189",
"states": [
{
"name": "drill_bolt",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "drill_screw",
"directions": 1,
"delays": [
[
1
]
]
},
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
}

55
Resources/Textures/Objects/Tools/multitool.rsi/meta.json
View File

@@ -1 +1,54 @@
{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "multitool", "directions": 1, "delays": [[1.0]]}]}
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "multitool",
"directions": 1,
"delays": [
[
1
]
]
}
]
}

80
Resources/Textures/Objects/Tools/welder.rsi/meta.json
View File

@@ -27,6 +27,86 @@
0.1
]
]
},
{
"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": "off-inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "off-inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
}
]
}

BIN
Resources/Textures/Objects/Tools/welder.rsi/off-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 342 B

BIN
Resources/Textures/Objects/Tools/welder.rsi/off-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 353 B

BIN
Resources/Textures/Objects/Tools/welder.rsi/on-inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 586 B

BIN
Resources/Textures/Objects/Tools/welder.rsi/on-inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 603 B

0
Resources/Textures/Objects/Tools/wrench.png → Resources/Textures/Objects/Tools/wrench.rsi/icon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 230 B

After

Width:  |  Height:  |  Size: 230 B

BIN
Resources/Textures/Objects/Tools/wrench.rsi/inhand-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 281 B

BIN
Resources/Textures/Objects/Tools/wrench.rsi/inhand-right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 286 B

54
Resources/Textures/Objects/Tools/wrench.rsi/meta.json Normal file
View File

@@ -0,0 +1,54 @@
{
"version": 1,
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-left",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "inhand-right",
"directions": 4,
"delays": [
[
1
],
[
1
],
[
1
],
[
1
]
]
},
{
"name": "icon",
"directions": 1,
"delays": [
[
1
]
]
}
]
}