Map Tweaks: SCC Scout, Civ Yacht; Shuttle Window Spawners (#18696)

* hngf

* hgmntyhgm

* f

* tttt

* f

* c

* w

* a

* y

* rrrr

* a

* a

* a

---------

Co-authored-by: DreamySkrell <>

code/modules/effects/map_effects/window_spawner.dm

@@ -1,19 +1,28 @@
-//
-// Window Spawner
-//
+
+// ----------------------------------- window spawner base
+
 /obj/effect/map_effect/window_spawner
 	name = "window spawner"
 	icon = 'icons/effects/map_effects.dmi'
+	atmos_canpass = CANPASS_NEVER
+
 	var/window_path = /obj/structure/window/basic
 	var/frame_path = /obj/structure/window_frame
 	var/grille_path = /obj/structure/grille/over
 	var/firedoor_path = /obj/machinery/door/firedoor
-	var/single_window = FALSE // For full window panes and full windows.
-	var/spawn_frame = FALSE // For full windows.
-	var/spawn_grille = FALSE // For electrified windows.
+
+	/// For full window panes and full windows
+	var/single_window = FALSE
+	/// For full windows
+	var/spawn_frame = FALSE
+	/// For electrified windows
+	var/spawn_grille = FALSE
 	var/spawn_firedoor = FALSE
+
+	/// If not null, sets frame to this color
+	var/frame_color = null
+
 	var/activated
-	atmos_canpass = CANPASS_NEVER
 
 /obj/effect/map_effect/window_spawner/CanPass() // Stops ZAS expanding zones past us, the windows will block the zone anyway.
 	return FALSE
@@ -41,7 +50,9 @@
 	if(activated)
 		return
 	if(spawn_frame)
-		new frame_path(loc)
+		var/obj/frame = new frame_path(loc)
+		if(istype(frame) && frame_color)
+			frame.color = frame_color
 	if(spawn_grille)
 		new grille_path(loc)
 	if(spawn_firedoor)
@@ -78,7 +89,8 @@
 /obj/effect/map_effect/window_spawner/proc/handle_grille_spawn(var/obj/structure/grille/G)
 	return
 
-/********** Quarter Windows **********/
+// ----------------------------------- old quarter windows subtypes
+
 /obj/effect/map_effect/window_spawner/basic
 	name = "window grille spawner"
 	icon_state = "window-g"
@@ -128,7 +140,8 @@
 	if(id)
 		W.id = id
 
-/********** Full Windows **********/
+// ----------------------------------- windows subtypes
+
 // Window
 /obj/effect/map_effect/window_spawner/full // Unused.
 	name = "unused"
@@ -215,3 +228,16 @@
 	icon_state = "full_rwindow"
 	frame_path = /obj/structure/window_frame/wood
 	window_path = /obj/structure/window/full/reinforced
+
+/obj/effect/map_effect/window_spawner/full/shuttle
+	name = "full reinforced window spawner"
+	icon_state = "full_rwindow_shuttle"
+	window_path = /obj/structure/window/full/reinforced
+
+/obj/effect/map_effect/window_spawner/full/shuttle/scc
+	icon_state = "full_rwindow_shuttle_scc"
+	frame_color = "#AAAFC7"
+
+/obj/effect/map_effect/window_spawner/full/shuttle/mercenary
+	icon_state = "full_rwindow_shuttle_merc"
+	frame_color = "#5B5B5B"