From a7fb47de9ca5f8aade68a1a9bab8aaa0dc3fd286 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 1 Aug 2020 16:40:17 -0400 Subject: [PATCH 1/2] Structure/Machinery exploit fix --- code/datums/helper_datums/teleport.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 65576a52a72..01e02247906 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -202,7 +202,9 @@ var/obj/belly/destination_belly = destination.loc var/mob/living/telenommer = destination_belly.owner if(istype(telenommer)) - if(!isliving(teleatom)) + if(istype(teleatom, /obj/machinery) || istype(teleatom, /obj/structure)) + return 0 + elseif(!isliving(teleatom)) return 1 else var/mob/living/telemob = teleatom From 69d12b8382ad74210b8e9173b57b461b3d8c2695 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 1 Aug 2020 16:50:05 -0400 Subject: [PATCH 2/2] I was thinking in a different language --- code/datums/helper_datums/teleport.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 01e02247906..abc7ade225f 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -204,7 +204,7 @@ if(istype(telenommer)) if(istype(teleatom, /obj/machinery) || istype(teleatom, /obj/structure)) return 0 - elseif(!isliving(teleatom)) + else if(!isliving(teleatom)) return 1 else var/mob/living/telemob = teleatom