diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 440cc6a8a2..87895d3950 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -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" diff --git a/code/game/objects/structures/window_spawner.dm b/code/game/objects/structures/window_spawner.dm index 449001492b..96f375d9e5 100644 --- a/code/game/objects/structures/window_spawner.dm +++ b/code/game/objects/structures/window_spawner.dm @@ -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"