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.

Sign up for GitHub

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

[MIRROR] Jellyperson Hair Fix B: "If you're gonna have it, do it right" #2543

Merged
merged 1 commit into from
Mar 24, 2024
Merged

[MIRROR] Jellyperson Hair Fix B: "If you're gonna have it, do it right" #2543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions code/modules/mob/living/carbon/human/species_types/jellypeople.dm
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
View file
Open in desktop
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
Loading