cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixing a few minor maintenance hindrances. [MDB IGNORE] (#21394)

Browse Source 
* Fixing a few minor maintenance hindrances.

* fixes

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: ghost sheep <sheepwiththemask@gmail.com>
This commit is contained in:
SkyratBot
2023-05-24 14:43:24 +00:00
committed by GitHub
co-authored by Ghom ghost sheep
parent 147d27c84f
commit a91c048f47
8 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/kinetic_crusher.dm
+4 -4
View File
@@ -120,21 +120,21 @@
/obj/item/kinetic_crusher/attack_secondary(atom/target, mob/living/user, clickparams)
return SECONDARY_ATTACK_CONTINUE_CHAIN
/obj/item/kinetic_crusher/afterattack_secondary(atom/target, mob/living/user, clickparams)
/obj/item/kinetic_crusher/afterattack_secondary(atom/target, mob/living/user, proximity_flag, click_parameters)
if(!HAS_TRAIT(src, TRAIT_WIELDED))
balloon_alert(user, "wield it first!")
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
if(target == user)
balloon_alert(user, "can't aim at yourself!")
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
fire_kinetic_blast(target, user, clickparams)
fire_kinetic_blast(target, user, click_parameters)
user.changeNext_move(CLICK_CD_MELEE)
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
/obj/item/kinetic_crusher/proc/fire_kinetic_blast(atom/target, mob/living/user, clickparams)
/obj/item/kinetic_crusher/proc/fire_kinetic_blast(atom/target, mob/living/user, click_parameters)
if(!charged)
return
var/modifiers = params2list(clickparams)
var/modifiers = params2list(click_parameters)
var/turf/proj_turf = user.loc
if(!isturf(proj_turf))
return