Windowgrille Spawner Tweak (#10348)

code/game/objects/structures/grille.dm

@@ -261,3 +261,21 @@
 	if(air_group)
 		return 0 //Make sure air doesn't drain
 	..()
+
+/obj/structure/grille/crescent/attack_hand()
+	return
+
+/obj/structure/grille/crescent/attackby()
+	return
+
+/obj/structure/grille/crescent/attack_generic()
+	return
+
+/obj/structure/grille/crescent/ex_act(var/severity = 2.0)
+	return
+
+/obj/structure/grille/crescent/hitby()
+	return
+
+/obj/structure/grille/crescent/bullet_act()
+	return

code/game/objects/structures/window_spawner.dm

@@ -1,96 +0,0 @@
-// Ported from Haine and WrongEnd with much gratitude!
-/* ._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._. */
-/*-=-=-=-=-=-=-=-=-=-=-=-=-=WHAT-EVER=-=-=-=-=-=-=-=-=-=-=-=-=-*/
-/* '~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~'-._.-'~' */
-
-/obj/effect/wingrille_spawn
-	name = "window grille spawner"
-	icon = 'icons/obj/structures.dmi'
-	icon_state = "wingrille"
-	density = 1
-	anchored = 1.0
-	var/win_path = /obj/structure/window/basic
-	var/activated
-
-// stops ZAS expanding zones past us, the windows will block the zone anyway
-/obj/effect/wingrille_spawn/CanPass()
-	return 0
-
-/obj/effect/wingrille_spawn/attack_hand()
-	attack_generic()
-
-/obj/effect/wingrille_spawn/attack_ghost()
-	attack_generic()
-
-/obj/effect/wingrille_spawn/attack_generic()
-	activate()
-
-/obj/effect/wingrille_spawn/Initialize(mapload)
-	if (!win_path)
-		return INITIALIZE_HINT_QDEL
-
-	..()
-
-	activate()
-
-	return INITIALIZE_HINT_LATEQDEL
-
-/obj/effect/wingrille_spawn/proc/activate()
-	if(activated) return
-	if (!locate(/obj/structure/grille) in get_turf(src))
-		var/obj/structure/grille/G = new /obj/structure/grille(src.loc)
-		handle_grille_spawn(G)
-	var/list/neighbours = list()
-	for (var/dir in cardinal)
-		var/turf/T = get_step(src, dir)
-		var/obj/effect/wingrille_spawn/other = locate(/obj/effect/wingrille_spawn) in T
-		if(!other)
-			var/found_connection
-			if(locate(/obj/structure/grille) in T)
-				for(var/obj/structure/window/W in T)
-					if(W.type == win_path && W.dir == get_dir(T,src))
-						found_connection = 1
-						qdel(W)
-			if(!found_connection)
-				var/obj/structure/window/new_win = new win_path(src.loc)
-				new_win.set_dir(dir)
-				handle_window_spawn(new_win)
-		else
-			neighbours |= other
-	activated = 1
-
-/obj/effect/wingrille_spawn/proc/handle_window_spawn(var/obj/structure/window/W)
-	return
-
-// Currently unused, could be useful for pre-wired electrified windows.
-/obj/effect/wingrille_spawn/proc/handle_grille_spawn(var/obj/structure/grille/G)
-	return
-
-/obj/effect/wingrille_spawn/reinforced
-	name = "reinforced window grille spawner"
-	icon_state = "r-wingrille"
-	win_path = /obj/structure/window/reinforced
-
-/obj/effect/wingrille_spawn/reinforced/crescent
-	name = "Crescent window grille spawner"
-	win_path = /obj/structure/window/reinforced/crescent
-
-/obj/effect/wingrille_spawn/phoron
-	name = "phoron window grille spawner"
-	icon_state = "p-wingrille"
-	win_path = /obj/structure/window/phoronbasic
-
-/obj/effect/wingrille_spawn/reinforced_phoron
-	name = "reinforced phoron window grille spawner"
-	icon_state = "pr-wingrille"
-	win_path = /obj/structure/window/phoronreinforced
-
-/obj/effect/wingrille_spawn/reinforced/polarized
-	name = "polarized window grille spawner"
-	color = "#444444"
-	win_path = /obj/structure/window/reinforced/polarized
-	var/id
-
-/obj/effect/wingrille_spawn/reinforced/polarized/handle_window_spawn(var/obj/structure/window/reinforced/polarized/P)
-	if(id)
-		P.id = id