Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding basic wyrdling traits. #53

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Undead eyes stop glowing when they die.
  • Loading branch information
MistakeNot4892 committed Aug 17, 2024
commit 2ccd66dda514b4389e91540c14738706e203f10c
9 changes: 8 additions & 1 deletion code/modules/mob/living/human/human_appearance_head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@
// Eyes! TODO, make these a marking.
/mob/living/human/get_eye_colour()
// Force an evil red glow for undead mobs.
if(has_trait(/decl/trait/undead))
if(stat == CONSCIOUS && has_trait(/decl/trait/undead))
return COLOR_RED
return _eye_colour

/mob/living/human/death(gibbed)
. = ..()
if(!QDELETED(src) && has_trait(/decl/trait/undead))
var/obj/item/organ/external/head/head = get_organ(BP_HEAD)
head.glowing_eyes = initial(head.glowing_eyes)
update_eyes()

/mob/living/human/set_eye_colour(var/new_color, var/skip_update = FALSE)
if((. = ..()))
_eye_colour = new_color
Expand Down
26 changes: 17 additions & 9 deletions mods/pyrelight/datum/wyrdling/mask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,7 @@
else
socks_color = null

if(!fur_color || fur_color == COLOR_BLACK)
fur_color = initial(fur_color)
if(!socks_color || socks_color == COLOR_BLACK)
socks_color = initial(socks_color)
if(!markings_color || markings_color == COLOR_BLACK)
markings_color = initial(markings_color)

eyes_color = wyrdling.get_eye_colour()
if(!eyes_color ||eyes_color == COLOR_BLACK)
eyes_color = initial(eyes_color)

copy_wyrd_fur_color(fur_color)
copy_wyrd_marking_color(markings_color)
Expand All @@ -59,21 +50,38 @@
/*
/mob/living/simple_animal/passive/fox/copy_wyrd_fur_color(new_color)
fur_color = new_color
if(!fur_color || fur_color == COLOR_BLACK)
fur_color = initial(fur_color)
/mob/living/simple_animal/passive/fox/copy_wyrd_marking_color(new_color)
markings_color = new_color
if(!markings_color || markings_color == COLOR_BLACK)
markings_color = initial(markings_color)
/mob/living/simple_animal/passive/fox/copy_wyrd_socks_color(new_color)
socks_color = new_color
if(!socks_color || socks_color == COLOR_BLACK)
socks_color = initial(socks_color)
/mob/living/simple_animal/passive/fox/copy_wyrd_eyes_color(new_color)
eyes_color = new_color
if(!eyes_color ||eyes_color == COLOR_BLACK)
eyes_color = initial(eyes_color)

/mob/living/simple_animal/passive/deer/copy_wyrd_fur_color(new_color)
fur_color = new_color
if(!fur_color || fur_color == COLOR_BLACK)
fur_color = initial(fur_color)
/mob/living/simple_animal/passive/deer/copy_wyrd_marking_color(new_color)
markings_color = new_color
if(!markings_color || markings_color == COLOR_BLACK)
markings_color = initial(markings_color)
/mob/living/simple_animal/passive/deer/copy_wyrd_socks_color(new_color)
socks_color = new_color
if(!socks_color || socks_color == COLOR_BLACK)
socks_color = initial(socks_color)
/mob/living/simple_animal/passive/deer/copy_wyrd_eyes_color(new_color)
eyes_color = new_color
if(!eyes_color ||eyes_color == COLOR_BLACK)
eyes_color = initial(eyes_color)

*/

/decl/loadout_option/fantasy/mask/ghost_caul
Expand Down
Loading