Merge pull request #1699 from Sha-Seng/PRIbar+

PRIbar+ (with wrench) from Special Means

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

@@ -406,6 +406,7 @@
       - PowerCageHigh
       - PowerCageMedium
       - PowerCageSmall
+      - PRIbarPlusConversionKit #imp
       - SpeedLoaderMagnumIncendiary
       - SpeedLoaderMagnumUranium
       - TelescopicShield
@@ -813,6 +814,7 @@
       - PowerCageHigh
       - PowerCageMedium
       - PowerCageSmall
+      - PRIbarPlusConversionKit #imp
       - ShuttleGunDusterCircuitboard
       - ShuttleGunFriendshipCircuitboard
       - ShuttleGunPerforatorCircuitboard

Resources/Prototypes/Research/arsenal.yml

@@ -127,12 +127,13 @@
   id: SpecialMeans
   name: research-technology-special-means
   icon:
-    sprite: Clothing/Back/Backpacks/electropack.rsi
+    sprite: _Impstation/Objects/Tools/pribarplus.rsi #imp, changed so people won't gloss over it (nobody wants electropacks)
     state: icon
   discipline: Arsenal
   tier: 1
   cost: 5000
   recipeUnlocks:
+  - PRIbarPlusConversionKit #imp
   - ClothingBackpackElectropack
 
 # Tier 2

Resources/Prototypes/_Impstation/Entities/Objects/Misc/conversionkits.yml

@@ -1,3 +1,18 @@
+- type: entity
+  name: PRIbar+ conversion kit
+  parent: [ BaseItem, BaseRestrictedContraband ]
+  id: PRIbarPlusConversionKit
+  description: A package of parts and tools for adding a ratchet to a PRIbar.
+  components:
+  - type: Sprite
+    sprite: _Impstation/Objects/Misc/conversionkit.rsi
+    state: iconpb
+  - type: Item
+    size: Normal
+  - type: Tag
+    tags:
+    - ConversionKitPB
+
 - type: entity
   name: full-auto conversion kit
   parent: [ BaseItem, BaseRestrictedContraband ]
@@ -21,9 +36,9 @@
   components:
   - type: Sprite
     sprite: _Impstation/Objects/Misc/conversionkit.rsi
-    state: iconhb  
+    state: iconhb
   - type: Item
     size: Normal
   - type: Tag
     tags:
-    - ConversionKitHB
+    - ConversionKitHB

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

@@ -2,7 +2,7 @@
   name: PRIbar
   parent: BaseCrowbar
   id: Pribar
-  description: A purpose built crowbar for prying open firelocks. Collapses to fit in a pocket.
+  description: A purpose-built crowbar for prying open firelocks. Collapses to fit in a pocket.
   components:
   - type: Sprite
     sprite: _Impstation/Objects/Tools/pribar.rsi
@@ -25,3 +25,40 @@
         Piercing: 8
     soundHit:
       path: "/Audio/Weapons/bladeslice.ogg"
+  - type: Construction
+    graph: UpgradeToolPRIbarConversion
+    node: start
+
+- type: entity
+  name: PRIbar+
+  parent: Pribar
+  id: PRIbarPlus
+  description: A purpose-built crowbar for prying open firelocks, upgraded with a wrench on the back side. Collapses to fit in a pocket.
+  components:
+  - type: Sprite
+    sprite: _Impstation/Objects/Tools/pribarplus.rsi
+    state: icon
+  - type: Item
+    sprite: _Impstation/Objects/Tools/pribarplus.rsi
+    size: Small
+    storedSprite:
+      sprite: _Impstation/Objects/Tools/pribarplus.rsi
+      state: storage
+  - type: MultipleTool
+    statusShowBehavior: true
+    entries:
+    - behavior: Prying
+      sprite:
+        sprite: _Impstation/Objects/Tools/pribarplus.rsi
+        state: icon
+      useSound: /Audio/Items/crowbar.ogg
+      changeSound: /Audio/_Impstation/Items/toolslap.ogg
+    - behavior: Anchoring
+      sprite:
+        sprite: _Impstation/Objects/Tools/pribarplus.rsi
+        state: wrench
+      useSound: /Audio/Items/ratchet.ogg
+      changeSound: /Audio/_Impstation/Items/toolslap.ogg
+  - type: Construction
+    graph: UpgradeToolPRIbarConversion
+    node: convert-pribarplus

Resources/Prototypes/_Impstation/Recipes/Construction/Graphs/tools/pribarplus.yml

@@ -0,0 +1,13 @@
+- type: constructionGraph
+  id: UpgradeToolPRIbarConversion
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: convert-pribarplus
+          steps:
+            - tag: ConversionKitPB
+              doAfter: 2
+
+    - node: convert-pribarplus
+      entity: PRIbarPlus

Resources/Prototypes/_Impstation/Recipes/Lathes/security.yml

@@ -15,7 +15,7 @@
     Steel: 1000
     Glass: 500
     Plastic: 500
-    
+
 - type: latheRecipe
   parent: BaseWeaponRecipe
   id: FullAutoConversionKit
@@ -24,7 +24,7 @@
     Steel: 500
     Glass: 200
     Plastic: 500
-    
+
 - type: latheRecipe
   parent: BaseWeaponRecipe
   id: HyperBurstConversionKit
@@ -33,7 +33,15 @@
     Steel: 500
     Glass: 200
     Plastic: 500
-
+
+- type: latheRecipe
+  parent: BaseToolRecipe
+  id: PRIbarPlusConversionKit
+  result: PRIbarPlusConversionKit
+  materials:
+    Steel: 500
+    Plastic: 500
+
 - type: latheRecipe
   parent: BaseEmptyAmmoRecipe
   id: MagazineLPistolEmpty
@@ -78,7 +86,7 @@
   result: MagazineBoxLPistol
   materials:
     Steel: 1000
-    
+
 - type: latheRecipe
   parent: BaseAmmoRecipe
   id: MagazineBoxLPistolIncendiary

Resources/Prototypes/_Impstation/tags.yml

@@ -20,6 +20,9 @@
 - type: Tag
   id: ConversionKitHB
 
+- type: Tag
+  id: ConversionKitPB
+
 - type: Tag
   id: DecapoidClaw
 

Resources/Textures/_Impstation/Objects/Misc/conversionkit.rsi/meta.json

@@ -12,6 +12,9 @@
     },
 	{
 	  "name": "iconhb"
+	},
+	{
+	  "name": "iconpb"
 	}
   ]
 }

Resources/Textures/_Impstation/Objects/Tools/pribarplus.rsi/meta.json

@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Kazne and Pivotbash",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "storage"
+        },
+        {
+            "name": "wrench"
+        }
+    ]
+}