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

Exempts horrible goose from tram hit counter (#72811)

Browse Source 
Tram hitting the goose increments the hit counter, this fixes it so
mobs without clients don't increase the Tram's hit counter.
This commit is contained in:
lessthanthree
2023-01-23 02:27:35 +00:00
committed by GitHub
parent eebd8209cd
commit 2bd2cb6ecf
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/signs/signs_interactive.dm
+9 -1
View File
@@ -111,10 +111,18 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/delamination_counter, 32)
/obj/structure/sign/collision_counter/Destroy()
return ..()
/obj/structure/sign/collision_counter/proc/new_hit()
/obj/structure/sign/collision_counter/proc/new_hit(lift_master, collided_type)
SIGNAL_HANDLER
if(!ismob(collided_type))
return
var/mob/living/carbon/human/victim = collided_type // Real players only, no gaming high score
if(!victim.client)
return
hit_count++
if(hazard_flash)
update_appearance()
return
code/modules/industrial_lift/industrial_lift.dm
+1 -1
View File
@@ -418,7 +418,7 @@ GLOBAL_LIST_EMPTY(lifts)
var/datum/callback/land_slam = new(collided, TYPE_PROC_REF(/mob/living/, tram_slam_land))
collided.throw_at(throw_target, 200 * collision_lethality, 4 * collision_lethality, callback = land_slam)
SEND_SIGNAL(src, COMSIG_TRAM_COLLISION)
SEND_SIGNAL(src, COMSIG_TRAM_COLLISION, collided)
unset_movement_registrations(exited_locs)
group_move(things_to_move, going)