Finish refactoring tools. Add multitools. (as in multiple tools in one)
This commit is contained in:
BIN
Resources/Audio/items/change_drill.ogg
Normal file
BIN
Resources/Audio/items/change_drill.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/items/change_jaws.ogg
Normal file
BIN
Resources/Audio/items/change_jaws.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/items/drill_hit.ogg
Normal file
BIN
Resources/Audio/items/drill_hit.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/items/drill_use.ogg
Normal file
BIN
Resources/Audio/items/drill_use.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/items/jaws_cut.ogg
Normal file
BIN
Resources/Audio/items/jaws_cut.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/items/jaws_pry.ogg
Normal file
BIN
Resources/Audio/items/jaws_pry.ogg
Normal file
Binary file not shown.
@@ -20,7 +20,7 @@
|
||||
- type: Computer
|
||||
- type: PowerDevice
|
||||
priority: High
|
||||
- type: Wrenchable
|
||||
- type: Anchorable
|
||||
|
||||
- type: Sprite
|
||||
sprite: Buildings/computer.rsi
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
- type: PowerDevice
|
||||
priority: Low
|
||||
- type: Wires
|
||||
- type: Wrenchable
|
||||
- type: Anchorable
|
||||
|
||||
- type: entity
|
||||
parent: VendingMachine
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PowerChargerVisualizer2D
|
||||
- type: Wrenchable
|
||||
- type: Anchorable
|
||||
- type: Physics
|
||||
mass: 5
|
||||
- type: Clickable
|
||||
@@ -148,7 +148,7 @@
|
||||
- type: Appearance
|
||||
visuals:
|
||||
- type: PowerChargerVisualizer2D
|
||||
- type: Wrenchable
|
||||
- type: Anchorable
|
||||
- type: Physics
|
||||
mass: 5
|
||||
- type: Clickable
|
||||
|
||||
@@ -11,7 +11,8 @@
|
||||
- type: ItemCooldown
|
||||
- type: MeleeWeapon
|
||||
- type: Tool
|
||||
behavior: enum.Tool.Wirecutter
|
||||
behavior: enum.Tool.Wirecutter
|
||||
useSound: /Audio/items/wirecutter.ogg
|
||||
|
||||
- type: entity
|
||||
name: Screwdriver
|
||||
@@ -30,7 +31,8 @@
|
||||
- type: ItemCooldown
|
||||
- type: MeleeWeapon
|
||||
- type: Tool
|
||||
behavior: enum.Tool.Screwdriver
|
||||
behavior: enum.Tool.Screwdriver
|
||||
useSoundCollection: Screwdriver
|
||||
|
||||
- type: entity
|
||||
name: Welding Tool
|
||||
@@ -51,8 +53,16 @@
|
||||
- type: ItemCooldown
|
||||
- type: MeleeWeapon
|
||||
- type: ItemStatus
|
||||
- type: Solution
|
||||
maxVol: 50
|
||||
caps: 9
|
||||
contents:
|
||||
reagents:
|
||||
- ReagentId: chem.WeldingFuel
|
||||
Quantity: 50
|
||||
- type: Tool
|
||||
behavior: enum.Tool.Screwdriver
|
||||
behavior: enum.Tool.Welder
|
||||
useSoundCollection: Welder
|
||||
|
||||
- type: entity
|
||||
name: Wrench
|
||||
@@ -67,7 +77,8 @@
|
||||
- type: ItemCooldown
|
||||
- type: MeleeWeapon
|
||||
- type: Tool
|
||||
behavior: enum.Tool.Wrench
|
||||
behavior: enum.Tool.Wrench
|
||||
useSound: /Audio/items/ratchet.ogg
|
||||
|
||||
- type: entity
|
||||
name: Crowbar
|
||||
@@ -82,7 +93,8 @@
|
||||
- type: ItemCooldown
|
||||
- type: MeleeWeapon
|
||||
- type: Tool
|
||||
behavior: enum.Tool.Crowbar
|
||||
behavior: enum.Tool.Crowbar
|
||||
useSound: /Audio/items/crowbar.ogg
|
||||
|
||||
- type: entity
|
||||
name: Multitool
|
||||
@@ -99,4 +111,60 @@
|
||||
- type: Item
|
||||
sprite: Objects/Tools/multitool.rsi
|
||||
- type: Tool
|
||||
behavior: enum.Tool.Multitool
|
||||
behavior: enum.Tool.Multitool
|
||||
|
||||
- type: entity
|
||||
name: Jaws of life
|
||||
parent: BaseItem
|
||||
id: JawsOfLife
|
||||
description: A set of jaws of life, compressed through the magic of science.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Tools/jaws_of_life.rsi
|
||||
state: jaws_pry
|
||||
- type: Icon
|
||||
sprite: Objects/Tools/jaws_of_life.rsi
|
||||
state: jaws_pry
|
||||
- type: Item
|
||||
sprite: Objects/Tools/jaws_of_life.rsi
|
||||
- type: Tool
|
||||
behavior: enum.Tool.Crowbar
|
||||
statusShowBehavior: true
|
||||
- type: MultiTool
|
||||
tools:
|
||||
- behavior: enum.Tool.Crowbar
|
||||
state: jaws_pry
|
||||
useSound: /Audio/items/jaws_pry.ogg
|
||||
changeSound: /Audio/items/change_jaws.ogg
|
||||
- behavior: enum.Tool.Wirecutter
|
||||
state: jaws_cutter
|
||||
useSound: /Audio/items/jaws_cut.ogg
|
||||
changeSound: /Audio/items/change_jaws.ogg
|
||||
|
||||
- type: entity
|
||||
name: Power Drill
|
||||
parent: BaseItem
|
||||
id: PowerDrill
|
||||
description: A simple powered hand drill.
|
||||
components:
|
||||
- type: Sprite
|
||||
sprite: Objects/Tools/drill.rsi
|
||||
state: drill_screw
|
||||
- type: Icon
|
||||
sprite: Objects/Tools/drill.rsi
|
||||
state: drill_screw
|
||||
- type: Item
|
||||
sprite: Objects/Tools/drill.rsi
|
||||
- type: Tool
|
||||
behavior: enum.Tool.Screwdriver
|
||||
statusShowBehavior: true
|
||||
- type: MultiTool
|
||||
tools:
|
||||
- behavior: enum.Tool.Screwdriver
|
||||
state: drill_screw
|
||||
useSound: /Audio/items/drill_use.ogg
|
||||
changeSound: /Audio/items/change_drill.ogg
|
||||
- behavior: enum.Tool.Wrench
|
||||
state: drill_bolt
|
||||
useSound: /Audio/items/drill_use.ogg
|
||||
changeSound: /Audio/items/change_drill.ogg
|
||||
|
||||
@@ -105,3 +105,9 @@
|
||||
name: Unstable Mutagen
|
||||
desc: Causes mutations when injected into living people or plants. High doses may be lethal, especially in humans.
|
||||
color: "#77b58e"
|
||||
|
||||
- type: reagent
|
||||
id: chem.WeldingFuel
|
||||
name: Welding Fuel
|
||||
desc: Used by welders to weld.
|
||||
color: "#a76b1c"
|
||||
|
||||
@@ -8,3 +8,15 @@
|
||||
id: WelderOff
|
||||
files:
|
||||
- /Audio/effects/zzzt.ogg
|
||||
|
||||
- type: soundCollection
|
||||
id: Welder
|
||||
files:
|
||||
- /Audio/items/welder.ogg
|
||||
- /Audio/items/welder2.ogg
|
||||
|
||||
- type: soundCollection
|
||||
id: Screwdriver
|
||||
files:
|
||||
- /Audio/items/screwdriver.ogg
|
||||
- /Audio/items/screwdriver2.ogg
|
||||
|
||||
BIN
Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png
Normal file
BIN
Resources/Textures/Objects/Tools/drill.rsi/drill_bolt.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 839 B |
BIN
Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png
Normal file
BIN
Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 831 B |
1
Resources/Textures/Objects/Tools/drill.rsi/meta.json
Normal file
1
Resources/Textures/Objects/Tools/drill.rsi/meta.json
Normal file
@@ -0,0 +1 @@
|
||||
{"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]]}]}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 667 B |
BIN
Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png
Normal file
BIN
Resources/Textures/Objects/Tools/jaws_of_life.rsi/jaws_pry.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 644 B |
@@ -0,0 +1 @@
|
||||
{"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": "jaws_cutter", "directions": 1, "delays": [[1.0]]}, {"name": "jaws_pry", "directions": 1, "delays": [[1.0]]}]}
|
||||
Reference in New Issue
Block a user