Start refactoring tools

Resources/Prototypes/Entities/Items/tools.yml

@@ -4,13 +4,14 @@
   id: Wirecutter
   description: This kills the wire.
   components:
-  - type: Wirecutter
   - type: Sprite
     texture: Objects/Tools/wirecutter.png
   - type: Icon
     texture: Objects/Tools/wirecutter.png
   - type: ItemCooldown
   - type: MeleeWeapon
+  - type: Tool
+      behavior: enum.Tool.Wirecutter
 
 - type: entity
   name: Screwdriver
@@ -18,20 +19,18 @@
   id: Screwdriver
   description: Industrial grade torque in a small screwdriving package
   components:
-  - type: Screwdriver
   - type: Sprite
     sprite: Objects/Tools/screwdriver.rsi
     state: screwdriver
-
   - type: Icon
     sprite: Objects/Tools/screwdriver.rsi
     state: screwdriver
-
   - type: Item
     sprite: Objects/Tools/screwdriver.rsi
-
   - type: ItemCooldown
   - type: MeleeWeapon
+  - type: Tool
+      behavior: enum.Tool.Screwdriver
 
 - type: entity
   name: Welding Tool
@@ -39,7 +38,6 @@
   id: Welder
   description: Melts anything as long as it's fueled, don't forget your eye protection!
   components:
-  - type: Welder
   - type: Sprite
     sprite: Objects/Tools/welder.rsi
     layers:
@@ -47,13 +45,14 @@
     - state: welder_flame
       shader: unshaded
       visible: false
-
   - type: Icon
     sprite: Objects/Tools/welder.rsi
     state: welder
   - type: ItemCooldown
   - type: MeleeWeapon
   - type: ItemStatus
+  - type: Tool
+      behavior: enum.Tool.Screwdriver
 
 - type: entity
   name: Wrench
@@ -61,24 +60,14 @@
   id: Wrench
   description: A common tool for assembly and disassembly, righty tighty lefty loosey
   components:
-  - type: Wrench
   - type: Sprite
     texture: Objects/Tools/wrench.png
   - type: Icon
     texture: Objects/Tools/wrench.png
   - type: ItemCooldown
   - type: MeleeWeapon
-
-- type: sound_collection
-  id: welder_on
-  files:
-  - /Audio/items/lighter1.ogg
-  - /Audio/items/lighter2.ogg
-
-- type: sound_collection
-  id: welder_off
-  files:
-  - /Audio/effects/zzzt.ogg
+  - type: Tool
+      behavior: enum.Tool.Wrench
 
 - type: entity
   name: Crowbar
@@ -86,13 +75,14 @@
   id: Crowbar
   description: A multipurpose tool to pry open doors and fight interdimensional invaders
   components:
-  - type: Crowbar
   - type: Sprite
     texture: Objects/Tools/crowbar.png
   - type: Icon
     texture: Objects/Tools/crowbar.png
   - type: ItemCooldown
   - type: MeleeWeapon
+  - type: Tool
+      behavior: enum.Tool.Crowbar
 
 - type: entity
   name: Multitool
@@ -100,14 +90,13 @@
   id: Multitool
   description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines
   components:
-  - type: Multitool
   - type: Sprite
     sprite: Objects/Tools/multitool.rsi
     state: multitool
-
   - type: Icon
     sprite: Objects/Tools/multitool.rsi
     state: multitool
-
   - type: Item
     sprite: Objects/Tools/multitool.rsi
+  - type: Tool
+      behavior: enum.Tool.Multitool

Resources/Prototypes/SoundCollections/dice.yml

@@ -1,4 +1,4 @@
-- type: sound_collection
+- type: soundCollection
   id: dice
   files:
   - /Audio/items/dice/dice1.ogg
@@ -7,4 +7,4 @@
   - /Audio/items/dice/dice4.ogg
   - /Audio/items/dice/dice5.ogg
   - /Audio/items/dice/dice6.ogg
