Removes Space Ninjas

code/modules/admin/admin.dm

@@ -730,16 +730,6 @@ var/global/nologevent = 0
 	message_admins("[key_name_admin(usr)] toggled Aliens [aliens_allowed ? "on" : "off"].", 1)
 	feedback_add_details("admin_verb","TA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-
-/datum/admins/proc/toggle_space_ninja()
-	set category = "Event"
-	set desc="Toggle space ninjas spawning."
-	set name="Toggle Space Ninjas"
-	toggle_space_ninja = !toggle_space_ninja
-	log_admin("[key_name(usr)] toggled Space Ninjas to [toggle_space_ninja].")
-	message_admins("[key_name_admin(usr)] toggled Space Ninjas [toggle_space_ninja ? "on" : "off"].", 1)
-	feedback_add_details("admin_verb","TSN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
 /datum/admins/proc/delay()
 	set category = "Server"
 	set desc="Delay the game start/end"
@@ -956,16 +946,16 @@ proc/move_gamma_ship()
 		fromArea = locate(/area/shuttle/gamma/station)
 		toArea = locate(/area/shuttle/gamma/space)
 	fromArea.move_contents_to(toArea)
-	
+
 	for(var/obj/machinery/mech_bay_recharge_port/P in toArea)
 		P.locate_recharge_turf()
-		
+
 	for(var/obj/machinery/power/apc/A in toArea)
 		A.init()
-		
+
 	for(var/obj/machinery/alarm/A in toArea)
 		A.first_run()
-		
+
 	if (gamma_ship_location)
 		gamma_ship_location = 0
 	else

code/modules/admin/admin_verbs.dm

@@ -82,8 +82,6 @@ var/list/admin_verbs_event = list(
 	/client/proc/cinematic,
 	/client/proc/one_click_antag,
 	/datum/admins/proc/toggle_aliens,
-	/datum/admins/proc/toggle_space_ninja,
-	/client/proc/send_space_ninja,
 	/client/proc/cmd_admin_add_freeform_ai_law,
 	/client/proc/cmd_admin_add_random_ai_law,
 	/client/proc/make_sound,
@@ -120,7 +118,6 @@ var/list/admin_verbs_server = list(
 	/client/proc/cmd_admin_delete,		/*delete an instance/object/mob/etc*/
 	/client/proc/cmd_debug_del_all,
 	/datum/admins/proc/toggle_aliens,
-	/datum/admins/proc/toggle_space_ninja,
 	/client/proc/delbook,
 	/client/proc/toggle_antagHUD_use,
 	/client/proc/toggle_antagHUD_restrictions,

code/modules/admin/player_panel.dm

@@ -492,8 +492,8 @@
 		if(ticker.mode.raiders.len)
 			dat += check_role_table("Raiders", ticker.mode.raiders, src)
 
-		if(ticker.mode.ninjas.len)
-			dat += check_role_table("Ninjas", ticker.mode.ninjas, src)
+		/*if(ticker.mode.ninjas.len)
+			dat += check_role_table("Ninjas", ticker.mode.ninjas, src)*/
 
 		if(ticker.mode.cult.len)
 			dat += check_role_table("Cultists", ticker.mode.cult, src, 0)

code/modules/admin/secrets.dm

@@ -77,7 +77,6 @@
 					<A href='?src=\ref[src];secretsfun=borers'>Trigger a Cortical Borer infestation</A><BR>
 					<A href='?src=\ref[src];secretsfun=alien_silent'>Spawn an Alien silently</A><BR>
 					<A href='?src=\ref[src];secretsfun=spiders'>Trigger a Spider infestation</A><BR>
-					<A href='?src=\ref[src];secretsfun=spaceninja'>Send in a space ninja</A><BR>
 					<A href='?src=\ref[src];secretsfun=striketeam'>Send in a strike team</A><BR>
 					<A href='?src=\ref[src];secretsfun=striketeam_syndicate'>Send in a syndicate strike team</A><BR>
 					<A href='?src=\ref[src];secretsfun=honksquad'>Send in a HONKsquad</A><BR>

code/modules/admin/verbs/one_click_antag.dm

@@ -315,9 +315,11 @@ client/proc/one_click_antag()
 	alien_infestation(3)
 	return 1
 
+/*
 /datum/admins/proc/makeSpaceNinja()
 	space_ninja_arrival()
 	return 1
+*/
 
 /datum/admins/proc/makeDeathsquad()
 	var/list/mob/candidates = list()
@@ -509,8 +511,8 @@ client/proc/one_click_antag()
 
 	while(i<=sounds)
 		i++
-		newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah"))	
-	
+		newname += pick(list("ti","hi","ki","ya","ta","ha","ka","ya","chi","cha","kah"))
+
 	new_vox.real_name = capitalize(newname)
 	new_vox.name = new_vox.real_name
 	new_vox.age = rand(12,20)
@@ -528,7 +530,7 @@ client/proc/one_click_antag()
 		limb.status &= ~(ORGAN_DESTROYED | ORGAN_ROBOT)
 
 	//Now apply cortical stack.
-	var/datum/organ/external/E = new_vox.get_organ("head")	
+	var/datum/organ/external/E = new_vox.get_organ("head")
 	var/obj/item/weapon/implant/cortical/I = new(new_vox)
 	I.imp_in = new_vox
 	I.implanted = 1
@@ -540,7 +542,7 @@ client/proc/one_click_antag()
 	new_vox.equip_vox_raider()
 
 	return new_vox
-	
+
 /datum/admins/proc/makeVampires()
 
 	var/datum/game_mode/vampire/temp = new

code/modules/admin/verbs/randomverbs.dm

@@ -507,21 +507,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
 			if(synd_spawn)
 				new_character.loc = get_turf(synd_spawn)
 			call(/datum/game_mode/proc/equip_syndicate)(new_character)
-		if("Ninja")
-			new_character.equip_space_ninja()
-			new_character.internal = new_character.s_store
-			new_character.internals.icon_state = "internal1"
-			if(ninjastart.len == 0)
-				new_character << "<B>\red A proper starting location for you could not be found, please report this bug!</B>"
-				new_character << "<B>\red Attempting to place at a carpspawn.</B>"
-				for(var/obj/effect/landmark/L in landmarks_list)
-					if(L.name == "carpspawn")
-						ninjastart.Add(L)
-				if(ninjastart.len == 0 && latejoin.len > 0)
-					new_character << "<B>\red Still no spawneable locations could be found. Defaulting to latejoin.</B>"
-					new_character.loc = pick(latejoin)
-				else if (ninjastart.len == 0)
-					new_character << "<B>\red Still no spawneable locations could be found. Aborting.</B>"
 
 		if("Death Commando")//Leaves them at late-join spawn.
 			new_character.equip_death_commando()

code/modules/clothing/gloves/ninja.dm

@@ -1,126 +0,0 @@
-/*
-	Dear ninja gloves
-
-	This isn't because I like you
-	this is because your father is a bastard
-
-	...
-	I guess you're a little cool.
-	 -Sayu
-*/
-
-/obj/item/clothing/gloves/space_ninja
-	desc = "These nano-enhanced gloves insulate from electricity and provide fire resistance."
-	name = "ninja gloves"
-	icon_state = "s-ninja"
-	item_state = "s-ninja"
-	siemens_coefficient = 0
-	cold_protection = HANDS
-	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
-	heat_protection = HANDS
-	max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
-	var/draining = 0
-	var/candrain = 0
-	var/mindrain = 200
-	var/maxdrain = 400
-	species_fit = list("Vox")
-	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/mask.dmi'
-		)
-/*
-	This runs the gamut of what ninja gloves can do
-	The other option would be a dedicated ninja touch bullshit proc on everything
-	which would probably more efficient, but ninjas are pretty rare.
-	This was mostly introduced to keep ninja code from contaminating other code;
-	with this in place it would be easier to untangle the rest of it.
-
-	For the drain proc, see events/ninja.dm
-*/
-/obj/item/clothing/gloves/space_ninja/Touch(var/atom/A,var/proximity)
-	if(!candrain || draining) return 0
-
-	var/mob/living/carbon/human/H = loc
-	if(!istype(H)) return 0 // what
-	var/obj/item/clothing/suit/space/space_ninja/suit = H.wear_suit
-	if(!istype(suit)) return 0
-	if(isturf(A)) return 0
-
-	if(!proximity) // todo: you could add ninja stars or computer hacking here
-		return 0
-
-	// Move an AI into and out of things
-	if(istype(A,/mob/living/silicon/ai))
-		if(suit.s_control)
-			A.add_fingerprint(H)
-			suit.transfer_ai("AICORE", "NINJASUIT", A, H)
-			return 1
-		else
-			H << "\red <b>ERROR</b>: \black Remote access channel disabled."
-			return 0
-
-	if(istype(A,/obj/structure/AIcore/deactivated))
-		if(suit.s_control)
-			A.add_fingerprint(H)
-			suit.transfer_ai("INACTIVE","NINJASUIT",A, H)
-			return 1
-		else
-			H << "\red <b>ERROR</b>: \black Remote access channel disabled."
-			return 0
-	if(istype(A,/obj/machinery/computer/aifixer))
-		if(suit.s_control)
-			A.add_fingerprint(H)
-			suit.transfer_ai("AIFIXER","NINJASUIT",A, H)
-			return 1
-		else
-			H << "\red <b>ERROR</b>: \black Remote access channel disabled."
-			return 0
-
-	// steal energy from powered things
-	if(istype(A,/mob/living/silicon/robot))
-		A.add_fingerprint(H)
-		drain("CYBORG",A,suit)
-		return 1
-	if(istype(A,/obj/machinery/power/apc))
-		A.add_fingerprint(H)
-		drain("APC",A,suit)
-		return 1
-	if(istype(A,/obj/structure/cable))
-		A.add_fingerprint(H)
-		drain("WIRE",A,suit)
-		return 1
-	if(istype(A,/obj/structure/grille))
-		var/obj/structure/cable/C = locate() in A.loc
-		if(C)
-			drain("WIRE",C,suit)
-		return 1
-	if(istype(A,/obj/machinery/power/smes))
-		A.add_fingerprint(H)
-		drain("SMES",A,suit)
-		return 1
-	if(istype(A,/obj/mecha))
-		A.add_fingerprint(H)
-		drain("MECHA",A,suit)
-		return 1
-		/*
-	if(istype(A,/obj/item/weapon/stock_parts/cell))
-		A.add_fingerprint(H)
-		drain("CELL",A,suit)
-		return 1
-		*/
-
-	// download research
-	if(istype(A,/obj/machinery/computer/rdconsole))
-		A.add_fingerprint(H)
-		drain("RESEARCH",A,suit)
-		return 1
-	if(istype(A,/obj/machinery/r_n_d/server))
-		A.add_fingerprint(H)
-		var/obj/machinery/r_n_d/server/S = A
-		if(S.disabled)
-			return 1
-		if(S.shocked)
-			S.shock(H,50)
-			return 1
-		drain("RESEARCH",A,suit)
-		return 1
-

code/modules/clothing/masks/voice.dm

@@ -28,32 +28,4 @@
 
 /obj/item/clothing/mask/gas/voice/New()
 	..()
-	changer = new(src)
-
-/obj/item/clothing/mask/gas/voice/space_ninja
-	name = "ninja mask"
-	desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement."
-	icon_state = "s-ninja(norm)"
-	item_state = "s-ninja_mask"
-	unacidable = 1
-	siemens_coefficient = 0.2
-	species_fit = list("Vox")
-	var/mode = 0// 0==Scouter | 1==Night Vision | 2==Thermal | 3==Meson
-
-/obj/item/clothing/mask/gas/voice/space_ninja/scar
-	name = "ninja mask"
-	desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement. This mask appears to have already seen battle."
-	icon_state = "s-ninja(scar)"
-	item_state = "s-ninja_mask"
-
-/obj/item/clothing/mask/gas/voice/space_ninja/visor
-	name = "ninja mask"
-	desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement. This variant appears to have a visor to increase vision."
-	icon_state = "s-ninja(visor)"
-	item_state = "s-ninja_mask"
-
-/obj/item/clothing/mask/gas/voice/space_ninja/monocular
-	name = "ninja mask"
-	desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement. This variant appears to focus the user's vision out of a single port."
-	icon_state = "s-ninja(mon)"
-	item_state = "s-ninja_mask"
+	changer = new(src)

code/modules/clothing/shoes/miscellaneous.dm

@@ -36,21 +36,6 @@
 	armor = list(melee = 80, bullet = 60, laser = 50, energy = 50, bomb = 50, bio = 30, rad = 30)
 	flags = NOSLIP
 
-/obj/item/clothing/shoes/space_ninja
-	name = "ninja shoes"
-	desc = "A pair of running shoes. Excellent for running and even better for smashing skulls."
-	icon_state = "s-ninja"
-	permeability_coefficient = 0.01
-	flags = NOSLIP
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
-	siemens_coefficient = 0.2
-
-	cold_protection = FEET
-	min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
-	heat_protection = FEET
-	max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
-	species_restricted = null
-
 /obj/item/clothing/shoes/sandal
 	desc = "A pair of rather plain, wooden sandals."
 	name = "sandals"

code/modules/clothing/spacesuits/ninja.dm

@@ -1,66 +0,0 @@
-/obj/item/clothing/head/helmet/space/space_ninja
-	desc = "What may appear to be a simple black garment is in fact a highly sophisticated nano-weave helmet. Standard issue ninja gear."
-	name = "ninja hood"
-	icon_state = "s-ninja"
-	item_state = "s-ninja_hood"
-	allowed = list(/obj/item/weapon/stock_parts/cell)
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 25)
-	unacidable = 1
-	siemens_coefficient = 0.2
-
-
-/obj/item/clothing/suit/space/space_ninja
-	name = "ninja suit"
-	desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
-	icon_state = "s-ninja"
-	item_state = "s-ninja_suit"
-	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank,/obj/item/weapon/stock_parts/cell,/obj/item/device/suit_cooling_unit)
-	slowdown = 0
-	unacidable = 1
-	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
-	siemens_coefficient = 0.2
-
-		//Important parts of the suit.
-	var/mob/living/carbon/affecting = null//The wearer.
-	var/obj/item/weapon/stock_parts/cell/cell//Starts out with a high-capacity cell using New().
-	var/datum/effect/effect/system/spark_spread/spark_system//To create sparks.
-	var/reagent_list[] = list("tricordrazine","dexalinp","spaceacillin","anti_toxin","nutriment","uranium","hyronalin")//The reagents ids which are added to the suit at New().
-	var/stored_research[]//For stealing station research.
-	var/obj/item/weapon/disk/tech_disk/t_disk//To copy design onto disk.
-
-		//Other articles of ninja gear worn together, used to easily reference them after initializing.
-	var/obj/item/clothing/head/helmet/space/space_ninja/n_hood
-	var/obj/item/clothing/shoes/space_ninja/n_shoes
-	var/obj/item/clothing/gloves/space_ninja/n_gloves
-	var/obj/item/clothing/mask/gas/voice/space_ninja/n_mask
-
-		//Main function variables.
-	var/s_initialized = 0//Suit starts off.
-	var/s_coold = 0//If the suit is on cooldown. Can be used to attach different cooldowns to abilities. Ticks down every second based on suit ntick().
-	var/s_regen = 5.0//Base energy regen each ntick.
-	var/s_cost = 25.0//Additional cost for additional powers active.
-	var/k_cost = 200.0//Kamikaze energy cost each ntick.
-	var/k_damage = 1.0//Brute damage potentially done by Kamikaze each ntick.
-	var/s_delay = 40.0//How fast the suit does certain things, lower is faster. Can be overridden in specific procs. Also determines adverse probability.
-	var/a_transfer = 20.0//How much reagent is transferred when injecting.
-	var/r_maxamount = 80.0//How much reagent in total there is.
-	//var/s_rank = "Master" The three ranks are "Initiate", "Assassin", and "Master". Master is the base case.
-
-		//Support function variables.
-	var/spideros = 0//Mode of SpiderOS. This can change so I won't bother listing the modes here (0 is hub). Check ninja_equipment.dm for how it all works.
-	var/s_active = 0//Stealth off.
-	var/s_busy = 0//Is the suit busy with a process? Like AI hacking. Used for safety functions.
-	var/kamikaze = 0//Kamikaze on or off.
-	var/k_unlock = 0//To unlock Kamikaze.
-
-		//Ability function variables.
-	var/s_bombs = 10.0//Number of starting ninja smoke bombs.
-	var/a_boost = 3.0//Number of adrenaline boosters.
-	var/emp_proof = 0 // Will the suit react to EMPs? A kind of bad workaround to make Ninjas invulnerable to their own EMPs. - Dave
-
-		//Onboard AI related variables.
-	var/mob/living/silicon/ai/AI//If there is an AI inside the suit.
-	var/obj/item/device/paicard/pai//A slot for a pAI device
-	var/obj/effect/overlay/hologram//Is the AI hologram on or off? Visible only to the wearer of the suit. This works by attaching an image to a blank overlay.
-	var/flush = 0//If an AI purge is in progress.
-	var/s_control = 1//If user in control of the suit.

code/modules/computer3/component.dm

@@ -50,16 +50,6 @@
 	var/mob/living/silicon/ai/occupant	= null
 	var/busy = 0
 
-	// Ninja gloves check
-	attack_hand(mob/user as mob)
-		if(ishuman(user) && istype(user:gloves, /obj/item/clothing/gloves/space_ninja) && user:gloves:candrain && !user:gloves:draining)
-			if(user:wear_suit:s_control)
-				user:wear_suit.transfer_ai("AIFIXER","NINJASUIT",src,user)
-			else
-				user << "\red <b>ERROR</b>: \black Remote access channel disabled."
-			return
-		..()
-
 	attackby(obj/I as obj,mob/user as mob, params)
 		if(computer && !computer.stat)
 			if(istype(I, /obj/item/device/aicard))
@@ -91,7 +81,7 @@
 			computer.emagged = 1
 			return 1
 		else
-			usr << "You are unable to insert \the card, as the reader slot is occupied"	
+			usr << "You are unable to insert \the card, as the reader slot is occupied"
 			return 0
 
 	attackby(var/obj/item/I as obj, var/mob/user as mob, params)

code/modules/events/event.dm

@@ -42,10 +42,10 @@
 		return ..(active_with_role)
 	return 0
 
-/datum/event_meta/ninja/get_weight(var/list/active_with_role)
+/*/datum/event_meta/ninja/get_weight(var/list/active_with_role)
 	if(toggle_space_ninja)
 		return ..(active_with_role)
-	return 0
+	return 0*/
 
 /datum/event	//NOTE: Times are measured in master controller ticks!
 	var/startWhen		= 0	//When in the lifetime to call start().

code/modules/events/event_container.dm

@@ -157,7 +157,7 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Ion Storm",				/datum/event/ionstorm, 					0,		list(ASSIGNMENT_AI = 50, ASSIGNMENT_CYBORG = 50, ASSIGNMENT_ENGINEER = 15, ASSIGNMENT_SCIENTIST = 5)),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Borer Infestation",		/datum/event/borer_infestation, 		20,		list(ASSIGNMENT_SECURITY = 20), 1),
 		new /datum/event_meta/alien(EVENT_LEVEL_MODERATE, "Alien Infestation",	/datum/event/alien_infestation, 		0,		list(ASSIGNMENT_SECURITY = 15), 1),
