diff --git a/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/code/modules/mob_spawn/ghost_roles/mining_roles.dm
index 3eef4699389..a7a04e7e40b 100644
--- a/code/modules/mob_spawn/ghost_roles/mining_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/mining_roles.dm
@@ -165,6 +165,7 @@
 	spawner_job_path = /datum/job/lifebringer
 	restricted_species = list(/datum/species/pod) //SKYRAT EDIT ADDITION
 	random_appearance = FALSE // SKYRAT EDIT ADDITION
+	allow_custom_character = ALL // BUBBER EDIT ADDITION
 
 /obj/effect/mob_spawn/ghost_role/human/seed_vault/Initialize(mapload)
 	. = ..()
@@ -234,6 +235,7 @@
 	var/obj/structure/ash_walker_eggshell/eggshell
 	restricted_species = list(/datum/species/lizard/ashwalker) //SKYRAT EDIT ADDITION
 	random_appearance = FALSE // SKYRAT EDIT ADDITION
+	allow_custom_character = GHOSTROLE_TAKE_PREFS_SPECIES // BUBBER EDIT ADDITION
 
 /obj/effect/mob_spawn/ghost_role/human/ash_walker/Destroy()
 	eggshell = null
diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm
index 161ef6741f9..931c8a7e87e 100644
--- a/code/modules/mob_spawn/mob_spawn.dm
+++ b/code/modules/mob_spawn/mob_spawn.dm
@@ -205,7 +205,8 @@
 		prompt_fail = tgui_alert(user, prompt, buttons = list("Yes", "No"), timeout = 10 SECONDS) != "Yes"
 
 	var/species_pref = user.client.prefs.read_preference(/datum/preference/choiced/species) || /datum/species/human
-	if(!prompt_fail && user.started_as_observer && allow_custom_character && (GLOB.species_prototypes[species_pref].inherent_respiration_type & RESPIRATION_OXYGEN))
+	// BUBBER EDIT - Commented observer check
+	if(!prompt_fail && /*user.started_as_observer &&*/ allow_custom_character && (GLOB.species_prototypes[species_pref].inherent_respiration_type & RESPIRATION_OXYGEN))
 		var/static_prompt = "Because you haven't taken a role so far, you may spawn in as \
 			[((allow_custom_character & GHOSTROLE_TAKE_PREFS_SPECIES) || species_pref == /datum/species/human) ? "" : "a human version of"] \
 			your customized character with a random name. Would you like to?"
diff --git a/modular_skyrat/modules/mapping/code/mob_spawns.dm b/modular_skyrat/modules/mapping/code/mob_spawns.dm
index 993a1ba6142..61c7c83d70e 100644
--- a/modular_skyrat/modules/mapping/code/mob_spawns.dm
+++ b/modular_skyrat/modules/mapping/code/mob_spawns.dm
@@ -29,6 +29,7 @@
 	quirks_enabled = TRUE
 	random_appearance = FALSE
 	loadout_enabled = TRUE
+	allow_custom_character = ALL
 
 /datum/outfit/black_market
 	name = "Black Market Trader"
diff --git a/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm b/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm
index 6c9684c2b90..e7b89f86690 100644
--- a/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm
+++ b/modular_skyrat/modules/tarkon/code/misc-fluff/spawner.dm
@@ -15,6 +15,7 @@
 	quirks_enabled = TRUE
 	random_appearance = FALSE
 	computer_area = /area/ruin/space/has_grav/port_tarkon/centerhall
+	allow_custom_character = ALL
 
 /datum/outfit/tarkon
 	name = "default port tarkon outfit"
diff --git a/modular_zubbers/code/modules/mob_spawn/ghost_roles/mining_roles.dm b/modular_zubbers/code/modules/mob_spawn/ghost_roles/mining_roles.dm
index 6b26909335b..d1bcfb28849 100644
--- a/modular_zubbers/code/modules/mob_spawn/ghost_roles/mining_roles.dm
+++ b/modular_zubbers/code/modules/mob_spawn/ghost_roles/mining_roles.dm
@@ -11,6 +11,7 @@
 	random_appearance = FALSE
 	loadout_enabled = TRUE
 	outfit = /datum/outfit/lavaland_gasstation
+	allow_custom_character = ALL
 
 /datum/outfit/lavaland_gasstation
 	name = "Lizard Gas Station Attendant"
diff --git a/modular_zubbers/maps/offstation/ghostcafe/ghost_role_spawners.dm b/modular_zubbers/maps/offstation/ghostcafe/ghost_role_spawners.dm
index 6c19dc7b570..d3e27eb2e62 100644
--- a/modular_zubbers/maps/offstation/ghostcafe/ghost_role_spawners.dm
+++ b/modular_zubbers/maps/offstation/ghostcafe/ghost_role_spawners.dm
@@ -18,6 +18,7 @@
 	you_are_text = "You are a Cafe Robot!"
 	flavour_text = "Who could have thought? This awesome local cafe accepts cyborgs too!"
 	mob_type = /mob/living/silicon/robot/model/roleplay
+	allow_custom_character = ALL
 
 /obj/effect/mob_spawn/ghost_role/robot/ghostcafe/special(mob/living/silicon/robot/new_spawn)
 	. = ..()
@@ -52,6 +53,7 @@
 	random_appearance = FALSE
 	loadout_enabled = TRUE
 	quirks_enabled = TRUE
+	allow_custom_character = ALL
 
 /obj/effect/mob_spawn/ghost_role/human/ghostcafe/special(mob/living/carbon/human/new_spawn)
 	. = ..()
diff --git a/modular_zubbers/maps/offstation/persistence/mob_spawns.dm b/modular_zubbers/maps/offstation/persistence/mob_spawns.dm
index 62f1e5caa6a..99a1f67826d 100644
--- a/modular_zubbers/maps/offstation/persistence/mob_spawns.dm
+++ b/modular_zubbers/maps/offstation/persistence/mob_spawns.dm
@@ -21,6 +21,7 @@
 	spawner_job_path = /datum/job/persistence
 	/// If true, this spawner will give it's target exploitables access.
 	var/give_exploitables = TRUE
+	allow_custom_character = ALL
 
 /obj/effect/mob_spawn/ghost_role/human/persistence/special(mob/living/spawned_mob, mob/mob_possessor)
 	. = ..()
@@ -66,6 +67,7 @@
 	you_are_text = "You are a Syndicate cyborg, assigned to be part of a crew aboard a landcrawler"
 	flavour_text = "You have been deployed into enemy territory. Continue working the best you can, and keep a low profile."
 	deletes_on_zero_uses_left = TRUE
+	allow_custom_character = ALL
 
 /obj/effect/mob_spawn/ghost_role/robot/persistence/special(mob/living/silicon/robot/new_spawn)
 	. = ..()