Skip to content

Commit

Permalink
Oozeling hair buff (#9914)
Browse files Browse the repository at this point in the history
* does the thing

* rahhh
  • Loading branch information
AgentCitrus authored Oct 21, 2023
1 parent da891ac commit 61d49d0
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_NOLIMBDISABLE "no_limb_disable"
#define TRAIT_EASYLIMBDISABLE "easy_limb_disable"
#define TRAIT_TOXINLOVER "toxinlover"
#define TRAIT_NOHAIRLOSS "no_hair_loss"
#define TRAIT_NOBREATH "no_breath"
#define TRAIT_ANTIMAGIC "anti_magic"
#define TRAIT_HOLY "holy"
Expand Down
3 changes: 3 additions & 0 deletions code/datums/diseases/advance/symptoms/shedding.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ BONUS
return

var/mob/living/M = A.affected_mob

if(HAS_TRAIT(M, TRAIT_NOHAIRLOSS))
return
if(prob(base_message_chance))
to_chat(M, "<span class='warning'>[pick("Your scalp itches.", "Your skin feels flaky.")]</span>")
if(ishuman(M))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
H.domutcheck()

if(radiation > RAD_MOB_HAIRLOSS)
if(prob(15) && !(H.hair_style == "Bald") && (HAIR in species_traits))
if(prob(15) && !(H.hair_style == "Bald") && (HAIR in species_traits) && !HAS_TRAIT(H, TRAIT_NOHAIRLOSS))
to_chat(H, "<span class='danger'>Your hair starts to fall out in clumps.</span>")
addtimer(CALLBACK(src, PROC_REF(go_bald), H), 50)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
bodyflag = FLAG_OOZELING
default_color = "00FF90"
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR)
inherent_traits = list(TRAIT_TOXINLOVER,TRAIT_NOFIRE,TRAIT_ALWAYS_CLEAN,TRAIT_EASYDISMEMBER)
inherent_traits = list(TRAIT_TOXINLOVER,TRAIT_NOHAIRLOSS,TRAIT_NOFIRE,TRAIT_ALWAYS_CLEAN,TRAIT_EASYDISMEMBER)
hair_color = "mutcolor"
hair_alpha = 150
mutantlungs = /obj/item/organ/lungs/slime
Expand Down

0 comments on commit 61d49d0

Please sign in to comment.