-		new /datum/event_meta/ninja(EVENT_LEVEL_MODERATE, "Space Ninja",		/datum/event/space_ninja, 				0,		list(ASSIGNMENT_SECURITY = 15), 1),
+		//new /datum/event_meta/ninja(EVENT_LEVEL_MODERATE, "Space Ninja",		/datum/event/space_ninja, 				0,		list(ASSIGNMENT_SECURITY = 15), 1),
 		// NON-BAY EVENTS
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Mass Hallucination",		/datum/event/mass_hallucination,		300),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust",				/datum/event/dust,						50,		list(ASSIGNMENT_ENGINEER = 50)),

code/modules/events/event_dynamic.dm

@@ -99,8 +99,8 @@ var/global/list/possibleEvents = list()
 			possibleEvents[/datum/event/spider_infestation] = max(active_with_role["Security"], 5) + 5
 		if(aliens_allowed && !sent_aliens_to_station)
 			possibleEvents[/datum/event/alien_infestation] = max(active_with_role["Security"], 5) + 2.5
-		if(!sent_ninja_to_station && toggle_space_ninja)
-			possibleEvents[/datum/event/space_ninja] = max(active_with_role["Security"], 5)
+		/*if(!sent_ninja_to_station && toggle_space_ninja)
+			possibleEvents[/datum/event/space_ninja] = max(active_with_role["Security"], 5)*/
 	possibleEvents[/datum/event/tear] = active_with_role["Security"] * 25
 
 	for(var/event_type in event_last_fired) if(possibleEvents[event_type])

