From 42d91d071591968ed69984d48b8095cbc86bbdc2 Mon Sep 17 00:00:00 2001 From: IndieanaJones <47086570+IndieanaJones@users.noreply.github.com> Date: Thu, 14 Dec 2023 11:10:47 -0500 Subject: [PATCH] Clown Car Steals Accesses Again (#80288) ## About The Pull Request So, some time ago we fiddled around with vehicles to make them work better, and we accidentally lost what was supposed to be an intentional gimmick of the clown car. Clown cars used to obtain the accesses of victims that got kidnapped into the car, but this hasn't worked for a while now (supposedly around 15 months). This PR re-adds that behavior. ## Why It's Good For The Game Access snatching is a fun gimmick, and it should strike fear into everyone's hearts when the clown car finally catches the captain or a station engineer. ## Changelog :cl: fix: The clown car once again obtains the accesses of kidnapped crew within the car. Supermatter crystals beware! /:cl: --- code/modules/vehicles/cars/clowncar.dm | 1 + code/modules/vehicles/sealed.dm | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 6b019cac270..d5a3d7bdc7d 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -13,6 +13,7 @@ light_range = 8 light_power = 2 light_on = FALSE + access_provider_flags = VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_KIDNAPPED ///list of headlight colors we use to pick through when we have party mode due to emag var/headlight_colors = list(COLOR_RED, COLOR_ORANGE, COLOR_YELLOW, COLOR_LIME, COLOR_BRIGHT_BLUE, COLOR_CYAN, COLOR_PURPLE) ///Cooldown time inbetween [/obj/vehicle/sealed/car/clowncar/proc/roll_the_dice()] usages diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm index dc49f6b5dbe..de1b5ac93f0 100644 --- a/code/modules/vehicles/sealed.dm +++ b/code/modules/vehicles/sealed.dm @@ -3,6 +3,8 @@ var/enter_delay = 2 SECONDS var/mouse_pointer var/headlights_toggle = FALSE + ///Determines which occupants provide access when bumping into doors + var/access_provider_flags = VEHICLE_CONTROL_DRIVE /obj/vehicle/sealed/generate_actions() . = ..() @@ -31,7 +33,7 @@ . = ..() if(istype(A, /obj/machinery/door)) var/obj/machinery/door/conditionalwall = A - for(var/mob/occupant as anything in return_drivers()) + for(var/mob/occupant as anything in return_controllers_with_flag(access_provider_flags)) if(conditionalwall.try_safety_unlock(occupant)) return conditionalwall.bumpopen(occupant)