diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 022d76070f4..e1568adaf73 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -191,12 +191,12 @@ var/datum/action/innate/swap_body/swap_body bodypart_overrides = list( - BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/slime, - BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/slime, - BODY_ZONE_HEAD = /obj/item/bodypart/head/slime, - BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/slime, - BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/slime, - BODY_ZONE_CHEST = /obj/item/bodypart/chest/slime, + BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/jelly/slime, + BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/jelly/slime, + BODY_ZONE_HEAD = /obj/item/bodypart/head/jelly/slime, + BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/jelly/slime, + BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/jelly/slime, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/jelly/slime, ) /datum/species/jelly/slime/get_physical_attributes() @@ -491,12 +491,12 @@ id = SPECIES_LUMINESCENT examine_limb_id = SPECIES_LUMINESCENT bodypart_overrides = list( - BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/luminescent, - BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/luminescent, - BODY_ZONE_HEAD = /obj/item/bodypart/head/luminescent, - BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/luminescent, - BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/luminescent, - BODY_ZONE_CHEST = /obj/item/bodypart/chest/luminescent, + BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/jelly/luminescent, + BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/jelly/luminescent, + BODY_ZONE_HEAD = /obj/item/bodypart/head/jelly/luminescent, + BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/jelly/luminescent, + BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/jelly/luminescent, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/jelly/luminescent, ) mutanteyes = /obj/item/organ/internal/eyes /// How strong is our glow diff --git a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm index 7548ed91aea..a4608613bc9 100644 --- a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm @@ -126,61 +126,42 @@ burn_modifier = 0.5 // = 1/2x generic burn damage ///SLIME -/obj/item/bodypart/head/slime - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/head/jelly/slime limb_id = SPECIES_SLIMEPERSON is_dimorphic = FALSE - head_flags = HEAD_EYECOLOR | HEAD_EYESPRITES | HEAD_HAIR | HEAD_FACIAL_HAIR -/obj/item/bodypart/chest/slime - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/chest/jelly/slime limb_id = SPECIES_SLIMEPERSON - is_dimorphic = TRUE - wing_types = list(/obj/item/organ/external/wings/functional/slime) -/obj/item/bodypart/arm/left/slime - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/arm/left/jelly/slime limb_id = SPECIES_SLIMEPERSON -/obj/item/bodypart/arm/right/slime - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/arm/right/jelly/slime limb_id = SPECIES_SLIMEPERSON -/obj/item/bodypart/leg/left/slime - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/leg/left/jelly/slime limb_id = SPECIES_SLIMEPERSON -/obj/item/bodypart/leg/right/slime - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/leg/right/jelly/slime limb_id = SPECIES_SLIMEPERSON ///LUMINESCENT -/obj/item/bodypart/head/luminescent - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/head/jelly/luminescent limb_id = SPECIES_LUMINESCENT - is_dimorphic = TRUE - head_flags = HEAD_EYECOLOR | HEAD_EYESPRITES | HEAD_HAIR | HEAD_FACIAL_HAIR -/obj/item/bodypart/chest/luminescent - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/chest/jelly/luminescent limb_id = SPECIES_LUMINESCENT - is_dimorphic = TRUE - wing_types = list(/obj/item/organ/external/wings/functional/slime) -/obj/item/bodypart/arm/left/luminescent - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/arm/left/jelly/luminescent limb_id = SPECIES_LUMINESCENT -/obj/item/bodypart/arm/right/luminescent - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/arm/right/jelly/luminescent limb_id = SPECIES_LUMINESCENT -/obj/item/bodypart/leg/left/luminescent - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/leg/left/jelly/luminescent limb_id = SPECIES_LUMINESCENT -/obj/item/bodypart/leg/right/luminescent - biological_state = (BIO_FLESH|BIO_BLOODED) +/obj/item/bodypart/leg/right/jelly/luminescent limb_id = SPECIES_LUMINESCENT ///ZOMBIE diff --git a/modular_nova/modules/bodyparts/code/roundstartslime_bodyparts.dm b/modular_nova/modules/bodyparts/code/roundstartslime_bodyparts.dm index 302d3488931..312a193e314 100644 --- a/modular_nova/modules/bodyparts/code/roundstartslime_bodyparts.dm +++ b/modular_nova/modules/bodyparts/code/roundstartslime_bodyparts.dm @@ -1,27 +1,27 @@ // Roundstartslimes! -/obj/item/bodypart/head/slime/roundstart +/obj/item/bodypart/head/jelly/slime/roundstart is_dimorphic = TRUE icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME biological_state = (BIO_FLESH|BIO_BLOODED) -/obj/item/bodypart/chest/slime/roundstart +/obj/item/bodypart/chest/jelly/slime/roundstart is_dimorphic = TRUE icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME biological_state = (BIO_FLESH|BIO_BLOODED) -/obj/item/bodypart/arm/left/slime/roundstart +/obj/item/bodypart/arm/left/jelly/slime/roundstart icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME biological_state = (BIO_FLESH|BIO_BLOODED) -/obj/item/bodypart/arm/right/slime/roundstart +/obj/item/bodypart/arm/right/jelly/slime/roundstart icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME biological_state = (BIO_FLESH|BIO_BLOODED) -/obj/item/bodypart/leg/left/slime/roundstart +/obj/item/bodypart/leg/left/jelly/slime/roundstart icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME biological_state = (BIO_FLESH|BIO_BLOODED) -/obj/item/bodypart/leg/right/slime/roundstart +/obj/item/bodypart/leg/right/jelly/slime/roundstart icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME biological_state = (BIO_FLESH|BIO_BLOODED) diff --git a/modular_nova/modules/bodyparts/code/slime_bodyparts.dm b/modular_nova/modules/bodyparts/code/slime_bodyparts.dm index 779d2dac411..be6c773fc62 100644 --- a/modular_nova/modules/bodyparts/code/slime_bodyparts.dm +++ b/modular_nova/modules/bodyparts/code/slime_bodyparts.dm @@ -1,17 +1,17 @@ -/obj/item/bodypart/head/slime +/obj/item/bodypart/head/jelly/slime icon_greyscale = DEFAULT_BODYPART_ICON_ORGANIC -/obj/item/bodypart/chest/slime +/obj/item/bodypart/chest/jelly/slime icon_greyscale = DEFAULT_BODYPART_ICON_ORGANIC -/obj/item/bodypart/arm/left/slime +/obj/item/bodypart/arm/left/jelly/slime icon_greyscale = DEFAULT_BODYPART_ICON_ORGANIC -/obj/item/bodypart/arm/right/slime +/obj/item/bodypart/arm/right/jelly/slime icon_greyscale = DEFAULT_BODYPART_ICON_ORGANIC -/obj/item/bodypart/leg/left/slime +/obj/item/bodypart/leg/left/jelly/slime icon_greyscale = DEFAULT_BODYPART_ICON_ORGANIC -/obj/item/bodypart/leg/right/slime +/obj/item/bodypart/leg/right/jelly/slime icon_greyscale = DEFAULT_BODYPART_ICON_ORGANIC diff --git a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm index a9017f3a016..c16753016aa 100644 --- a/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm +++ b/modular_nova/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm @@ -37,12 +37,12 @@ mutanttongue = /obj/item/organ/internal/tongue/jelly bodypart_overrides = list( //Overriding jelly bodyparts - BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/slime/roundstart, - BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/slime/roundstart, - BODY_ZONE_HEAD = /obj/item/bodypart/head/slime/roundstart, - BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/slime/roundstart, - BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/slime/roundstart, - BODY_ZONE_CHEST = /obj/item/bodypart/chest/slime/roundstart, + BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/jelly/slime/roundstart, + BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/jelly/slime/roundstart, + BODY_ZONE_HEAD = /obj/item/bodypart/head/jelly/slime/roundstart, + BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/jelly/slime/roundstart, + BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/jelly/slime/roundstart, + BODY_ZONE_CHEST = /obj/item/bodypart/chest/jelly/slime/roundstart, ) /datum/species/jelly/roundstartslime/create_pref_unique_perks()