code/modules/events/space_ninja.dm

@@ -1,2 +0,0 @@
-/datum/event/space_ninja/setup()
-	space_ninja_arrival()

code/modules/mob/living/carbon/human/human.dm

@@ -207,8 +207,6 @@
 			if(mind.changeling)
 				stat("Chemical Storage", "[mind.changeling.chem_charges]/[mind.changeling.chem_storage]")
 				stat("Absorbed DNA", mind.changeling.absorbedcount)
-		if (istype(wear_suit, /obj/item/clothing/suit/space/space_ninja)&&wear_suit:s_initialized)
-			stat("Energy Charge", (wear_suit:cell:charge))
 
 	if(istype(loc, /obj/spacepod)) // Spacdpods!
 		var/obj/spacepod/S = loc

code/modules/mob/living/carbon/human/life.dm

@@ -1317,29 +1317,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					see_invisible = SEE_INVISIBLE_LIVING
 					seer = 0
 
-			var/tmp/has_ninja_mask = 0
-			if(istype(wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja))
-				has_ninja_mask = 1
-				var/obj/item/clothing/mask/gas/voice/space_ninja/O = wear_mask
-				switch(O.mode)
-					if(0)
-						var/target_list[] = list()
-						for(var/mob/living/target in oview(src))
-							if( target.mind&&(target.mind.special_role||issilicon(target)) )//They need to have a mind.
-								target_list += target
-						if(target_list.len)//Everything else is handled by the ninja mask proc.
-							O.assess_targets(target_list, src)
-						if(!druggy)		see_invisible = SEE_INVISIBLE_LIVING
-					if(1)
-						see_in_dark = 5
-						if(!druggy)		see_invisible = SEE_INVISIBLE_MINIMUM
-					if(2)
-						sight |= SEE_MOBS
-						if(!druggy)		see_invisible = SEE_INVISIBLE_LEVEL_TWO
-					if(3)
-						sight |= SEE_TURFS
-						if(!druggy)		see_invisible = SEE_INVISIBLE_LIVING
-
 			if(glasses)
 				var/obj/item/clothing/glasses/G = glasses
 				if(istype(G))
