From 77e63cc6477fb1c305229ae9063787f9a7eb62f2 Mon Sep 17 00:00:00 2001 From: personlized <99066438+personlized@users.noreply.github.com> Date: Fri, 16 Aug 2024 23:15:06 -0700 Subject: [PATCH 1/4] Update is_helpers.dm --- code/__DEFINES/is_helpers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 23a9638a39d7..e1cb22cd7862 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list( #define ismammal(A) (is_species(A, /datum/species/mammal)) #define isinsect(A) (is_species(A, /datum/species/insect)) #define isxenoperson(A) (is_species(A, /datum/species/xeno)) -#define isstartjelly(A) (is_species(A, /datum/species/jelly/roundstartslime)) +#define isstartjelly(A) (is_species(A, /datum/species/jelly/slime/roundstartslime)) #define isarachnid(A) (is_species(A, /datum/species/arachnid) || HAS_TRAIT(A, TRAIT_ARACHNID)) // SPLURT Edit: for the Arachnid trait //more carbon mobs From 2c9bdf9c9c1b44daadf23bdbd511b9f727dd5f85 Mon Sep 17 00:00:00 2001 From: personlized <99066438+personlized@users.noreply.github.com> Date: Fri, 16 Aug 2024 23:16:19 -0700 Subject: [PATCH 2/4] Update gibspawner.dm --- code/game/objects/effects/spawners/gibspawner.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index 65c6c35c9eb8..0d1a7744c587 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -144,8 +144,8 @@ /obj/effect/gibspawner/slime gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/slime/up, /obj/effect/decal/cleanable/blood/gibs/slime/down, /obj/effect/decal/cleanable/blood/gibs/slime, /obj/effect/decal/cleanable/blood/gibs/slime, /obj/effect/decal/cleanable/blood/gibs/slime/body, /obj/effect/decal/cleanable/blood/gibs/slime/limb, /obj/effect/decal/cleanable/blood/gibs/slime/core) gibamounts = list(1, 1, 1, 1, 1, 1, 1) - gib_mob_type = /mob/living/carbon/human/species/roundstartslime - gib_mob_species = /datum/species/jelly/roundstartslime + gib_mob_type = /mob/living/carbon/human/species/slime/roundstartslime + gib_mob_species = /datum/species/jelly/slime/roundstartslime sound_vol = 50 /obj/effect/gibspawner/slime/Initialize(mapload) From a6c1cb2911c326aeefa891f97e2f695e22b15e4d Mon Sep 17 00:00:00 2001 From: personlized <99066438+personlized@users.noreply.github.com> Date: Fri, 16 Aug 2024 23:18:35 -0700 Subject: [PATCH 3/4] Update human.dm --- code/modules/mob/living/carbon/human/human.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index dd18f38d571e..9406750fdfc8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1178,8 +1178,8 @@ Mark this mob, then navigate to the preferences of the client you desire and cal /mob/living/carbon/human/species/ipc race = /datum/species/ipc -/mob/living/carbon/human/species/roundstartslime - race = /datum/species/jelly/roundstartslime +/mob/living/carbon/human/species/slime/roundstartslime + race = /datum/species/jelly/slime/roundstartslime /mob/living/carbon/human/species/arachnid race = /datum/species/arachnid From 49690de05df54e5e4211961b954b42780825e9bd Mon Sep 17 00:00:00 2001 From: personlized <99066438+personlized@users.noreply.github.com> Date: Fri, 16 Aug 2024 23:19:20 -0700 Subject: [PATCH 4/4] Update jellypeople.dm --- .../mob/living/carbon/human/species_types/jellypeople.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d76d4ffb7500..7a1b8a2f9430 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -414,7 +414,7 @@ ////////////////////////////////////////////////////////Round Start Slimes/////////////////////////////////////////////////////////////////// -/datum/species/jelly/roundstartslime +/datum/species/jelly/slime/roundstartslime name = "Xenobiological Slime Hybrid" id = SPECIES_SLIME_HYBRID limbs_id = SPECIES_SLIME