From b9b6d09f2331ff157b360c50b91e7efd98c687a1 Mon Sep 17 00:00:00 2001 From: d3athrow Date: Tue, 15 Jul 2014 19:41:40 -0500 Subject: [PATCH] Pod fixes. --- .../pomf/spacepods/spacepods.dm | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/code/WorkInProgress/pomf/spacepods/spacepods.dm b/code/WorkInProgress/pomf/spacepods/spacepods.dm index ac3cf438f83..c99ce35085c 100644 --- a/code/WorkInProgress/pomf/spacepods/spacepods.dm +++ b/code/WorkInProgress/pomf/spacepods/spacepods.dm @@ -426,28 +426,30 @@ return 1 /obj/spacepod/relaymove(mob/user, direction) - if(battery && battery.charge && health) + var/moveship = 1 + if(battery && battery.charge >= 3 && health) src.dir = direction switch(direction) if(1) if(inertia_dir == 2) inertia_dir = 0 - return 0 + moveship = 0 if(2) if(inertia_dir == 1) inertia_dir = 0 - return 0 + moveship = 0 if(4) if(inertia_dir == 8) inertia_dir = 0 - return 0 + moveship = 0 if(8) if(inertia_dir == 4) inertia_dir = 0 - return 0 - step(src, direction) - if(istype(src.loc, /turf/space)) - inertia_dir = direction + moveship = 0 + if(moveship) + step(src, direction) + if(istype(src.loc, /turf/space)) + inertia_dir = direction else if(!battery) user << "No energy cell detected." @@ -458,7 +460,7 @@ else user << "Unknown error has occurred, yell at pomf." return 0 - battery.use(3) + battery.charge = max(0, battery.charge - 3) /obj/effect/landmark/spacepod/random name = "spacepod spawner"