From f9b962fd47ad4677d0cec88133bc1393ba4f5bed Mon Sep 17 00:00:00 2001 From: Swag McYolosteinen Date: Sat, 14 Feb 2015 12:00:04 +0100 Subject: [PATCH 1/3] Fixed #7594, walls becoming nondense due to adminteleport. --- code/modules/admin/verbs/adminjump.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 8ec36f3d008..885ffbe92ab 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -1,11 +1,11 @@ -/client/proc/jumptoarea(area/A in sortedAreas) +/client/proc/jumptoarea(area/A in sortedAreas) set name = "Jump to Area" set desc = "Area to jump to" set category = "Admin" if(!src.holder) src << "Only administrators may use this command." return - + if(!A) return @@ -19,8 +19,8 @@ var/turf/T = pick_n_take(turfs) if(!T) src << "Nowhere to jump to!" - return - admin_forcemove(usr, T) + return + admin_forcemove(usr, T) log_admin("[key_name(usr)] jumped to [A]") message_admins("[key_name_admin(usr)] jumped to [A]") feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -152,6 +152,7 @@ var/startdensity = mover.density var/startflags = mover.pass_flags var/startincorporeal = 0 + var/startdestinationdensity = newloc.density if(istype(mover, /mob/living)) var/mob/living/L = mover startincorporeal = L.incorporeal_move @@ -165,3 +166,5 @@ if(istype(mover, /mob/living)) var/mob/living/L = mover L.incorporeal_move = startincorporeal + newloc.density = startdestinationdensity + From e0f82d960a6f18395c2334891344d2269e406208 Mon Sep 17 00:00:00 2001 From: Swag McYolosteinen Date: Sat, 14 Feb 2015 18:39:16 +0100 Subject: [PATCH 2/3] removes incorporealmove things --- code/modules/admin/verbs/adminjump.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 885ffbe92ab..2efc72ce8c6 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -153,18 +153,11 @@ var/startflags = mover.pass_flags var/startincorporeal = 0 var/startdestinationdensity = newloc.density - if(istype(mover, /mob/living)) - var/mob/living/L = mover - startincorporeal = L.incorporeal_move - L.incorporeal_move = 1 mover.density = 0 mover.pass_flags = ALL newloc.density = 0 . = mover.Move(newloc) mover.density = startdensity mover.pass_flags = startflags - if(istype(mover, /mob/living)) - var/mob/living/L = mover - L.incorporeal_move = startincorporeal newloc.density = startdestinationdensity From 18a344e66b9561500f7ebc3a1317770da4d191ba Mon Sep 17 00:00:00 2001 From: Swag McYolosteinen Date: Tue, 17 Feb 2015 13:44:21 +0100 Subject: [PATCH 3/3] Update adminjump.dm --- code/modules/admin/verbs/adminjump.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 2efc72ce8c6..41442e9cdd8 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -151,7 +151,6 @@ /proc/admin_forcemove(var/mob/mover, var/atom/newloc) var/startdensity = mover.density var/startflags = mover.pass_flags - var/startincorporeal = 0 var/startdestinationdensity = newloc.density mover.density = 0 mover.pass_flags = ALL