Crowbar variants (#28988)

* add

* comma

* sprites

* yaml-ify

* add s

* lathe and engi belt

* yes

* fix maybe

* progress

* nearly there

* fix

* fix yaml linter having a stroke

Resources/Prototypes/Catalog/Fills/Items/belt.yml

@@ -19,7 +19,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: Crowbar
+      - id: CrowbarYellow
       - id: Wrench
       - id: Screwdriver
       - id: Wirecutter

Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml

@@ -32,7 +32,7 @@
   - type: StorageFill
     contents:
       - id: Screwdriver
-      - id: Crowbar
+      - id: CrowbarOrange
       - id: Wirecutter
       - id: CableApcStack10
       - id: CableMVStack10
@@ -53,7 +53,7 @@
   - type: StorageFill
     contents:
       - id: Screwdriver
-      - id: Crowbar
+      - id: CrowbarOrange
       - id: Wirecutter
       - id: CableApcStack10
       - id: CableMVStack10
@@ -94,7 +94,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: Crowbar
+      - id: CrowbarOrange
       - id: Wrench
       - id: Welder
       - id: Wirecutter

Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml

@@ -3,6 +3,7 @@
   startingInventory:
     ClothingEyesGlassesMeson: 4
     ClothingHeadHatWelding: 6
+    CrowbarYellow: 8
     Multitool: 4
     NetworkConfigurator: 5
     PowerCellMedium: 5

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

@@ -0,0 +1,195 @@
+- type: entity
+  name: crowbar
+  parent: BaseItem
+  id: BaseCrowbar
+  abstract: true
+  components:
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/crowbar_drop.ogg
+  - type: Tag
+    tags:
+    - Crowbar
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 8
+    soundHit:
+      collection: MetalThud
+  - type: Tool
+    qualities:
+      - Prying
+    useSound:
+      path: /Audio/Items/crowbar.ogg
+  - type: ToolTileCompatible
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 100
+  - type: StaticPrice
+    price: 22
+  - type: Prying
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - Belt
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,0,1
+
+# Standard (grey) Crowbar
+- type: entity
+  parent: BaseCrowbar
+  id: Crowbar
+  description: A multipurpose tool to pry open doors and fight interdimensional invaders.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/crowbar.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Tools/crowbar.rsi
+    storedSprite:
+      sprite: Objects/Tools/crowbar.rsi
+      state: storage
+
+# Emergency (red) Crowbar
+- type: entity
+  name: emergency crowbar
+  parent: BaseCrowbar
+  id: CrowbarRed
+  description: A pocket crowbar designed to pry open doors and firelocks during power outages.
+  components:
+  - type: Tag
+    tags:
+    - Crowbar
+    - CrowbarRed
+  - type: Sprite
+    sprite: Objects/Tools/crowbar.rsi
+    layers:
+    - state: icon
+    - state: cover-icon
+      color: "#990000"
+  - type: Item
+    sprite: Objects/Tools/crowbar.rsi
+    storedSprite:
+      state: red-storage
+      sprite: Objects/Tools/crowbar.rsi
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: cover-inhand-left
+        color: "#990000"
+      right:
+      - state: inhand-right
+      - state: cover-inhand-right
+        color: "#990000"
+  - type: Clothing
+    sprite: Objects/Tools/crowbar.rsi
+    clothingVisuals:
+      belt:
+      - state: equipped-BELT
+      - state: cover-equipped-BELT
+        color: "#990000"
+
+# Autolathe (green) Crowbar
+- type: entity
+  parent: BaseCrowbar
+  id: CrowbarGreen
+  description: A multipurpose tool to pry open doors and fight interdimensional invaders, printed from an autolathe.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/crowbar.rsi
+    layers:
+    - state: icon
+    - state: cover-icon
+      color: "#00621c"
+  - type: Item
+    sprite: Objects/Tools/crowbar.rsi
+    storedSprite:
+      state: green-storage
+      sprite: Objects/Tools/crowbar.rsi
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: cover-inhand-left
+        color: "#00621c"
+      right:
+      - state: inhand-right
+      - state: cover-inhand-right
+        color: "#00621c"
+  - type: Clothing
+    sprite: Objects/Tools/crowbar.rsi
+    clothingVisuals:
+      belt:
+      - state: equipped-BELT
+      - state: cover-equipped-BELT
+        color: "#00621c"
+
+# Toolbox (orange) Crowbar
+- type: entity
+  parent: BaseCrowbar
+  id: CrowbarOrange
+  description: A multipurpose tool to pry open doors and fight interdimensional invaders, found in toolboxes.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/crowbar.rsi
+    layers:
+    - state: icon
+    - state: cover-icon
+      color: "#673800"
+  - type: Item
+    sprite: Objects/Tools/crowbar.rsi
+    storedSprite:
+      state: orange-storage
+      sprite: Objects/Tools/crowbar.rsi
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: cover-inhand-left
+        color: "#673800"
+      right:
+      - state: inhand-right
+      - state: cover-inhand-right
+        color: "#673800"
+  - type: Clothing
+    sprite: Objects/Tools/crowbar.rsi
+    clothingVisuals:
+      belt:
+      - state: equipped-BELT
+      - state: cover-equipped-BELT
+        color: "#673800"
+
+# Engineering (yellow) Crowbar
+- type: entity
+  parent: BaseCrowbar
+  id: CrowbarYellow
+  description: A pocket crowbar designed to pry open doors and firelocks during power outages, dispensed from Engineering.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/crowbar.rsi
+    layers:
+    - state: icon
+    - state: cover-icon
+      color: "#968000"
+  - type: Item
+    sprite: Objects/Tools/crowbar.rsi
+    storedSprite:
+      state: yellow-storage
+      sprite: Objects/Tools/crowbar.rsi
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: cover-inhand-left
+        color: "#968000"
+      right:
+      - state: inhand-right
+      - state: cover-inhand-right
+        color: "#968000"
+  - type: Clothing
+    sprite: Objects/Tools/crowbar.rsi
+    clothingVisuals:
+      belt:
+      - state: equipped-BELT
+      - state: cover-equipped-BELT
+        color: "#968000"

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

@@ -127,64 +127,6 @@
   - type: StaticPrice
     price: 22
 
-- type: entity
-  name: crowbar
-  parent: BaseItem
-  id: Crowbar
-  description: A multipurpose tool to pry open doors and fight interdimensional invaders.
-  components:
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/crowbar_drop.ogg
-  - type: Tag
-    tags:
-    - Crowbar
-  - type: Sprite
-    sprite: Objects/Tools/crowbar.rsi
-    state: icon
-  - type: Item
-    sprite: Objects/Tools/crowbar.rsi
-    size: Small
-    storedSprite:
-      sprite: Objects/Tools/crowbar.rsi
-      state: storage
-  - type: MeleeWeapon
-    wideAnimationRotation: -135
-    damage:
-      types:
-        Blunt: 8
-    soundHit:
-      collection: MetalThud
-  - type: Tool
-    qualities:
-      - Prying
-    useSound:
-      path: /Audio/Items/crowbar.ogg
-  - type: ToolTileCompatible
-  - type: PhysicalComposition
-    materialComposition:
-      Steel: 100
-  - type: StaticPrice
-    price: 22
-  - type: Prying
-
-- type: entity
-  parent: Crowbar
-  id: CrowbarRed
-  name: emergency crowbar
-  components:
-  - type: Tag
-    tags:
-    - Crowbar
-    - CrowbarRed
-  - type: Sprite
-    state: red-icon
-  - type: Item
-    heldPrefix: red
-    storedSprite:
-      sprite: Objects/Tools/crowbar.rsi
-      state: red-storage
-
 - type: entity
   name: multitool
   parent: BaseItem

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -124,7 +124,7 @@
       - Screwdriver
       - Welder
       - Wrench
-      - Crowbar
+      - CrowbarGreen
       - Multitool
       - NetworkConfigurator
       - SprayPainter

Resources/Prototypes/Recipes/Lathes/tools.yml

@@ -63,8 +63,8 @@
     Steel: 30
 
 - type: latheRecipe
-  id: Crowbar
-  result: Crowbar
+  id: CrowbarGreen
+  result: CrowbarGreen
   category: Tools
   completetime: 2
   materials:

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

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, storage and red-storage by Flareguy",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/eea0599511b088fdab9d43e562210cdbd51c6a98, cover is edited by Ubaser.",
   "size": {
     "x": 32,
     "y": 32
@@ -15,33 +15,42 @@
       "name": "inhand-right",
       "directions": 4
     },
-    {
-      "name": "red-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "red-inhand-right",
-      "directions": 4
-    },
     {
       "name": "icon"
     },
-    {
-      "name": "red-icon"
-    },
     {
       "name": "equipped-BELT",
       "directions": 4
     },
-    {
-      "name": "red-equipped-BELT",
-      "directions": 4
-    },
     {
       "name": "storage"
     },
+    {
+      "name": "cover-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "cover-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "cover-icon"
+    },
+    {
+      "name": "cover-equipped-BELT",
+      "directions": 4
+    },
     {
       "name": "red-storage"
+    },
+    {
+      "name": "green-storage"
+    },
+    {
+      "name": "orange-storage"
+    },
+    {
+      "name": "yellow-storage"
     }
   ]
 }