From 7df564ca0000b36987c19a1d540d46ba4e0b2552 Mon Sep 17 00:00:00 2001
From: Ren Erthilo <erthilo@gmail.com>
Date: Sun, 29 Apr 2012 23:21:02 +0100
Subject: [PATCH] TG: 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 Revision: r3345
 Author: 	 VivianFoxfoot

---
 code/game/machinery/computer/HolodeckControl.dm | 1 +
 code/game/objects/window.dm                     | 4 +++-
 code/modules/admin/verbs/pray.dm                | 1 +
 code/unused/_debug.dm                           | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 6d29232f04..567f10801f 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -308,6 +308,7 @@
 	density = 1
 	anchored = 1.0
 	layer = 2.8
+//	throwpass = 1	//You can throw objects over this, despite it's density.
 
 
 /obj/structure/table/holotable/attack_paw(mob/user as mob)
diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm
index 34c42f24bb..a022f63f13 100644
--- a/code/game/objects/window.dm
+++ b/code/game/objects/window.dm
@@ -224,9 +224,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
diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 69ffc12b83..47e6131387 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -17,6 +17,7 @@
 			M << "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, M)] (<A HREF='?src=\ref[M.client.holder];adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?src=\ref[M.client.holder];adminplayervars=\ref[src]'>VV</A>) (<A HREF='?src=\ref[M.client.holder];adminplayersubtlemessage=\ref[src]'>SM</A>) (<A HREF='?src=\ref[M.client.holder];adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?src=\ref[M.client.holder];secretsadmin=check_antagonist'>CA</A>):</b> [msg]"
 
 	usr << "Your prayers have been received by the gods."
+	//feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	//log_admin("HELP: [key_name(src)]: [msg]")
 
 
diff --git a/code/unused/_debug.dm b/code/unused/_debug.dm
index b9cbcdf430..ced557f197 100644
--- a/code/unused/_debug.dm
+++ b/code/unused/_debug.dm
@@ -615,3 +615,5 @@ Doing this because FindTurfs() isn't even used
 	playsound(pt.loc, 'explosionfar.ogg', 100, 1,10)
 	pt.gas.temperature = 500+T0C
 	pt.ignite()
+
+