@@ -1367,7 +1344,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 						see_invisible = SEE_INVISIBLE_LIVING
 					if(istype(O,/obj/item/clothing/glasses/hud/security/night) || istype(O,/obj/item/clothing/glasses/hud/health/night))
 						see_invisible = SEE_INVISIBLE_MINIMUM
-			else if(!seer && !has_ninja_mask)
+			else if(!seer)
 				see_in_dark = species.darksight
 				see_invisible = SEE_INVISIBLE_LIVING
 

code/modules/mob/living/carbon/human/whisper.dm

@@ -72,7 +72,7 @@
 		return
 
 	//looks like this only appears in whisper. Should it be elsewhere as well? Maybe handle_speech_problems?
-	var/voice_sub
+	/*var/voice_sub
 	for(var/obj/item/gear in list(wear_mask,wear_suit,head))
 		if(!gear)
 			continue
@@ -97,7 +97,7 @@
 			message = replacetext(message, "l", "<22>")
 			message = replacetext(message, "s", "<22>")
 			message = replacetext(message, "u", "<22>")
-			message = replacetext(message, "b", "<22>")
+			message = replacetext(message, "b", "<22>")*/
 
 	var/list/listening = hearers(message_range, src)
 	listening |= src

code/modules/mob/living/silicon/ai/ai.dm

