Merge pull request #492 from SamCroswell/dave-NinjaDev

Removes Space Ninjas
ParadiseSS13 · Mar 4, 2015 · 10ee512 · 10ee512
2 parents 54385f0 + b8a9c90
commit 10ee512
Show file tree

Hide file tree

Showing 43 changed files with 68 additions and 3,930 deletions.
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
@@ -249,7 +249,6 @@ client
 			body += "<option value='?_src_=vars;godmode=\ref[D]'>Toggle Godmode</option>"
 			body += "<option value='?_src_=vars;build_mode=\ref[D]'>Toggle Build Mode</option>"
 
-			body += "<option value='?_src_=vars;ninja=\ref[D]'>Make Space Ninja</option>"
 			body += "<option value='?_src_=vars;make_skeleton=\ref[D]'>Make 2spooky</option>"
 
 			body += "<option value='?_src_=vars;direct_control=\ref[D]'>Assume Direct Control</option>"
@@ -526,17 +525,6 @@ client
 		src.give_disease2(M)
 		href_list["datumrefresh"] = href_list["give_spell"]
 
-	else if(href_list["ninja"])
-		if(!check_rights(R_SPAWN))	return
-
-		var/mob/M = locate(href_list["ninja"])
-		if(!istype(M))
-			usr << "This can only be used on instances of type /mob"
-			return
-
-		src.cmd_admin_ninjafy(M)
-		href_list["datumrefresh"] = href_list["ninja"]
-
 	else if(href_list["godmode"])
 		if(!check_rights(R_REJUVINATE))	return
 

diff --git a/code/datums/mind.dm b/code/datums/mind.dm
@@ -242,26 +242,6 @@ datum/mind
 
 			sections["changeling"] = text
 
-			/** NINJA ***/
-			text = "ninja"
-			if (ticker.mode.config_tag=="ninja")
-				text = uppertext(text)
-			text = "<i><b>[text]</b></i>: "
-			if (src in ticker.mode.ninjas)
-				text += "<b>YES</b>|<a href='?src=\ref[src];ninja=clear'>no</a>"
-				text += "<br><a href='?src=\ref[src];ninja=outpost'>To outpost</a>, <a href='?src=\ref[src];common=undress'>undress</a>, <a href='?src=\ref[src];ninja=dressup'>dress up</a>."
-				//if (objectives.len==0)
-					//text += "<br>Objectives are empty! <a href='?src=\ref[src];wizard=autoobjectives'>Randomize!</a>"
-			else
-				text += "<a href='?src=\ref[src];ninja=ninja'>yes</a>|<b>NO</b>"
-
-			if(current && current.client && current.client.prefs.be_special & BE_NINJA)
-				text += "|Enabled in Prefs"
-			else
-				text += "|Disabled in Prefs"
-
-			sections["ninja"] = text
-
 			/** VAMPIRE ***/
 			text = "vampire"
 			if (ticker.mode.config_tag=="vampire")
@@ -822,26 +802,6 @@ datum/mind
 					ticker.mode.forge_wizard_objectives(src)
 					usr << "\blue The objectives for wizard [key] have been generated. You can edit them and anounce manually."
 
-		else if (href_list["ninja"])
-			current.hud_updateflag |= (1 << SPECIALROLE_HUD)
-
-			switch(href_list["ninja"])
-				if("clear")
-					if(src in ticker.mode.ninjas)
-						ticker.mode.ninjas -= src
-						special_role = null
-						current << "\red <FONT size = 3><B>You have been brainwashed! You are no longer a Ninja!</B></FONT>"
-						log_admin("[key_name_admin(usr)] has de-ninja'ed [current].")
-				if("ninja")
-					if(!(src in ticker.mode.ninjas))
-						ticker.mode.ninjas += src
-						special_role = "Ninja"
-						current << "<B>\blue Your mind awakens, your true potential is realized! You are a <i>Space Ninja</i>!</B>"
-						log_admin("[key_name_admin(usr)] has ninja'ed [current].")
-				if("outpost")
-					current.loc = pick(ninjastart)
-				if("dressup")
-					current:equip_space_ninja()
 
 		else if (href_list["changeling"])
 			current.hud_updateflag |= (1 << SPECIALROLE_HUD)