mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
You can now thank the clown car driver, and new medals for being the best clown car driver (#41572)
* done * also this * also a medal for enough thanks * done
This commit is contained in:
committed by
yogstation13-bot
parent
c5a957d103
commit
d9d873a33a
@@ -28,3 +28,5 @@
|
||||
#define MEDAL_PULSE "Jackpot"
|
||||
#define MEDAL_TIMEWASTE "Overextended The Joke"
|
||||
#define MEDAL_RODSUPLEX "Feat of Strength"
|
||||
#define MEDAL_CLOWNCARKING "Round and Full"
|
||||
#define MEDAL_THANKSALOT "The Best Driver"
|
||||
|
||||
@@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
|
||||
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "arcade", /datum/mood_event/arcade)
|
||||
if(prob(0.0001)) //1 in a million
|
||||
new /obj/item/gun/energy/pulse/prize(src)
|
||||
SSmedals.UnlockMedal(MEDAL_PULSE, usr.client)
|
||||
SSmedals.UnlockMedal(MEDAL_PULSE, user.client)
|
||||
|
||||
if(!contents.len)
|
||||
var/prizeselect
|
||||
|
||||
@@ -13,12 +13,14 @@
|
||||
var/droppingoil = FALSE
|
||||
var/RTDcooldown = 150
|
||||
var/lastRTDtime = 0
|
||||
var/thankscount
|
||||
var/cannonmode = FALSE
|
||||
var/cannonbusy = FALSE
|
||||
|
||||
/obj/vehicle/sealed/car/clowncar/generate_actions()
|
||||
. = ..()
|
||||
initialize_controller_action_type(/datum/action/vehicle/sealed/horn/clowncar, VEHICLE_CONTROL_DRIVE)
|
||||
initialize_controller_action_type(/datum/action/vehicle/sealed/Thank, VEHICLE_CONTROL_KIDNAPPED)
|
||||
|
||||
/obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M)
|
||||
if(ishuman(M))
|
||||
@@ -33,6 +35,13 @@
|
||||
. = ..()
|
||||
playsound(src, pick('sound/vehicles/clowncar_load1.ogg', 'sound/vehicles/clowncar_load2.ogg'), 75)
|
||||
|
||||
/obj/vehicle/sealed/car/clowncar/after_add_occupant(mob/M, control_flags)
|
||||
. = ..()
|
||||
if(return_controllers_with_flag(VEHICLE_CONTROL_KIDNAPPED).len >= 30)
|
||||
for(var/i in return_drivers())
|
||||
var/mob/voreman = i
|
||||
SSmedals.UnlockMedal(MEDAL_CLOWNCARKING,voreman.client)
|
||||
|
||||
/obj/vehicle/sealed/car/clowncar/mob_exit(mob/M, silent = FALSE, randomstep = FALSE)
|
||||
. = ..()
|
||||
UnregisterSignal(M, COMSIG_MOB_CLICKON)
|
||||
@@ -177,3 +186,10 @@
|
||||
playsound(src, pick('sound/vehicles/carcannon1.ogg', 'sound/vehicles/carcannon2.ogg', 'sound/vehicles/carcannon3.ogg'), 75)
|
||||
L.throw_at(A, 10, 2)
|
||||
return COMSIG_MOB_CANCEL_CLICKON
|
||||
|
||||
/obj/vehicle/sealed/car/clowncar/proc/ThanksCounter()
|
||||
thankscount++
|
||||
if(thankscount >= 100)
|
||||
for(var/i in return_drivers())
|
||||
var/mob/busdriver = i
|
||||
SSmedals.UnlockMedal(MEDAL_THANKSALOT,busdriver.client)
|
||||
|
||||
@@ -176,3 +176,18 @@
|
||||
if(C.cannonbusy)
|
||||
to_chat(owner, "<span class='notice'>Please wait for the vehicle to finish its current action first.</span>")
|
||||
C.ToggleCannon()
|
||||
|
||||
/datum/action/vehicle/sealed/Thank
|
||||
name = "Thank the Clown car Driver"
|
||||
desc = "They're just doing their job."
|
||||
button_icon_state = "car_thanktheclown"
|
||||
var/last_thank_time
|
||||
|
||||
/datum/action/vehicle/sealed/Thank/Trigger()
|
||||
if(istype(vehicle_entered_target, /obj/vehicle/sealed/car/clowncar))
|
||||
var/obj/vehicle/sealed/car/clowncar/C = vehicle_entered_target
|
||||
if(world.time >= last_thank_time + 60)
|
||||
var/mob/living/carbon/human/clown = pick(C.return_drivers())
|
||||
owner.say("Thank you for the fun ride, [clown.name]!")
|
||||
last_thank_time = world.time
|
||||
C.ThanksCounter()
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 2.3 KiB |
Reference in New Issue
Block a user