@@ -1038,9 +1038,6 @@ var/list/ai_verbs_default = list(
 			if(H.wear_id && istype(H.wear_id.GetID(), /obj/item/weapon/card/id/syndicate))
 				src << "Unable to locate an airlock"
 				return
-			if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && (H.head.flags & NODROP))
-				src << "Unable to locate an airlock"
-				return
 			if(H.digitalcamo)
 				src << "Unable to locate an airlock"
 				return

code/modules/mob/living/silicon/mommi/mommi.dm

@@ -260,7 +260,7 @@ They can only use one tool at a time, they can't choose modules, and they have 1
 	else
 		spark_system.start()
 		return ..()
-		
+
 /mob/living/silicon/robot/mommi/emag_act(user as mob)
 	if(!opened)//Cover is closed
 		if(locked)
@@ -338,9 +338,6 @@ They can only use one tool at a time, they can't choose modules, and they have 1
 
 
 	if(ishuman(user))
-		if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
-			call(/obj/item/clothing/gloves/space_ninja/proc/drain)("CYBORG",src,user:wear_suit)
-			return
 		if(user.a_intent == "help")
 			user.visible_message("\blue [user.name] pats [src.name] on the head.")
 			return

code/modules/mob/living/silicon/pai/pai.dm

@@ -82,14 +82,14 @@
 		if(!card.radio)
 			card.radio = new /obj/item/device/radio(src.card)
 		radio = card.radio
