From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Fri, 15 Dec 2023 01:34:36 +0000 (+0000)
Subject: add glaive to salv weapons (#22514)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=fce18f43da1731d3e92a843e7a20e613e774cc09;p=space-station-14.git

add glaive to salv weapons (#22514)

* refactor ops

* add recipe

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
---

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
index 17e5284604..731c1911dd 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -1,8 +1,8 @@
 - type: entity
-  name: crusher
+  abstract: true
   parent: BaseItem
   id: BaseWeaponCrusher # Crusher? But I...
-  abstract: true
+  name: crusher
   description: An early design of the proto-kinetic accelerator.
   components:
   - type: Sharp
@@ -13,7 +13,6 @@
     radius: 4
 
 - type: entity
-  name: crusher
   parent: BaseWeaponCrusher
   id: WeaponCrusher
   components:
@@ -65,9 +64,9 @@
   - type: Prying
 
 - type: entity
-  name: crusher dagger
   parent: BaseWeaponCrusher
   id: WeaponCrusherDagger
+  name: crusher dagger
   description: A scaled down version of a proto-kinetic crusher, usually used in a last ditch scenario.
   components:
   - type: Sprite
@@ -79,37 +78,27 @@
     damage:
       types:
         Slash: 6.5
-  - type: Item
-    size: Small
   - type: Tag
     tags:
     - Knife
 
 # Like a crusher... but better
 - type: entity
-  name: crusher glaive
   parent: WeaponCrusher
   id: WeaponCrusherGlaive
+  name: crusher glaive
   description: An early design of the proto-kinetic accelerator, in glaive form.
   components:
-  - type: Tag
-    tags:
-      - Pickaxe
-  - type: UseDelayOnShoot
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/crusher_glaive.rsi
   - type: UseDelay
     delay: 1.9
-  - type: Gun
-    fireRate: 1
-  - type: RechargeBasicEntityAmmo
-    rechargeCooldown: 0.5
   - type: LeechOnMarker
     leech:
       groups:
         Brute: -15
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/crusher_glaive.rsi
   - type: MeleeWeapon
-    wideAnimationRotation: -135
     attackRate: 1.25
-  - type: Item
-    size: Ginormous
+  - type: Tag
+    tags:
+      - Pickaxe
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 730ecdf72d..535564496d 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -265,6 +265,7 @@
       - SyringeBluespace
       - WeaponCrusher
       - WeaponCrusherDagger
+      - WeaponCrusherGlaive
       - WeaponForceGun
       - WeaponProtoKineticAccelerator
       - WeaponTetherGun
diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml
index 01178b386c..344f2c38d9 100644
--- a/Resources/Prototypes/Recipes/Lathes/devices.yml
+++ b/Resources/Prototypes/Recipes/Lathes/devices.yml
@@ -149,6 +149,15 @@
     Glass: 250
     Plastic: 50
 
+- type: latheRecipe
+  id: WeaponCrusherGlaive
+  result: WeaponCrusherGlaive
+  completetime: 5
+  materials:
+    Steel: 1500
+    Glass: 250
+    Silver: 250
+
 - type: latheRecipe
   id: WeaponForceGun
   result: WeaponForceGun
diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index bf8d67bc30..0ff93e3a55 100644
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -14,6 +14,8 @@
   # These are roundstart but not replenishable for salvage
   - WeaponCrusher
   - WeaponCrusherDagger
+  # This is not roundstart since its a direct upgrade
+  - WeaponCrusherGlaive
 
 - type: technology
   id: DraconicMunitions