Skip to content

Commit

Permalink
Merge remote-tracking branch 'DopplerShift13/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
carpotoxin committed Oct 14, 2024
2 parents 651cdef + 53c3cbc commit e3ece8c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
Binary file modified icons/mob/human/bodyparts_greyscale.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,13 @@
// emissive handling
if(!monitor_state || monitor_state == "none")
return .

var/monitor_type = istype(src, /obj/item/bodypart/head/robot/android/synth_lizard) ? "lizard_em" : "monitor_em"
. += emissive_appearance('modular_doppler/modular_customization/accessories/icons/cybernetic/synth_screens.dmi', monitor_type, owner, alpha = owner.alpha)
return

var/image/monitor_emissive = image('icons/blanks/32x32.dmi', "nothing", -BODY_LAYER)
monitor_emissive.overlays += emissive_appearance('modular_doppler/modular_customization/accessories/icons/cybernetic/synth_screens.dmi', monitor_type, src, alpha = owner.alpha)
. += monitor_emissive
return .

/obj/item/bodypart/head/robot/android/welder_act_secondary(mob/living/user, obj/item/tool)
. = ..()
Expand Down

0 comments on commit e3ece8c

Please sign in to comment.