-		
+
 	//Default languages without universal translator software
 	add_language("Galactic Common", 1)
 	add_language("Sol Common", 1)
 	add_language("Tradeband", 1)
-	add_language("Gutter", 1)	
-	add_language("Trinary", 1)		
-		
+	add_language("Gutter", 1)
+	add_language("Trinary", 1)
+
 	//Verbs for pAI mobile form, chassis and Say flavor text
 	verbs += /mob/living/silicon/pai/proc/choose_chassis
 	verbs += /mob/living/silicon/pai/proc/choose_verbs
@@ -346,9 +346,6 @@
 	if(istype(card.loc,/mob))
 		var/mob/holder = card.loc
 		holder.unEquip(card)
-	else if(istype(card.loc,/obj/item/clothing/suit/space/space_ninja))
-		var/obj/item/clothing/suit/space/space_ninja/holder = card.loc
-		holder.pai = null
 	else if(istype(card.loc,/obj/item/device/pda))
 		var/obj/item/device/pda/holder = card.loc
 		holder.pai = null

code/modules/mob/mob_helpers.dm

@@ -114,11 +114,11 @@ proc/isembryo(A)
 	if(istype(A, /mob/living/silicon))
 		return 1
 	return 0
-	
+
 /proc/isSilicon(A) // Bay support
 	if(istype(A, /mob/living/silicon))
 		return 1