-  - /Audio/items/dice/dice7.ogg
+  - /Audio/items/dice/dice7.ogg

Resources/Prototypes/SoundCollections/footsteps.yml

@@ -1,4 +1,4 @@
-- type: sound_collection
+- type: soundCollection
   id: footstep_carpet
   files:
   - /Audio/effects/footsteps/carpet1.ogg
@@ -7,7 +7,7 @@
   - /Audio/effects/footsteps/carpet4.ogg
   - /Audio/effects/footsteps/carpet5.ogg
 
-- type: sound_collection
+- type: soundCollection
   id: footstep_wood
   files:
   - /Audio/effects/footsteps/wood1.ogg
@@ -16,7 +16,7 @@
   - /Audio/effects/footsteps/wood4.ogg
   - /Audio/effects/footsteps/wood5.ogg
 
-- type: sound_collection
+- type: soundCollection
   id: footstep_catwalk
   files:
   - /Audio/effects/footsteps/catwalk1.ogg
@@ -25,7 +25,7 @@
   - /Audio/effects/footsteps/catwalk4.ogg
   - /Audio/effects/footsteps/catwalk5.ogg
 
-- type: sound_collection
+- type: soundCollection
   id: footstep_floor
   files:
   - /Audio/effects/footsteps/floor1.ogg
@@ -34,7 +34,7 @@
   - /Audio/effects/footsteps/floor4.ogg
   - /Audio/effects/footsteps/floor5.ogg
 
-- type: sound_collection
+- type: soundCollection
   id: footstep_hull
   files:
   - /Audio/effects/footsteps/hull1.ogg
@@ -43,7 +43,7 @@
   - /Audio/effects/footsteps/hull4.ogg
   - /Audio/effects/footsteps/hull5.ogg
 
-- type: sound_collection
+- type: soundCollection
   id: footstep_plating
   files:
   - /Audio/effects/footsteps/plating1.ogg
@@ -52,7 +52,7 @@
   - /Audio/effects/footsteps/plating4.ogg
   - /Audio/effects/footsteps/plating5.ogg
 
-- type: sound_collection
+- type: soundCollection
   id: footstep_tile
   files:
   - /Audio/effects/footsteps/tile1.ogg
@@ -61,19 +61,19 @@
   - /Audio/effects/footsteps/tile4.ogg
   - /Audio/effects/footsteps/tile5.ogg
 
-- type: sound_collection
+- type: soundCollection
   id: footstep_clown
   files:
   - /Audio/effects/footsteps/clownstep1.ogg
   - /Audio/effects/footsteps/clownstep2.ogg
 
-- type: sound_collection
+- type: soundCollection
   id: footstep_heavy
   files:
   - /Audio/effects/footsteps/suitstep1.ogg
   - /Audio/effects/footsteps/suitstep2.ogg
 
-- type: sound_collection
+- type: soundCollection
   id: footstep_asteroid
   files:
   - /Audio/effects/footsteps/asteroid1.ogg

Resources/Prototypes/SoundCollections/glassbreak.yml

@@ -1,4 +1,4 @@
-- type: sound_collection
+- type: soundCollection
   id: glassbreak
   files:
   - /Audio/effects/glassbreak1.ogg

Resources/Prototypes/SoundCollections/keyboard.yml

@@ -1,8 +1,7 @@
-- type: sound_collection
+- type: soundCollection
   id: keyboard
   files:
   - /Audio/machines/keyboard/keyboard1.ogg
   - /Audio/machines/keyboard/keyboard2.ogg
   - /Audio/machines/keyboard/keyboard3.ogg
   - /Audio/machines/keyboard/keyboard4.ogg
-  

Resources/Prototypes/SoundCollections/tools.yml

@@ -0,0 +1,10 @@
+- type: soundCollection
+  id: WelderOn
+  files:
+    - /Audio/items/lighter1.ogg
+    - /Audio/items/lighter2.ogg
+
+- type: soundCollection
+  id: WelderOff
+  files:
+    - /Audio/effects/zzzt.ogg