Fixes yet another couple TK teleportation tricks. (#62925)

Fixes airlock notes and cloth sheets cut from gauzes being teleported to the user because of TK.
This commit is contained in:
Ghom
2021-11-28 09:29:27 +01:00
committed by GitHub
parent 3ec3b8c389
commit 7b7b058048
2 changed files with 13 additions and 6 deletions
+5 -2
View File
@@ -894,9 +894,12 @@
C.play_tool_sound(src)
update_appearance()
else if((C.tool_behaviour == TOOL_WIRECUTTER) && note)
user.visible_message(span_notice("[user] cuts down [note] from [src]."), span_notice("You remove [note] from [src]."))
if(user.CanReach(src))
user.visible_message(span_notice("[user] cuts down [note] from [src]."), span_notice("You remove [note] from [src]."))
else //telekinesis
visible_message(span_notice("[C] cuts down [note] from [src]."))
C.play_tool_sound(src)
note.forceMove(get_turf(user))
note.forceMove(C.drop_location())
note = null
update_appearance()
else if(is_wire_tool(C) && panel_open)
+8 -4
View File
@@ -174,10 +174,14 @@
if(get_amount() < 2)
to_chat(user, span_warning("You need at least two gauzes to do this!"))
return
new /obj/item/stack/sheet/cloth(user.drop_location())
user.visible_message(span_notice("[user] cuts [src] into pieces of cloth with [I]."), \
span_notice("You cut [src] into pieces of cloth with [I]."), \
span_hear("You hear cutting."))
new /obj/item/stack/sheet/cloth(I.drop_location())
if(user.CanReach(src))
user.visible_message(span_notice("[user] cuts [src] into pieces of cloth with [I]."), \
span_notice("You cut [src] into pieces of cloth with [I]."), \
span_hear("You hear cutting."))
else //telekinesis
visible_message(span_notice("[I] cuts [src] into pieces of cloth."), \
blind_message = span_hear("You hear cutting."))
use(2)
else
return ..()