-	return 0	
+	return 0
 
 /proc/isliving(A)
 	if(istype(A, /mob/living))
@@ -163,7 +163,7 @@ proc/isnewplayer(A)
 
 proc/hasorgans(A)
 	return ishuman(A)
-	
+
 proc/iscuffed(A)
 	if(istype(A, /mob/living/carbon))
 		var/mob/living/carbon/C = A
@@ -318,35 +318,6 @@ proc/Gibberish(t, p)//t is the inputted message, and any value higher than 70 fo
 	return returntext
 
 
-/proc/ninjaspeak(n)
-/*
-The difference with stutter is that this proc can stutter more than 1 letter
-The issue here is that anything that does not have a space is treated as one word (in many instances). For instance, "LOOKING," is a word, including the comma.
-It's fairly easy to fix if dealing with single letters but not so much with compounds of letters./N
-*/
-	var/te = html_decode(n)
-	var/t = ""
-	n = length(n)
-	var/p = 1
-	while(p <= n)
-		var/n_letter
-		var/n_mod = rand(1,4)
-		if(p+n_mod>n+1)
-			n_letter = copytext(te, p, n+1)
-		else
-			n_letter = copytext(te, p, p+n_mod)
-		if (prob(50))
-			if (prob(30))
-				n_letter = text("[n_letter]-[n_letter]-[n_letter]")
-			else
-				n_letter = text("[n_letter]-[n_letter]")
-		else
-			n_letter = text("[n_letter]")
-		t = text("[t][n_letter]")
-		p=p+n_mod
-	return sanitize(copytext(t,1,MAX_MESSAGE_LEN))
-
-
 /proc/shake_camera(mob/M, duration, strength=1)
 	if(!M || !M.client || M.shakecamera)
 		return

code/modules/power/apc.dm

@@ -599,8 +599,8 @@
 					user << "You emag the APC interface."
 					update_icon()
 				else
-					user << "You fail to [ locked ? "unlock" : "lock"] the APC interface."				
-				
+					user << "You fail to [ locked ? "unlock" : "lock"] the APC interface."
+
 // attack with hand - remove cell (if cover open) or interact with the APC
 /obj/machinery/power/apc/attack_hand(mob/user)
 //	if (!can_use(user)) This already gets called in interact() and in topic()
@@ -657,12 +657,6 @@
 	if(stat & (BROKEN|MAINT))
 		return
 
-	if(ishuman(user))
-		if(istype(user:gloves, /obj/item/clothing/gloves/space_ninja)&&user:gloves:candrain&&!user:gloves:draining)
-			call(/obj/item/clothing/gloves/space_ninja/proc/drain)("APC",src,user:wear_suit)
-			return
-	// do APC interaction
-	//user.set_machine(src)
 	src.interact(user)
 
 /obj/machinery/power/apc/attack_alien(mob/living/carbon/alien/humanoid/user)
@@ -691,12 +685,12 @@
 	else
 		beenhit += 1
 	return
