Merge pull request #1191 from personlized/master

Quick Xenobiological Slime Hybrid fix
SPLURT-Station · Aug 18, 2024 · a9b741b · a9b741b
2 parents 91a0b89 + 49690de
commit a9b741b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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

diff --git 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)

diff --git 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
diff --git 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