TG: Added an emergency shutdown proc to the holodeck control computer.

- Destroying, damaging or emping the computer will now cause the holodeck to
revert to its original state. Meaning this should help stop people taking
eswords out of the holodeck.

The detective's gun renaming verb moved from the BYOND default 'you did not set
a category' tab into the 'objects' tab

Mob.dm's stripping proc was a single very looooooooooooong line of code. It is
now multiple lines of code.
Revision: r3649
Author: 	 johnsonmt88

code/game/machinery/computer/HolodeckControl.dm

@@ -52,6 +52,7 @@
 				dat += "<A href='?src=\ref[src];AIoverride=1'>(<font color=red>Disable Safety Protocols?</font>)</A><BR>"
 			dat += "<BR>"
 			dat += "Safety Protocols are <font color=green> ENABLED </font><BR>"
+
 		user << browse(dat, "window=computer;size=400x500")
 		onclose(user, "computer")
 
@@ -119,6 +120,8 @@
 
 
 /obj/machinery/computer/HolodeckControl/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
+//Warning, uncommenting this can have concequences. For example, deconstructing the computer may cause holographic eswords to never derez
+
 /*		if(istype(D, /obj/item/weapon/screwdriver))
 			playsound(src.loc, 'Screwdriver.ogg', 50, 1)
 			if(do_after(user, 20))
@@ -166,6 +169,30 @@
 	//	if(target)
 	//		loadProgram(target)
 
+//This could all be done better, but it works for now.
+/obj/machinery/computer/HolodeckControl/Del()
+	emergencyShutdown()
+	..()
+
+/obj/machinery/computer/HolodeckControl/meteorhit(var/obj/O as obj)
+	emergencyShutdown()
+	..()
+
+
+/obj/machinery/computer/HolodeckControl/emp_act(severity)
+	emergencyShutdown()
+	..()
+
+
+/obj/machinery/computer/HolodeckControl/ex_act(severity)
+	emergencyShutdown()
+	..()
+
+
+/obj/machinery/computer/HolodeckControl/blob_act()
+	emergencyShutdown()
+	..()
+
 
 /obj/machinery/computer/HolodeckControl/process()
 
@@ -282,7 +309,18 @@
 						T.hotspot_expose(50000,50000,1)
 
 
+/obj/machinery/computer/HolodeckControl/proc/emergencyShutdown()
+	//Get rid of any items
+	for(var/item in holographic_items)
+		derez(item)
+	//Turn it back to the regular non-holographic room
+	target = locate(/area/holodeck/source_plating)
+	if(target)
+		loadProgram(target)
 
+	var/area/targetsource = locate(/area/holodeck/source_plating)
+	targetsource.copy_contents_to(linkedholodeck , 1)
+	active = 0
 
 
 

code/modules/mob/mob.dm

@@ -243,7 +243,19 @@
 
 /mob/proc/show_inv(mob/user as mob)
 	user.machine = src
-	var/dat = text("<TT>\n<B><FONT size=3>[]</FONT></B><BR>\n\t<B>Head(Mask):</B> <A href='?src=\ref[];item=mask'>[]</A><BR>\n\t<B>Left Hand:</B> <A href='?src=\ref[];item=l_hand'>[]</A><BR>\n\t<B>Right Hand:</B> <A href='?src=\ref[];item=r_hand'>[]</A><BR>\n\t<B>Back:</B> <A href='?src=\ref[];item=back'>[]</A><BR>\n\t[]<BR>\n\t[]<BR>\n\t[]<BR>\n\t<A href='?src=\ref[];item=pockets'>Empty Pockets</A><BR>\n<A href='?src=\ref[];mach_close=mob[]'>Close</A><BR>\n</TT>", name, src, (wear_mask ? text("[]", wear_mask) : "Nothing"), src, (l_hand ? text("[]", l_hand) : "Nothing"), src, (r_hand ? text("[]", r_hand) : "Nothing"), src, (back ? text("[]", back) : "Nothing"), ((istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/weapon/tank) && !( internal )) ? text(" <A href='?src=\ref[];item=internal'>Set Internal</A>", src) : ""), (internal ? text("<A href='?src=\ref[];item=internal'>Remove Internal</A>", src) : ""), (handcuffed ? text("<A href='?src=\ref[];item=handcuff'>Handcuffed</A>", src) : text("<A href='?src=\ref[];item=handcuff'>Not Handcuffed</A>", src)), src, user, name)
+	var/dat = {"
+	<B><HR><FONT size=3>[name]</FONT></B>
+	<BR><HR>
+	<BR><B>Head(Mask):</B> <A href='?src=\ref[src];item=mask'>[(wear_mask ? wear_mask : "Nothing")]</A>
+	<BR><B>Left Hand:</B> <A href='?src=\ref[src];item=l_hand'>[(l_hand ? l_hand  : "Nothing")]</A>
+	<BR><B>Right Hand:</B> <A href='?src=\ref[src];item=r_hand'>[(r_hand ? r_hand : "Nothing")]</A>
+	<BR><B>Back:</B> <A href='?src=\ref[src];item=back'>[(back ? back : "Nothing")]</A> [((istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/weapon/tank) && !( internal )) ? text(" <A href='?src=\ref[];item=internal'>Set Internal</A>", src) : "")]
+	<BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
+	<BR>[(internal ? text("<A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]
+	<BR><A href='?src=\ref[src];item=pockets'>Empty Pockets</A>
+	<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>
+	<BR><A href='?src=\ref[user];mach_close=mob[name]'>Close</A>
+	<BR>"}
 	user << browse(dat, text("window=mob[];size=325x500", name))
 	onclose(user, "mob[name]")
 	return

code/modules/projectiles/guns/projectile/revolver.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/gun/projectile/detective
 	desc = "A cheap Martian knock-off of a Smith & Wesson Model 10. Uses .38-Special rounds."
-	name = "\improper Revolver"
+	name = "revolver"
 	icon_state = "detective"
 	caliber = "357"
 	origin_tech = "combat=2;materials=2"
@@ -18,7 +18,8 @@
 
 	verb/rename_gun()
 		set name = "Name Gun"
-		set desc = "Click to rename your gun."
+		set category = "Object"
+		set desc = "Click to rename your gun. If you're the detective."
 
 		var/mob/M = usr
 		if(!M.mind)	return 0
@@ -38,7 +39,7 @@
 
 
 /obj/item/weapon/gun/projectile/mateba
-	name = "\improper Mateba"
+	name = "mateba"
 	desc = "When you absolutely, positively need a 10mm hole in the other guy. Uses .357 ammo."
 	icon_state = "mateba"
 	origin_tech = "combat=2;materials=2"