Merge pull request #192 from SamCroswell/master

Map changes, new ninja masks, more commits possibly to come

code/modules/admin/admin.dm

@@ -170,6 +170,7 @@ var/global/floorIsLava = 0
 			<b>Other actions:</b>
 			<br>
 			<A href='?src=\ref[src];forcespeech=\ref[M]'>Forcesay</A> |
+			<A href='?src=\ref[src];aroomwarp=\ref[M]'>Admin Room</A> |
 			<A href='?src=\ref[src];tdome1=\ref[M]'>Thunderdome 1</A> |
 			<A href='?src=\ref[src];tdome2=\ref[M]'>Thunderdome 2</A> |
 			<A href='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> |
@@ -1073,4 +1074,4 @@ proc/formatLocation(var/location)
 	return "[A.name] - [loc.x],[loc.y],[loc.z]"
 
 proc/formatPlayerPanel(var/mob/U,var/text="PP")
-	return "<A HREF='?_src_=holder;adminplayeropts=\ref[U]'>[text]</A>"
+	return "<A HREF='?_src_=holder;adminplayeropts=\ref[U]'>[text]</A>"

code/modules/admin/topic.dm

@@ -1253,6 +1253,29 @@
 		log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)")
 		message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1)
 
+	else if(href_list["aroomwarp"])
+		if(!check_rights(R_FUN))	return
+
+		if(alert(usr, "Confirm?", "Message", "Yes", "No") != "Yes")
+			return
+
+		var/mob/M = locate(href_list["aroomwarp"])
+		if(!ismob(M))
+			usr << "This can only be used on instances of type /mob"
+			return
+		if(istype(M, /mob/living/silicon/ai))
+			usr << "This cannot be used on instances of type /mob/living/silicon/ai"
+			return
+
+		M.Paralyse(5)
+		sleep(5)
+		M.loc = pick(aroomwarp)
+		spawn(50)
+			M << "\blue You have been sent to the <b>Admin Room!</b>."
+		log_admin("[key_name(usr)] has sent [key_name(M)] to the Admin Room")
+		message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the Admin Room", 1)
+
+
 	else if(href_list["revive"])
 		if(!check_rights(R_REJUVINATE))	return
 

code/modules/clothing/masks/gasmask.dm

@@ -56,11 +56,30 @@
 /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"
+	icon_state = "s-ninja(norm)"
 	item_state = "s-ninja_mask"
 	vchange = 1
 	siemens_coefficient = 0.2
 
+/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"
+
+
 /obj/item/clothing/mask/gas/clown_hat
 	name = "clown wig and mask"
 	desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."

code/modules/clothing/spacesuits/ninja.dm

@@ -2,7 +2,7 @@
 	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_mask"
+	item_state = "s-ninja_hood"
 	allowed = list(/obj/item/weapon/cell)
 	armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 25)
 	siemens_coefficient = 0.2