From fc76fc1230b87cdede4a8626af6f1b8f9a64e4b1 Mon Sep 17 00:00:00 2001 From: TerraGS <40574831+TerraGS@users.noreply.github.com> Date: Tue, 27 Sep 2022 12:13:16 -0500 Subject: [PATCH] Fix for clown car not bumping (#70144) --- code/modules/vehicles/cars/clowncar.dm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 5f9141401a4..a7ead4b6509 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -26,7 +26,6 @@ . = ..() START_PROCESSING(SSobj,src) RegisterSignal(src, COMSIG_MOVABLE_CROSS_OVER, .proc/check_crossed) - RegisterSignal(src, COMSIG_MOVABLE_BUMP, .proc/check_bumped) /obj/vehicle/sealed/car/clowncar/process() if(light_on && (obj_flags & EMAGGED)) @@ -95,8 +94,8 @@ to_chat(user, span_danger("You use the [banana] to repair [src]!")) qdel(banana) -/obj/vehicle/sealed/car/clowncar/proc/check_bumped(atom/bumped) - SIGNAL_HANDLER +/obj/vehicle/sealed/car/clowncar/Bump(atom/bumped) + . = ..() if(isliving(bumped)) if(ismegafauna(bumped)) return @@ -148,11 +147,6 @@ STOP_PROCESSING(SSobj,src) return ..() -/obj/vehicle/sealed/car/clowncar/Destroy(force) - UnregisterSignal(src, COMSIG_MOVABLE_BUMP) - UnregisterSignal(src, COMSIG_MOVABLE_CROSS_OVER) - return ..() - /** * Plays a random funky effect * Only available while car is emagged