This commit is contained in:
silicons
2020-09-15 17:27:11 -07:00
parent 15b705dd37
commit 95ebeac5b6
7 changed files with 5 additions and 28 deletions
@@ -107,7 +107,7 @@
if(user_C.handcuffed)
var/obj/O = user_C.get_item_by_slot(SLOT_HANDCUFFED)
if(istype(O))
//user_C.visible_message("<span class='warning'>[user_C] attempts to remove [O]!</span>", \
//user_C.visible_message("<span class='warning'>[user_C] attempts to remove [O]!</span>",
// "<span class='warning'>You snap [O] like it's nothing!</span>")
user_C.clear_cuffs(O,TRUE)
playsound(get_turf(usr), 'sound/effects/grillehit.ogg', 80, 1, -1)
@@ -165,7 +165,7 @@
// Broadcast Message
if(amSilent)
//if (!iscarbon(target))
// user.visible_message("<span class='notice'>[user] shifts [target] closer to [user.p_their()] mouth.</span>", \
// user.visible_message("<span class='notice'>[user] shifts [target] closer to [user.p_their()] mouth.</span>",
// "<span class='notice'>You secretly slip your fangs into [target]'s flesh.</span>", \
// vision_distance = 2, ignored_mobs=target) // Only people who AREN'T the target will notice this action.
//else
+1 -1
View File
@@ -263,7 +263,7 @@
. = ..()
if(.)
return
for(var/obj/item/I in src_object)
for(var/obj/item/I in src_object.contents())
if(user.active_storage != src_object)
if(I.on_found(user))
return