diff --git a/code/game/gamemodes/calamity/calamity.dm b/code/game/gamemodes/calamity/calamity.dm
index a4e617aaf4a..2e77fcb19d8 100644
--- a/code/game/gamemodes/calamity/calamity.dm
+++ b/code/game/gamemodes/calamity/calamity.dm
@@ -362,13 +362,6 @@
 
 		show_objectives(player)
 
-		//Ninja objective announcement goes here.
-
-		//Set ninja internals.
-		var/mob/living/carbon/human/N = player.current
-		N.internal = N.s_store
-		N.internals.icon_state = "internal1"
-
 /datum/game_mode/calamity/proc/spawn_vox_raiders(var/list/candidates)
 
 	//Create objectives.
diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm
index d8b22e629ce..c9bce4aca94 100644
--- a/code/game/gamemodes/events/space_ninja.dm
+++ b/code/game/gamemodes/events/space_ninja.dm
@@ -207,8 +207,6 @@ Malf AIs/silicons aren't added. Monkeys aren't added. Messes with objective comp
 		//The ninja will be created on the right spawn point or at late join.
 		var/mob/living/carbon/human/new_ninja = create_space_ninja(pick(ninjastart.len ? ninjastart : latejoin))
 		new_ninja.key = ninja_key
-		new_ninja.internal = new_ninja.s_store //So the poor ninja has something to breath when they spawn in spess.
-		new_ninja.internals.icon_state = "internal1"
 
 		//Now for the rest of the stuff.
 
@@ -515,6 +513,7 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 	return 1
 
 /mob/living/carbon/human/proc/equip_space_ninja(safety=0)//Safety in case you need to unequip stuff for existing characters.
+
 	if(safety)
 		del(w_uniform)
 		del(wear_suit)
@@ -533,27 +532,22 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt)
 
 	var/obj/item/weapon/rig/light/ninja/ninjasuit = new(src)
+	equip_to_slot_or_del(ninjasuit,slot_back)
+	ninjasuit.toggle_seals(src,1)
 
 	// Make sure the ninja can actually equip the suit.
 	if(src.dna && src.dna.unique_enzymes)
 		ninjasuit.locked_dna = src.dna.unique_enzymes
-		spawn(10)
-			src << "<span class='warning'>Suit hardware locked to your DNA hash.</span>"
+		src << "<span class='warning'>Suit hardware locked to your DNA hash.</span>"
 	else
 		ninjasuit.req_access = list()
-
-	equip_to_slot_or_del(ninjasuit,slot_back)
-
+	if(istype(back,/obj/item/weapon/rig))
+		var/obj/item/weapon/rig/rig = back
+		if(rig.air_supply)
+			internal = rig.air_supply
 	spawn(10)
-		ninjasuit.toggle_seals(src,1)
-
-		if(istype(back,/obj/item/weapon/rig))
-			var/obj/item/weapon/rig/rig = back
-			if(rig.air_supply)
-				internal = rig.air_supply
-		if(!internal && s_store)
-			internal = s_store
 		if(internal)
 			internals.icon_state = "internal1"
-
+		else
+			src << "<span class='danger'>You forgot to turn on your internals! Quickly, toggle the valve!</span>"
 	return 1
\ No newline at end of file
diff --git a/code/game/gamemodes/ninja/ninja.dm b/code/game/gamemodes/ninja/ninja.dm
index 50522dcf5df..87a15e622db 100644
--- a/code/game/gamemodes/ninja/ninja.dm
+++ b/code/game/gamemodes/ninja/ninja.dm
@@ -52,16 +52,13 @@
 	return 1
 
 /datum/game_mode/ninja/post_setup()
+
 	for(var/datum/mind/ninja in ninjas)
 		if(ninja.current && !(istype(ninja.current,/mob/living/carbon/human))) return 0
 		if(!config.objectives_disabled)
 			forge_ninja_objectives(ninja)
 		show_objectives(ninja)
 
-		var/mob/living/carbon/human/N = ninja.current
-		N.internal = N.s_store
-		N.internals.icon_state = "internal1"
-
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()
 	return ..()