From b42368d3712db5b6b864a4185056e009399256c4 Mon Sep 17 00:00:00 2001 From: keronshb Date: Sun, 13 Dec 2020 13:49:09 -0500 Subject: [PATCH 1/4] Clown Car The Honkening The return of the clowncar, with slight hugbox. --- code/modules/uplink/uplink_items/uplink_roles.dm | 4 +--- code/modules/vehicles/cars/clowncar.dm | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm index b8eaf41371..b384106396 100644 --- a/code/modules/uplink/uplink_items/uplink_roles.dm +++ b/code/modules/uplink/uplink_items/uplink_roles.dm @@ -60,7 +60,6 @@ cost = 15 restricted_roles = list("Clown") -/* /datum/uplink_item/role_restricted/clowncar name = "Clown Car" desc = "The Clown Car is the ultimate transportation method for any worthy clown! \ @@ -69,9 +68,8 @@ someone saves them or they manage to crawl out. Be sure not to ram into any walls or vending machines, as the springloaded seats \ are very sensetive. Now with our included lube defense mechanism which will protect you against any angry shitcurity!" item = /obj/vehicle/sealed/car/clowncar - cost = 15 + cost = 16 restricted_roles = list("Clown") -*/ /datum/uplink_item/role_restricted/haunted_magic_eightball name = "Haunted Magic Eightball" diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index cd21b61dbe..c78e59bcb6 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -56,7 +56,7 @@ L.visible_message("[src] rams into [L] and sucks him up!") //fuck off shezza this isn't ERP. mob_forced_enter(L) playsound(src, pick('sound/vehicles/clowncar_ram1.ogg', 'sound/vehicles/clowncar_ram2.ogg', 'sound/vehicles/clowncar_ram3.ogg'), 75) - else if(istype(M, /turf/closed)) + else if(istype(M, /turf/closed) || istype(M, /obj/machinery/door/airlock/external)) visible_message("[src] rams into [M] and crashes!") playsound(src, pick('sound/vehicles/clowncar_crash1.ogg', 'sound/vehicles/clowncar_crash2.ogg'), 75) playsound(src, 'sound/vehicles/clowncar_crashpins.ogg', 75) From 830ae2b1c30d93e70562227553a3e3b64a668c39 Mon Sep 17 00:00:00 2001 From: keronshb Date: Tue, 15 Dec 2020 12:14:49 -0500 Subject: [PATCH 2/4] Code for preventing it on moving onto a space tile For some reason this doesn't work so I've commented it out until I can figure out how to get it to work. --- code/modules/vehicles/cars/clowncar.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index c78e59bcb6..27951da6da 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -18,6 +18,14 @@ . = ..() initialize_controller_action_type(/datum/action/vehicle/sealed/horn/clowncar, VEHICLE_CONTROL_DRIVE) +/* +/obj/vehicle/clowncar/vehicle_move(direction) //Prevent it from moving onto space + if(isspaceturf(get_step(src, direction))) + return FALSE + else + return ..() +*/ + /obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M) if(ishuman(M)) var/mob/living/carbon/human/H = M From d08da7625396206fcb14ec62be9315ba61874534 Mon Sep 17 00:00:00 2001 From: keronshb Date: Tue, 15 Dec 2020 19:45:48 -0500 Subject: [PATCH 3/4] This should actually fix the space tile thing Try 3 --- code/modules/vehicles/cars/clowncar.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 27951da6da..1b70bbc068 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -18,13 +18,13 @@ . = ..() initialize_controller_action_type(/datum/action/vehicle/sealed/horn/clowncar, VEHICLE_CONTROL_DRIVE) -/* -/obj/vehicle/clowncar/vehicle_move(direction) //Prevent it from moving onto space + +/obj/vehicle/sealed/car/clowncar/vehicle_move(direction) //Prevent it from moving onto space if(isspaceturf(get_step(src, direction))) return FALSE else return ..() -*/ + /obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M) if(ishuman(M)) From 118d7a1dbf136ebef141f05fbc1b09c26043478d Mon Sep 17 00:00:00 2001 From: keronshb Date: Fri, 18 Dec 2020 00:01:11 -0500 Subject: [PATCH 4/4] ACTUALLY prevents the clown car from moving onto a space tile ACTUALLY prevents the clown car from moving onto a space tile --- code/modules/vehicles/cars/clowncar.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 1b70bbc068..7a7886e999 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -19,7 +19,7 @@ initialize_controller_action_type(/datum/action/vehicle/sealed/horn/clowncar, VEHICLE_CONTROL_DRIVE) -/obj/vehicle/sealed/car/clowncar/vehicle_move(direction) //Prevent it from moving onto space +/obj/vehicle/sealed/car/clowncar/driver_move(mob/user, direction) //Prevent it from moving onto space if(isspaceturf(get_step(src, direction))) return FALSE else