cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-07-12 08:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2023-06-21 19:03:35 +02:00
parent 89fc57f631 a848dd292d
commit ff7df50a7e
346 changed files with 5621 additions and 4174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/kinetic_crusher.dm
+4 -5
View File
@@ -69,8 +69,8 @@
/obj/item/weapon/kinetic_crusher/Initialize()
. = ..()
if(requires_Wield)
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(on_wield))
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(on_unwield))
/obj/item/weapon/kinetic_crusher/ComponentInitialize()
. = ..()
@@ -163,7 +163,7 @@
D.fire()
charged = FALSE
update_icon()
addtimer(CALLBACK(src, .proc/Recharge), charge_time)
addtimer(CALLBACK(src, PROC_REF(Recharge)), charge_time)
// * (user?.ConflictElementCount(CONFLICT_ELEMENT_CRUSHER) || 1 - tentatively commented out
return
if(proximity_flag && isliving(target))
@@ -258,7 +258,7 @@
update_item_state = FALSE
slot_flags = SLOT_BELT
/obj/item/weapon/kinetic_crusher/machete/gauntlets
@@ -425,4 +425,3 @@ but alas
- hatterhat
*/