From c6c88bb0e5b510a8979ceed9b3e364eaaf902bd8 Mon Sep 17 00:00:00 2001 From: n3ophyt3 Date: Thu, 7 Apr 2011 23:14:18 +0000 Subject: [PATCH] Looked into human/robot/monkey/alien/etc Bump() code, found a possible cause for that strange bug where you can't push things and airlocks won't open when you run into them and etc. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1413 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/carbon/alien/humanoid/humanoid.dm | 1 + code/modules/mob/living/carbon/human/human.dm | 4 +++- code/modules/mob/living/carbon/monkey/monkey.dm | 1 + code/modules/mob/living/silicon/robot/robot.dm | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 7ef7b3c98a6..4907ace2e4b 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -44,6 +44,7 @@ if (istype(AM, /obj/window)) if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST) for(var/obj/window/win in get_step(AM,t)) + src.now_pushing = 0 return step(AM, t) src.now_pushing = null diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 5df598d8e80..7a5ae0cc3de 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -93,6 +93,7 @@ tmob.stunned = max(4, tmob.stunned) playsound(src.loc, 'Egloves.ogg', 50, 1, -1) W:charges-- + src.now_pushing = 0 return if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & 32) if(prob(40) && !(src.mutations & 32)) @@ -112,9 +113,10 @@ if (istype(AM, /obj/window)) if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST) for(var/obj/window/win in get_step(AM,t)) + src.now_pushing = 0 return step(AM, t) - src.now_pushing = null + src.now_pushing = 0 return return diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index cf6476f677f..de9c189ae26 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -65,6 +65,7 @@ if (istype(AM, /obj/window)) if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST) for(var/obj/window/win in get_step(AM,t)) + src.now_pushing = 0 return step(AM, t) src.now_pushing = null diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index f26fc490e78..807a7f902c0 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -323,6 +323,7 @@ if (istype(AM, /obj/window)) if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST) for(var/obj/window/win in get_step(AM,t)) + src.now_pushing = 0 return step(AM, t) src.now_pushing = null