-	
+
 /obj/machinery/power/apc/attack_ghost(user as mob)
-	if(stat & (BROKEN|MAINT))	
+	if(stat & (BROKEN|MAINT))
 		return
 	return ui_interact(user)
-	
+
 /obj/machinery/power/apc/interact(mob/user)
 	if(!user)
 		return
@@ -859,7 +853,7 @@
 			user << "\red You momentarily forget how to use [src]."
 			return 0
 	return 1
-	
+
 /obj/machinery/power/apc/proc/is_authenticated(mob/user as mob)
 	if(isAI(user) || isrobot(user))
 		return 1
@@ -869,26 +863,26 @@
 /obj/machinery/power/apc/Topic(href, href_list, var/usingUI = 1)
 	if(..())
 		return 1
-		
+
 	if(!can_use(usr, 1))
 		return 1
 
 	if (href_list["lock"])
 		if(!is_authenticated(usr))
 			return
-			
+
 		coverlocked = !coverlocked
 
 	else if (href_list["breaker"])
 		if(!is_authenticated(usr))
 			return
-			
+
 		toggle_breaker()
 
 	else if (href_list["cmode"])
 		if(!is_authenticated(usr))
 			return
-			
+
 		chargemode = !chargemode
 		if(!chargemode)
 			charging = 0
@@ -897,7 +891,7 @@
 	else if (href_list["eqp"])
 		if(!is_authenticated(usr))
 			return
-			
+
 		var/val = text2num(href_list["eqp"])
 		equipment = setsubsystem(val)
 		update_icon()
@@ -906,7 +900,7 @@
 	else if (href_list["lgt"])
 		if(!is_authenticated(usr))
 			return
-			
+
 		var/val = text2num(href_list["lgt"])
 		lighting = setsubsystem(val)
 		update_icon()
@@ -915,7 +909,7 @@
 	else if (href_list["env"])
 		if(!is_authenticated(usr))
 			return
-			
+
 		var/val = text2num(href_list["env"])
 		environ = setsubsystem(val)
 		update_icon()

code/modules/power/cell.dm

@@ -67,13 +67,6 @@
 
 /obj/item/weapon/stock_parts/cell/attack_self(mob/user as mob)
 	src.add_fingerprint(user)
-
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		var/obj/item/clothing/gloves/space_ninja/SNG = H.gloves
-		if(!istype(SNG) || !SNG.candrain || !SNG.draining) return
-
-		SNG.drain("CELL",src,H.wear_suit)
 	return
 
 /obj/item/weapon/stock_parts/cell/attackby(obj/item/W, mob/user, params)

code/modules/reagents/reagent_containers/drugs.dm

@@ -81,8 +81,6 @@
 			user << "\blue You transfer [trans] units of the solution to [target]."
 
 		//Safety for dumping stuff into a ninja suit. It handles everything through attackby() and this is unnecessary.
-		else if(istype(target, /obj/item/clothing/suit/space/space_ninja))
-			return
 
 		else if(istype(target, /obj/machinery/bunsen_burner))
 			return

code/modules/reagents/reagent_containers/glass.dm

@@ -142,10 +142,6 @@
 
 
 		for(var/type in src.can_be_placed_into)
-
-			if(istype(target, type))
-
-				return
 
 			if(istype(target, type))
 
@@ -300,8 +296,8 @@
 
 			var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text))
 
-
-			var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text))
+			if(length(tmp_label) > 10)
+
 				user << "\red The label can be at most 10 characters long."
 
 			else

code/modules/research/xenoarchaeology/artifact/artifact.dm

@@ -13,7 +13,6 @@
 	artifact_id = "[pick("kappa","sigma","antaeres","beta","omicron","iota","epsilon","omega","gamma","delta","tau","alpha")]-[rand(100,999)]"
 
 	artifact_find_type = pick(\
-	5;/obj/structure/largecrate/ninja,\
 	5;/obj/machinery/power/supermatter,\
 	5;/obj/structure/constructshell,\
 	5;/obj/machinery/wish_granter,\
@@ -44,7 +43,7 @@
 /obj/structure/boulder/New()
 	icon_state = "boulder[rand(1,4)]"
 	excavation_level = rand(5,50)
-	
+
 /obj/structure/boulder/Bumped(AM)
 	. = ..()
 	if(istype(AM,/mob/living/carbon/human))