Changed floor ex_act to not break grilles & src if under r-windows.

This commit is contained in:
xxalpha
2016-01-16 17:43:33 +00:00
parent 4dd308c278
commit 2cc55c3ba0
4 changed files with 11 additions and 5 deletions
-1
View File
@@ -11,7 +11,6 @@
var/health = 10
var/destroyed = 0
var/obj/item/stack/rods/stored
level = 3
/obj/structure/grille/New()
stored = new/obj/item/stack/rods(src)
+1 -1
View File
@@ -307,7 +307,7 @@
return
/obj/structure/window/proc/spawnfragments()
if(!loc) //if already qdel'd somehow, we do nothing
if(qdeleted())
return
var/turf/T = loc
for(var/obj/item/I in storeditems)
+6 -1
View File
@@ -67,8 +67,13 @@
var/affecting_level
if(severity == 1)
affecting_level = 1
else if(is_shielded())
affecting_level = 3
else if(intact)
affecting_level = 2
else
affecting_level = is_shielded() ? 2 : (intact ? 2 : 1)
affecting_level = 1
for(var/V in contents)
var/atom/A = V
if(A.level >= affecting_level)
+4 -2
View File
@@ -48,9 +48,11 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
return ..()
/turf/simulated/floor/ex_act(severity, target)
..()
if(is_shielded())
if(severity != 1 && is_shielded() && target != src)
..()
return
else
..()
if(target == src)
src.ChangeTurf(src.baseturf)
if(target != null)