From d342a1735cbfbf65350a71ac59c43b6da9deb877 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Fri, 6 Sep 2013 08:03:18 -0400 Subject: [PATCH] People on DocCarts can pull rollerbeds --- code/WorkInProgress/ZomgPonies/objects/doccart.dm | 7 +++++++ code/modules/mob/living/living.dm | 4 ---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/WorkInProgress/ZomgPonies/objects/doccart.dm b/code/WorkInProgress/ZomgPonies/objects/doccart.dm index 9408569a423..4a997335b97 100644 --- a/code/WorkInProgress/ZomgPonies/objects/doccart.dm +++ b/code/WorkInProgress/ZomgPonies/objects/doccart.dm @@ -26,6 +26,13 @@ unbuckle() if(istype(user.l_hand, /obj/item/key/ambulance) || istype(user.r_hand, /obj/item/key/ambulance)) step(src, direction) + +// NEW PULLING CODE + if (istype(user.pulling, /obj/structure/stool/bed/roller)) + var/turf/T = loc + step(user.pulling, get_dir(user.pulling.loc, T)) + +// END NEW PULLING CODE update_mob() handle_rotation() else diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 4e359c8aaf2..162a69b49c7 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -369,10 +369,6 @@ if(pulling:ini_dir == NORTHWEST || pulling:ini_dir == NORTHEAST || pulling:ini_dir == SOUTHWEST || pulling:ini_dir == SOUTHEAST) for(var/obj/structure/window/win in get_step(pulling,get_dir(pulling.loc, T))) stop_pulling() - if (istype(pulling, /obj/structure/stool/bed/roller)) - if(pulling:ini_dir == NORTHWEST || pulling:ini_dir == NORTHEAST || pulling:ini_dir == SOUTHWEST || pulling:ini_dir == SOUTHEAST) - for(var/obj/structure/stool/bed/roller in get_step(pulling,get_dir(pulling.loc, T))) - stop_pulling() if (pulling) step(pulling, get_dir(pulling.loc, T)) else