cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12879 from Runa-Dacino/belt_dagger

Browse Source 
Adds belt slot flag to proto-kinetic machete and subtypes
This commit is contained in:
Casey
2022-05-08 05:41:52 -04:00
committed by CHOMPStation2
parent 258b3b8a82
commit be7e0a3c87
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/mining/kinetic_crusher.dm
View File

@@ -230,7 +230,7 @@
desc = "A modified design of a proto-kinetic crusher, it is still little more of a combination of various mining tools cobbled together \ desc = "A modified design of a proto-kinetic crusher, it is still little more of a combination of various mining tools cobbled together \
and kit-bashed into a high-tech cleaver on a stick - with a handguard and a goliath hide grip. While it is still of little use to any \ and kit-bashed into a high-tech cleaver on a stick - with a handguard and a goliath hide grip. While it is still of little use to any \
but the most skilled and/or suicidal miners against local fauna, it's an elegant weapon for a more civilized hunter." but the most skilled and/or suicidal miners against local fauna, it's an elegant weapon for a more civilized hunter."
look gary there i am look gary there i am
- hatterhat - hatterhat
*/ */
@@ -256,6 +256,9 @@
backstab_bonus = 40 // 100 backstab_bonus = 40 // 100
thrown_bonus = 20 // 120 thrown_bonus = 20 // 120
update_item_state = FALSE update_item_state = FALSE
slot_flags = SLOT_BELT
/obj/item/weapon/kinetic_crusher/machete/gauntlets /obj/item/weapon/kinetic_crusher/machete/gauntlets
@@ -275,6 +278,7 @@
detonation_damage = 37 // 75 detonation_damage = 37 // 75
backstab_bonus = 55 // 130 backstab_bonus = 55 // 130
var/obj/item/offhand/crushergauntlets/offhand var/obj/item/offhand/crushergauntlets/offhand
slot_flags = null
/obj/item/weapon/kinetic_crusher/machete/gauntlets/equipped() /obj/item/weapon/kinetic_crusher/machete/gauntlets/equipped()
. = ..() . = ..()
@@ -381,6 +385,7 @@
thrown_bonus = 50 // 135 but you drop your knife because you threw it thrown_bonus = 50 // 135 but you drop your knife because you threw it
//destablizing force //destablizing force
/obj/item/projectile/destabilizer /obj/item/projectile/destabilizer
name = "destabilizing force" name = "destabilizing force"