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] PRAY: [key_name(src, M)] (PP) (VV) (SM) (JMP) (CA): [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() + +