cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ethereals now have hair (#49934)

Browse Source 
🆑 Qustinnus
add: Ethereals have started growing slightly transparent hair in a new mutation of the lifeform.
/🆑

one of the main pieces of feedback I got was lack of customization, this will slightly remedy this but I'd still like to look for more unique options.
This commit is contained in:
Qustinnus
2020-03-16 20:53:45 +13:00
committed by GitHub
parent 4048dbfdab
commit 29746a313f
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species.dm
+6
View File
@@ -374,6 +374,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(hair_color)
if(hair_color == "mutcolor")
facial_overlay.color = "#" + H.dna.features["mcolor"]
else if(hair_color == "fixedmutcolor")
facial_overlay.color = "#[fixed_mut_color]"
else
facial_overlay.color = "#" + hair_color
else
@@ -435,6 +437,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(hair_color)
if(hair_color == "mutcolor")
hair_overlay.color = "#" + H.dna.features["mcolor"]
else if(hair_color == "fixedmutcolor")
hair_overlay.color = "#[fixed_mut_color]"
else
hair_overlay.color = "#" + hair_color
else
@@ -685,6 +689,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(HAIR)
if(hair_color == "mutcolor")
accessory_overlay.color = "#[H.dna.features["mcolor"]]"
else if(hair_color == "fixedmutcolor")
accessory_overlay.color = "#[fixed_mut_color]"
else
accessory_overlay.color = "#[H.hair_color]"
if(FACEHAIR)
code/modules/mob/living/carbon/human/species_types/ethereal.dm
+3 -1
View File
@@ -14,7 +14,7 @@
brutemod = 1.25 //They're weak to punches
attack_type = BURN //burn bish
damage_overlay_type = "" //We are too cool for regular damage overlays
species_traits = list(DYNCOLORS, AGENDER, NO_UNDERWEAR)
species_traits = list(DYNCOLORS, AGENDER, NO_UNDERWEAR, HAIR)
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
species_language_holder = /datum/language_holder/ethereal
inherent_traits = list(TRAIT_NOHUNGER)
@@ -25,6 +25,8 @@
bodytemp_heat_damage_limit = FIRE_MINIMUM_TEMPERATURE_TO_SPREAD // about 150C
// Cold temperatures hurt faster as it is harder to move with out the heat energy
bodytemp_cold_damage_limit = (T20C - 10) // about 10c
hair_color = "fixedmutcolor"
hair_alpha = 140
var/current_color
var/EMPeffect = FALSE
var/emageffect = FALSE
code/modules/surgery/bodyparts/head.dm
+4
View File
@@ -147,6 +147,8 @@
if(S.hair_color)
if(S.hair_color == "mutcolor")
facial_hair_color = H.dna.features["mcolor"]
else if(hair_color == "fixedmutcolor")
facial_hair_color = "#[S.fixed_mut_color]"
else
facial_hair_color = S.hair_color
else
@@ -162,6 +164,8 @@
if(S.hair_color)
if(S.hair_color == "mutcolor")
hair_color = H.dna.features["mcolor"]
else if(hair_color == "fixedmutcolor")
hair_color = "#[S.fixed_mut_color]"
else
hair_color = S.hair_color
else