Merge pull request #11389 from PsiOmegaDelta/152710-MagicCrescentWindows

Crescent windows are now near indestructible.
This commit is contained in:
Chinsky
2015-11-02 00:08:52 +03:00
2 changed files with 18 additions and 7 deletions
+17 -1
View File
@@ -293,7 +293,7 @@
if(usr.incapacitated())
return 0
if(anchored)
usr << "It is fastened to the floor therefore you can't rotate it!"
return 0
@@ -491,7 +491,23 @@
animate(src, color="#222222", time=5)
set_opacity(1)
/obj/structure/window/reinforced/crescent/attack_hand()
return
/obj/structure/window/reinforced/crescent/attackby()
return
/obj/structure/window/reinforced/crescent/ex_act()
return
/obj/structure/window/reinforced/crescent/hitby()
return
/obj/structure/window/reinforced/crescent/take_damage()
return
/obj/structure/window/reinforced/crescent/shatter()
return
/obj/machinery/button/windowtint
name = "window tint control"
@@ -70,12 +70,7 @@
/obj/effect/wingrille_spawn/reinforced/crescent
name = "Crescent window grille spawner"
icon_state = "r-wingrille"
win_path = /obj/structure/window/reinforced
/obj/effect/wingrille_spawn/reinforced/crescent/handle_window_spawn(var/obj/structure/window/W)
W.maxhealth = 1000000
W.health = 1000000
win_path = /obj/structure/window/reinforced/crescent
/obj/effect/wingrille_spawn/phoron
name = "phoron window grille spawner"