mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 13:47:33 +01:00
[MIRROR] Gripper fixes (#12714)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
62d4e50a7f
commit
afcea67115
@@ -90,10 +90,10 @@
|
||||
. += span_notice("Mark a[emagged ? "nything": " creature"] with the destabilizing force, then hit them in melee to do <b>[force + detonation_damage]</b> damage.")
|
||||
. += span_notice("Does <b>[force + detonation_damage + backstab_bonus]</b> damage if the target is backstabbed, instead of <b>[force + detonation_damage]</b>.")
|
||||
|
||||
/obj/item/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user)
|
||||
/obj/item/kinetic_crusher/attack(mob/living/target, mob/living/user, target_zone, attack_modifier)
|
||||
if(!wielded && requires_wield)
|
||||
to_chat(user, span_warning("[src] is too heavy to use with one hand."))
|
||||
return
|
||||
return ITEM_INTERACT_FAILURE
|
||||
..()
|
||||
|
||||
/obj/item/kinetic_crusher/afterattack(atom/target, mob/living/user, proximity_flag, clickparams)
|
||||
|
||||
@@ -152,14 +152,14 @@
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/ore/attack(mob/living/M as mob, mob/living/user as mob)
|
||||
/obj/item/ore/attack(mob/living/M, mob/living/user, target_zone, attack_modifier)
|
||||
if(M.handle_eat_minerals(src, user))
|
||||
return
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
..()
|
||||
|
||||
/obj/item/ore/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
|
||||
if(user.handle_eat_minerals(src))
|
||||
return
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
..()
|
||||
|
||||
/obj/item/ore_chunk
|
||||
|
||||
Reference in New Issue
Block a user