windows

code/game/objects/structures/window.dm

@@ -599,6 +599,34 @@
 	unacidable = TRUE
 	health = 1000000 //Failsafe, shouldn't matter
 
+/obj/structure/window/framed/almayer/aicore
+	icon_state = "ai_rwindow0"
+	basestate = "ai_rwindow"
+	window_frame = /obj/structure/window_frame/almayer/aicore
+
+/obj/structure/window/framed/almayer/aicore/hull
+	name = "hull window"
+	desc = "An ultra-reinforced window designed to keep research a secure area. This one was made out of exotic materials to prevent hull breaches. No way to get through here."
+	not_damageable = TRUE
+	not_deconstructable = TRUE
+	unslashable = TRUE
+	unacidable = TRUE
+	health = 1000000 //Failsafe, shouldn't matter
+
+/obj/structure/window/framed/almayer/aicore/white
+	icon_state = "w_ai_rwindow0"
+	basestate = "w_ai_rwindow"
+	window_frame = /obj/structure/window_frame/almayer/aicore/white
+
+/obj/structure/window/framed/almayer/aicore/white/hull
+	name = "hull window"
+	desc = "An ultra-reinforced window designed to keep research a secure area. This one was made out of exotic materials to prevent hull breaches. No way to get through here."
+	not_damageable = TRUE
+	not_deconstructable = TRUE
+	unslashable = TRUE
+	unacidable = TRUE
+	health = 1000000 //Failsafe, shouldn't matter
+
 /obj/structure/window/framed/colony
 	name = "window"
 	icon_state = "col_window0"

code/game/objects/structures/window_frame.dm

@@ -174,6 +174,16 @@
 	basestate = "white_window"
 	window_type = /obj/structure/window/framed/almayer/white
 
+/obj/structure/window_frame/almayer/aicore
+	icon_state = "ai_window0_frame"
+	basestate = "ai_window"
+	window_type = /obj/structure/window/framed/almayer/aicore
+
+/obj/structure/window_frame/almayer/aicore/white
+	icon_state = "w_ai_window0_frame"
+	basestate = "w_ai_window"
+	window_type = /obj/structure/window/framed/almayer/aicore/white
+
 /obj/structure/window_frame/almayer/requisitions/attackby(obj/item/W, mob/living/user)
 	if(istype(W, sheet_type))
 		to_chat(user, SPAN_WARNING("You can't repair this window."))

maps/map_files/USS_Almayer/USS_Almayer.dmm

@@ -62225,9 +62225,6 @@
 	icon_state = "dark_sterile"
 	},
 /area/almayer/engineering/upper_engineering/port)
-"rna" = (
-/turf/closed/wall/almayer/aicore,
-/area/almayer/command/airoom)
 "rng" = (
 /turf/closed/wall/almayer,
 /area/almayer/maint/hull/lower/l_m_p)
@@ -77296,7 +77293,7 @@
 /turf/open/floor/plating/plating_catwalk,
 /area/almayer/hallways/upper/stern_hallway)
 "wnh" = (
-/obj/structure/window/framed/almayer/white/hull,
+/obj/structure/window/framed/almayer/aicore/hull,
 /turf/open/floor/plating,
 /area/almayer/command/airoom)
 "wnw" = (
@@ -120951,7 +120948,7 @@ oJR
 tFe
 asD
 xQV
-gBO
+qQS
 aqU
 aCZ
 dgg
@@ -121761,7 +121758,7 @@ mLE
 bUx
 mLE
 tmK
-gBO
+qQS
 aug
 avL
 aqU
@@ -140286,8 +140283,8 @@ daz
 daz
 kfU
 daz
-rna
-rna
+ebN
+ebN
 lnS
 uVv
 yit
@@ -140490,8 +140487,8 @@ daz
 daz
 daz
 sGZ
-rna
-rna
+ebN
+ebN
 roH
 ebN
 ebN
@@ -141302,8 +141299,8 @@ daz
 daz
 daz
 tHu
-rna
-rna
+ebN
+ebN
 gXs
 ebN
 ebN
@@ -141504,8 +141501,8 @@ daz
 daz
 sTV
 daz
-rna
-rna
+ebN
+ebN
 gbg
 uVv
 yit