This commit is contained in:
nevimer
2026-03-31 04:33:01 -04:00
parent 5cab4efdd3
commit 0c86a7b02f
2 changed files with 21 additions and 2 deletions
+20 -1
View File
@@ -26,9 +26,28 @@
// Taking brute or burn to bodyparts gives a damage flash
if(def_zone && (damagetype == BRUTE || damagetype == BURN))
damageoverlaytemp += .
var/obj/effect/overlay/hitmarker/hitmarker = new()
hitmarker.animate_damage(damage, src)
return .
/obj/effect/overlay/hitmarker
icon = 'icons/effects/96x160.dmi'
plane = POINT_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
alpha = 255
var/mob/living/carbon/my_carbon_mob
proc/animate_damage(damage, my_mob)
my_carbon_mob = my_mob
pixel_z = rand(-32,32)
pixel_w = rand(-32,64)
appearance_flags |= (KEEP_TOGETHER|RESET_COLOR|RESET_TRANSFORM)
my_carbon_mob.vis_contents |= src
maptext = MAPTEXT_SPESSFONT("[ROUND_UP(damage)]!")
animate(src, pixel_z = rand(-32,32), pixel_w = rand(-32,64), time = 1 SECONDS, easing = BOUNCE_EASING, alpha = 32)
QDEL_IN(src, 1.5 SECONDS)
/mob/living/carbon/human/get_damage_mod(damage_type)
if (!dna?.species?.damage_modifier)
return ..()
+1 -1
View File
@@ -15,7 +15,7 @@
#define APC_CHANNEL_ALARM_TRESHOLD 75
/obj/machinery/power/apc/proc/clap_handle()
lighting = APC_CHANNEL_IS_ON(lighting) ? 0 : 2
lighting = APC_CHANNEL_IS_ON(lighting) ? 0 : 2 // owo
update()
/obj/machinery/power/apc