From 50355363117c3b88d46555d1de204fde828f9cea Mon Sep 17 00:00:00 2001 From: Letter N <24603524+LetterN@users.noreply.github.com> Date: Fri, 22 Oct 2021 03:03:59 +0800 Subject: [PATCH] Clowncar does not ignore airlocks again (#15220) * no airlock tomfoolery * Update clowncar.dm * Update clowncar.dm * assuming direct control fixes inconsistant indentation. * inverted operators Co-authored-by: DeltaFire --- code/modules/vehicles/cars/clowncar.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index c4da65a902..f65df26488 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -90,7 +90,7 @@ playsound(src, pick('sound/vehicles/clowncar_ram1.ogg', 'sound/vehicles/clowncar_ram2.ogg', 'sound/vehicles/clowncar_ram3.ogg'), 75) log_combat(src, hittarget_living, "sucked up") return - if(!istype(bumped, /turf/closed)) + if(!istype(bumped, /turf/closed) && !istype(bumped, /obj/machinery/door/airlock/external)) return visible_message(span_warning("[src] rams into [bumped] and crashes!")) playsound(src, pick('sound/vehicles/clowncar_crash1.ogg', 'sound/vehicles/clowncar_crash2.ogg'), 75) @@ -237,6 +237,11 @@ for(var/mob/busdriver as anything in return_drivers()) busdriver.client.give_award(/datum/award/achievement/misc/the_best_driver, busdriver) +/obj/vehicle/sealed/car/clowncar/driver_move(mob/user, direction) //Prevent it from moving onto space + if(isspaceturf(get_step(src, direction))) + return FALSE + return ..() + /obj/vehicle/sealed/car/clowncar/twitch_plays key_type = null explode_on_death = FALSE