upstream-merge-27971

2017-06-11 08:21:14 -05:00
parent bd4d42a8a6
commit 11ff6a7628
5 changed files with 32 additions and 24 deletions
@@ -24,6 +24,7 @@
 	resistance_flags = ACID_PROOF
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 100)
 	CanAtmosPass = ATMOS_PASS_PROC
+	var/real_explosion_block	//ignore this, just use explosion_block

 /obj/structure/window/examine(mob/user)
 	..()
@@ -73,6 +74,10 @@
 	if(rods)
 		debris += new /obj/item/stack/rods(src, rods)

+	//windows only block while reinforced and fulltile, so we'll use the proc
+	real_explosion_block = explosion_block
+	explosion_block = EXPLOSION_BLOCK_PROC
+
 /obj/structure/window/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd)
 	switch(the_rcd.mode)
 		if(RCD_DECONSTRUCT)
@@ -400,6 +405,10 @@

 	return 1

+/obj/structure/window/GetExplosionBlock()
+	return reinf && fulltile ? real_explosion_block : 0
+
+
 /obj/structure/window/unanchored
 	anchored = FALSE