mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-30 08:39:12 +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
@@ -9,8 +9,8 @@
|
||||
drop_sound = 'sound/items/drop/device.ogg'
|
||||
pickup_sound = 'sound/items/pickup/device.ogg'
|
||||
|
||||
/obj/item/hand_labeler/attack()
|
||||
return
|
||||
/obj/item/hand_labeler/attack(mob/living/M, mob/living/user, target_zone, attack_modifier)
|
||||
return NONE
|
||||
|
||||
/obj/item/hand_labeler/afterattack(atom/A, mob/user, proximity)
|
||||
if(!proximity)
|
||||
|
||||
@@ -217,11 +217,12 @@
|
||||
onclose(user, "[name]")
|
||||
return
|
||||
|
||||
/obj/item/paper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
|
||||
/obj/item/paper/attack(mob/living/M, mob/living/user, target_zone, attack_modifier)
|
||||
if(user.zone_sel.selecting == O_EYES)
|
||||
user.visible_message(span_notice("You show the paper to [M]. "), \
|
||||
span_notice(" [user] holds up a paper and shows it to [M]. "))
|
||||
M.examinate(src)
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
|
||||
else if(user.zone_sel.selecting == O_MOUTH) // lipstick wiping
|
||||
if(ishuman(M))
|
||||
@@ -238,6 +239,8 @@
|
||||
span_notice("You wipe off [H]'s lipstick."))
|
||||
H.lip_style = null
|
||||
H.update_icons_body()
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
return ITEM_INTERACT_FAILURE
|
||||
|
||||
/obj/item/paper/proc/set_content(text,title)
|
||||
if(title)
|
||||
|
||||
@@ -150,11 +150,7 @@
|
||||
. = ..()
|
||||
create_reagents(30)
|
||||
|
||||
/obj/item/pen/reagent/attack(mob/living/M as mob, mob/user as mob)
|
||||
|
||||
if(!istype(M))
|
||||
return
|
||||
|
||||
/obj/item/pen/reagent/attack(mob/living/M, mob/living/user, target_zone, attack_modifier)
|
||||
. = ..()
|
||||
|
||||
if(M.can_inject(user,1))
|
||||
@@ -163,6 +159,7 @@
|
||||
var/contained = reagents.get_reagents()
|
||||
var/trans = reagents.trans_to_mob(M, 30, CHEM_BLOOD)
|
||||
add_attack_logs(user,M,"Injected with [src.name] containing [contained], trasferred [trans] units")
|
||||
return ITEM_INTERACT_SUCCESS
|
||||
|
||||
/*
|
||||
* Blade Pens
|
||||
|
||||
@@ -149,8 +149,8 @@ GLOBAL_VAR_INIT(photo_count, 0)
|
||||
size = nsize
|
||||
to_chat(usr, span_notice("Camera will now take [size]x[size] photos."))
|
||||
|
||||
/obj/item/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob)
|
||||
return
|
||||
/obj/item/camera/attack(mob/living/M, mob/living/user, target_zone, attack_modifier)
|
||||
return NONE
|
||||
|
||||
/obj/item/camera/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
|
||||
Reference in New Issue
Block a user