Adds more debugging to the tensioner.

Adds another emagged version to the holodeck that has spess carp.
Fixes mobs going temporally bald after leaving the holodeck.
Disables BSA due to abuse.
Windows can only be damaged by weapons that do brute or burn

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3345 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/machinery/computer/HolodeckControl.dm

@@ -16,11 +16,13 @@
 		return
 
 	attack_hand(var/mob/user as mob)
+
 		if(..())
 			return
 		user.machine = src
 		var/dat
 
+
 		dat += "<B>Holodeck Control System</B><BR>"
 		dat += "<HR>Current Loaded Programs:<BR>"
 
@@ -32,16 +34,25 @@
 
 		dat += "Please ensure that only holographic weapons are used in the holodeck if a combat simulation has been loaded.<BR>"
 
+		if(issilicon(user) && !emagged)
+			dat += "<A href='?src=\ref[src];AIoverride=1'>(<font color=red>Override Safety Protocols?</font>)</A><BR>"
 
 		if(emagged)
 			dat += "<A href='?src=\ref[src];burntest=1'>(<font color=red>Begin Atmospheric Burn Simulation</font>)</A><BR>"
 			dat += "Ensure the holodeck is empty before testing.<BR>"
+			dat += "<BR>"
+			dat += "<A href='?src=\ref[src];wildlifecarp=1'>(<font color=red>Begin Wildlife Simulation</font>)</A><BR>"
+			dat += "Ensure the holodeck is empty before testing.<BR>"
+			dat += "<BR>"
 			dat += "Safety Protocols are <font color=red> DISABLED </font><BR>"
 		else
+			dat += "<BR>"
 			dat += "Safety Protocols are <font color=green> ENABLED </font><BR>"
 
 		user << browse(dat, "window=computer;size=400x500")
 		onclose(user, "computer")
+
+
 		return
 
 
@@ -81,6 +92,14 @@
 				if(target)
 					loadProgram(target)
 
+			else if(href_list["wildlifecarp"])
+				target = locate(/area/holodeck/source_wildlife)
+				if(target)
+					loadProgram(target)
+
+			else if(href_list["AIoverride"])
+				emagged = 1
+
 			src.add_fingerprint(usr)
 		src.updateUsrDialog()
 		return
@@ -164,6 +183,12 @@
 
 /obj/machinery/computer/HolodeckControl/proc/derez(var/obj , var/silent = 1)
 	holographic_items.Remove(obj)
+
+	if(istype(obj , /obj/))
+		if(istype(obj:loc , /mob/))
+			var/mob/M = obj:loc
+			M.drop_from_slot(obj)
+
 	if(!silent)
 		var/obj/oldobj = obj
 		for(var/mob/M in viewers(world.view,get_turf(obj)))
@@ -211,6 +236,9 @@
 	for(var/item in holographic_items)
 		derez(item)
 
+	for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck)
+		del(B)
+
 	holographic_items = A.copy_contents_to(linkedholodeck , 1)
 
 	if(emagged)

code/game/objects/window.dm

@@ -205,9 +205,11 @@
 		playsound(src.loc, 'Crowbar.ogg', 75, 1)
 		user << (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")
 	else
+
 		var/aforce = W.force
 		if(reinf) aforce /= 2.0
-		src.health = max(0, src.health - aforce)
+		if(W.damtype == BRUTE || W.damtype == BURN)
+			src.health = max(0, src.health - aforce)
 		playsound(src.loc, 'Glasshit.ogg', 75, 1)
 		if (src.health <= 7)
 			src.anchored = 0