diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index 1fc20f593ac4..011a09bab485 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -46,6 +46,7 @@ Contents:
 	var/a_transfer = 20//How much radium is used per adrenaline boost.
 	var/a_maxamount = 7//Maximum number of adrenaline boosts.
 	var/s_maxamount = 20//Maximum number of smoke bombs.
+	var/do_gib = TRUE // yogs
 
 		//Support function variables.
 	var/stealth = FALSE//Stealth off.
@@ -97,7 +98,7 @@ Contents:
 /obj/item/clothing/suit/space/space_ninja/proc/lock_suit(mob/living/carbon/human/H)
 	if(!istype(H))
 		return FALSE
-	if(!is_ninja(H))
+	if(do_gib && !is_ninja(H)) // yogs
 		to_chat(H, "<span class='danger'><B>fÄTaL ÈÈRRoR</B>: 382200-*#00CÖDE <B>RED</B>\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR...</span>")
 		H.gib()
 		return FALSE
diff --git a/yogstation/code/modules/ninja/suit/ninja.dm b/yogstation/code/modules/ninja/suit/ninja.dm
index 070777b9e4f5..ce5317742635 100644
--- a/yogstation/code/modules/ninja/suit/ninja.dm
+++ b/yogstation/code/modules/ninja/suit/ninja.dm
@@ -122,5 +122,5 @@
 			n_gloves.lights_colour = pickedNinjaColor
 		affecting.regenerate_icons()
 
-/obj/item/clothing/suit/space/space_ninja/lavaland/proc/is_ninja(mob/living/M)
-	return TRUE
+/obj/item/clothing/suit/space/space_ninja/lavaland
+	do_gib = FALSE