mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-21 20:20:33 +01:00
Merge branch 'master' into upstream-feb12-2026
This commit is contained in:
@@ -130,6 +130,11 @@
|
||||
if(CONFIG_GET(flag/native_fov) && native_fov)
|
||||
affected_human.add_fov_trait(type, native_fov)
|
||||
|
||||
// BUBBER EDIT ADDITION - EMISSIVES
|
||||
if (affected_human.emissive_eyes)
|
||||
is_emissive = TRUE
|
||||
// BUBBER EDIT END
|
||||
|
||||
if(call_update)
|
||||
affected_human.update_body()
|
||||
|
||||
@@ -164,6 +169,7 @@
|
||||
|
||||
organ_owner.update_tint()
|
||||
organ_owner.update_sight()
|
||||
is_emissive = FALSE // BUBBER EDIT ADDITION
|
||||
UnregisterSignal(organ_owner, list(
|
||||
COMSIG_ATOM_BULLET_ACT,
|
||||
COMSIG_COMPONENT_CLEAN_FACE_ACT,
|
||||
@@ -322,6 +328,15 @@
|
||||
left_scar.color = my_head.draw_color
|
||||
overlays += left_scar
|
||||
|
||||
// BUBBER EDIT START - Customization Emissives
|
||||
if(is_emissive)
|
||||
var/mutable_appearance/emissive_left = emissive_appearance_copy(eye_left, owner)
|
||||
var/mutable_appearance/emissive_right = emissive_appearance_copy(eye_right, owner)
|
||||
|
||||
overlays += emissive_left
|
||||
overlays += emissive_right
|
||||
// BUBBER EDIT END - Customization Emissives
|
||||
|
||||
if(my_head.worn_face_offset)
|
||||
for (var/mutable_appearance/overlay as anything in overlays)
|
||||
my_head.worn_face_offset.apply_offset(overlay)
|
||||
|
||||
Reference in New Issue
Block a user