[MIRROR] Allows Ghost Roles To Avoid Being From Being Given Random Mu…

…tant Parts (#4892) * Allows Ghost Roles To Avoid Being From Being Given Random Mutant Parts (#4207) * Allows ghost roles to avoid being from being given random mutant body parts when spawning. * Update code/modules/mob_spawn/mob_spawn.dm Co-authored-by: Bloop <[email protected]> --------- Co-authored-by: Bloop <[email protected]> * [MIRROR] Allows Ghost Roles To Avoid Being From Being Given Random Mutant Parts --------- Co-authored-by: FearfulFurnishing <[email protected]> Co-authored-by: Bloop <[email protected]> Co-authored-by: StealsThePRs <[email protected]>
Fluffy-Frontier · Aug 7, 2024 · 44729a7 · 44729a7
1 parent b40d35d
commit 44729a7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm
@@ -234,16 +234,6 @@
 	return FALSE
 
 /obj/effect/mob_spawn/ghost_role/human/ash_walker/special(mob/living/carbon/human/spawned_human)
-	// NOVA EDIT ADDITION BEGIN
-	/*
-	 * 2024/01/03 TODO:
-	 * MOVE THE MODULAR STUFF IN THIS PROC TO
-	 * /modular_nova/master_files/code/modules/mob_spawn/ghost_roles/mining_roles.dm
-	 * There's an ashwalker camp section ready for you to slot it into
-	 */
-	spawned_human.fully_replace_character_name(null, spawned_human.generate_random_mob_name(TRUE)) // NOVA EDIT MOVE - Moving before parent call prevents char name randomization
-	quirks_enabled = TRUE // ghost role quirks
-	// NOVA EDIT ADDITION END
 	. = ..()
 	spawned_human.fully_replace_character_name(null, spawned_human.generate_random_mob_name(TRUE))
 	to_chat(spawned_human, "<b>Drag the corpses of men and beasts to your nest. It will absorb them to create more of your kind. Invade the strange structure of the outsiders if you must. Do not cause unnecessary destruction, as littering the wastes with ugly wreckage is certain to not gain you favor. Glory to the Necropolis!</b>")

diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm
@@ -60,7 +60,11 @@
 		spawned_human.undershirt = "Nude"
 		spawned_human.socks = "Nude"
 		spawned_human.bra = "Nude" //NOVA EDIT ADDITION
-		randomize_human_normie(spawned_human)
+		//randomize_human_normie(spawned_human) // NOVA EDIT REMOVAL - Puts this behind if(random_appearance) - see below
+		//NOVA EDIT ADDITION START
+		if(random_appearance)
+			randomize_human_normie(spawned_human)
+		// NOVA EDIT ADDITION END
 		if(hairstyle)
 			spawned_human.set_hairstyle(hairstyle, update = FALSE)
 		if(facial_hairstyle)

diff --git a/modular_nova/master_files/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/modular_nova/master_files/code/modules/mob_spawn/ghost_roles/mining_roles.dm
@@ -29,6 +29,11 @@
 	restricted_species = list(/datum/species/lizard/ashwalker)
 	random_appearance = FALSE
 
+/obj/effect/mob_spawn/ghost_role/human/ash_walker/special(mob/living/carbon/human/spawned_human)
+	spawned_human.fully_replace_character_name(null, spawned_human.generate_random_mob_name(TRUE))
+	quirks_enabled = TRUE // ghost role quirks
+	. = ..()
+
 /// Listening Outpost
 
 /obj/effect/mob_spawn/ghost_role/human/lavaland_syndicate/comms/space

diff --git a/modular_nova/master_files/code/modules/mob_spawn/mob_spawn.dm b/modular_nova/master_files/code/modules/mob_spawn/mob_spawn.dm
@@ -1,9 +1,11 @@
+/obj/effect/mob_spawn
+	/// Do we use a random appearance for this role?
+	var/random_appearance = TRUE
+
 /obj/effect/mob_spawn/ghost_role
 	/// set this to make the spawner use the outfit.name instead of its name var for things like cryo announcements and ghost records
 	/// modifying the actual name during the game will cause issues with the GLOB.mob_spawners associative list
 	var/use_outfit_name
-	/// Do we use a random appearance for this ghost role?
-	var/random_appearance = TRUE
 	/// Can we use our loadout for this role?
 	var/loadout_enabled = FALSE
 	/// Can we use our quirks for this role?