cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes a very small mistake with the clickon signal procs cleanup. (#62214)

Browse Source 
I haven't realized that the target loc check on clowncar.dm would have prevented players from firing the emag mode cannon when clicking on turfs (because their loc is an area). So I'm adding a ismovable(target) check before the target.loc in the same conditional statement.
Also renaming the `A` argument to `target`.
This commit is contained in:
Ghom
2021-10-20 13:01:33 -04:00
committed by GitHub
parent 485a3f493d
commit 310b68f01b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/cars/clowncar.dm
+4 -4
View File
@@ -219,19 +219,19 @@
driver.update_mouse_pointer()
///Fires the cannon where the user clicks
/obj/vehicle/sealed/car/clowncar/proc/fire_cannon_at(mob/user, atom/A, list/modifiers)
/obj/vehicle/sealed/car/clowncar/proc/fire_cannon_at(mob/user, atom/target, list/modifiers)
SIGNAL_HANDLER
if(cannonmode != CLOWN_CANNON_READY || !length(return_controllers_with_flag(VEHICLE_CONTROL_KIDNAPPED)))
return
//The driver can still examine things and interact with his inventory.
if(modifiers[SHIFT_CLICK] || !isturf(A.loc))
if(modifiers[SHIFT_CLICK] || (ismovable(target) && !isturf(target.loc)))
return
var/mob/living/unlucky_sod = pick(return_controllers_with_flag(VEHICLE_CONTROL_KIDNAPPED))
mob_exit(unlucky_sod, TRUE)
flick("clowncar_recoil", src)
playsound(src, pick('sound/vehicles/carcannon1.ogg', 'sound/vehicles/carcannon2.ogg', 'sound/vehicles/carcannon3.ogg'), 75)
unlucky_sod.throw_at(A, 10, 2)
log_combat(user, unlucky_sod, "fired", src, "towards [A]") //this doesn't catch if the mob hits something between the car and the target
unlucky_sod.throw_at(target, 10, 2)
log_combat(user, unlucky_sod, "fired", src, "towards [target]") //this doesn't catch if the mob hits something between the car and the target
return COMSIG_MOB_CANCEL_CLICKON
///Increments the thanks counter every time someone thats been kidnapped thanks the driver