Skip to content

Commit

Permalink
[MIRROR] Jellyperson Hair Fix B: "If you're gonna have it, do it righ…
Browse files Browse the repository at this point in the history
…t" (#1596) (#2543)

* Jellyperson Hair Fix B: "If you're gonna have it, do it right" (#82167)

## About The Pull Request

#76074 Accidentally made all Slimepeople types have all head flags, when
Jellypeople and Luminescents should not have.

This is a proposed alternate fix to #82166 which, rather than removing
all hair from all jellypeople types (except slimes) , it makes all
jellypeople hair look like slime (like slimepeople).

This PR also fixes jellies have some head flags they shouldn't. 

## Changelog

:cl: Melberet
fix: Jellyperson, Luminescent, and Stargazer hair no longer look bad.
All jellyperson types no longer have eyesockets.
/:cl:

* Jellyperson Hair Fix B: "If you're gonna have it, do it right"

---------

Co-authored-by: NovaBot <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
  • Loading branch information
3 people authored Mar 24, 2024
1 parent 177643e commit fcb81f5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
inherent_factions = list(FACTION_SLIME)
species_language_holder = /datum/language_holder/jelly

hair_color = "mutcolor"
hair_alpha = 150
facial_hair_alpha = 150
bodypart_overrides = list(
BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/jelly,
BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/jelly,
Expand Down Expand Up @@ -182,9 +184,6 @@
name = "\improper Slimeperson"
plural_form = "Slimepeople"
id = SPECIES_SLIMEPERSON
hair_color = "mutcolor"
hair_alpha = 150
facial_hair_alpha = 150
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
mutanteyes = /obj/item/organ/internal/eyes
var/datum/action/innate/split_body/slime_split
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
is_dimorphic = TRUE
dmg_overlay_type = null
burn_modifier = 0.5 // = 1/2x generic burn damage
head_flags = HEAD_ALL_FEATURES
head_flags = HEAD_EYECOLOR | HEAD_EYESPRITES | HEAD_HAIR | HEAD_FACIAL_HAIR

/obj/item/bodypart/chest/jelly
biological_state = (BIO_FLESH|BIO_BLOODED)
Expand Down Expand Up @@ -130,7 +130,7 @@
biological_state = (BIO_FLESH|BIO_BLOODED)
limb_id = SPECIES_SLIMEPERSON
is_dimorphic = FALSE
head_flags = HEAD_ALL_FEATURES
head_flags = HEAD_EYECOLOR | HEAD_EYESPRITES | HEAD_HAIR | HEAD_FACIAL_HAIR

/obj/item/bodypart/chest/slime
biological_state = (BIO_FLESH|BIO_BLOODED)
Expand Down Expand Up @@ -159,7 +159,7 @@
biological_state = (BIO_FLESH|BIO_BLOODED)
limb_id = SPECIES_LUMINESCENT
is_dimorphic = TRUE
head_flags = HEAD_ALL_FEATURES
head_flags = HEAD_EYECOLOR | HEAD_EYESPRITES | HEAD_HAIR | HEAD_FACIAL_HAIR

/obj/item/bodypart/chest/luminescent
biological_state = (BIO_FLESH|BIO_BLOODED)
Expand Down

0 comments on commit fcb81f5

Please sign in to comment.