From c8f7aefec45e862f409fa2ed06ac5382a963dd89 Mon Sep 17 00:00:00 2001 From: Bloop Date: Wed, 26 Apr 2023 19:19:56 -0400 Subject: [PATCH] [MODULAR] Fixes the roundstart slime species being able to get fracture wounds (#20712) * Fixes some issues with roundstart slimes not getting the right bio flags on their limbs They are now a subtype of slime * Removes roundstartslimes from the possible list of subtypes to be able to transform into * Revert "Removes roundstartslimes from the possible list of subtypes to be able to transform into" This reverts commit 047312a4683f9669f7240fc09aaaec66926b6068. * whoop * Roundstart slimes can get flesh wounds --- .../code/roundstartslime_bodyparts.dm | 24 +++++++++---------- .../carbon/human/species/roundstartslime.dm | 12 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modular_skyrat/modules/bodyparts/code/roundstartslime_bodyparts.dm b/modular_skyrat/modules/bodyparts/code/roundstartslime_bodyparts.dm index 4fd891c67d3..e5894249ac1 100644 --- a/modular_skyrat/modules/bodyparts/code/roundstartslime_bodyparts.dm +++ b/modular_skyrat/modules/bodyparts/code/roundstartslime_bodyparts.dm @@ -1,27 +1,27 @@ // Roundstartslimes! -/obj/item/bodypart/head/roundstartslime - limb_id = SPECIES_SLIMEPERSON // same icon state, no real reason to make a new define +/obj/item/bodypart/head/slime/roundstart is_dimorphic = TRUE icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME + biological_state = BIO_FLESH -/obj/item/bodypart/chest/roundstartslime - limb_id = SPECIES_SLIMEPERSON +/obj/item/bodypart/chest/slime/roundstart is_dimorphic = TRUE icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME + biological_state = BIO_FLESH -/obj/item/bodypart/arm/left/roundstartslime - limb_id = SPECIES_SLIMEPERSON +/obj/item/bodypart/arm/left/slime/roundstart icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME + biological_state = BIO_FLESH -/obj/item/bodypart/arm/right/roundstartslime - limb_id = SPECIES_SLIMEPERSON +/obj/item/bodypart/arm/right/slime/roundstart icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME + biological_state = BIO_FLESH -/obj/item/bodypart/leg/left/roundstartslime - limb_id = SPECIES_SLIMEPERSON +/obj/item/bodypart/leg/left/slime/roundstart icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME + biological_state = BIO_FLESH -/obj/item/bodypart/leg/right/roundstartslime - limb_id = SPECIES_SLIMEPERSON +/obj/item/bodypart/leg/right/slime/roundstart icon_greyscale = BODYPART_ICON_ROUNDSTARTSLIME + biological_state = BIO_FLESH diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm index 2c0cf2621f3..4477389dffb 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/roundstartslime.dm @@ -39,12 +39,12 @@ mutanttongue = /obj/item/organ/internal/tongue bodypart_overrides = list( //Overriding jelly bodyparts - BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/roundstartslime, - BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/roundstartslime, - BODY_ZONE_HEAD = /obj/item/bodypart/head/roundstartslime, - BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/roundstartslime, - BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/roundstartslime, - BODY_ZONE_CHEST = /obj/item/bodypart/chest/roundstartslime, + 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, ) /**