Merge branch 'project/ares/sprites' into project/ares/tm_holder

cmss13-devs · Feb 26, 2024 · 8d82a54 · 8d82a54
2 parents 3d048fb + 4456d6b
commit 8d82a54
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 3 deletions.
diff --git a/code/game/objects/structures/window.dm b/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"

diff --git a/code/game/objects/structures/window_frame.dm b/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."))

diff --git a/icons/aicore_tan/aiblastdoors_shutters.dmi b/icons/aicore_tan/aiblastdoors_shutters.dmi
diff --git a/icons/aicore_tan/aicore.dmi b/icons/aicore_tan/aicore.dmi
diff --git a/icons/aicore_tan/almayer_aicore.dmi b/icons/aicore_tan/almayer_aicore.dmi
diff --git a/icons/aicore_tan/almayer_aicore_white.dmi b/icons/aicore_tan/almayer_aicore_white.dmi
diff --git a/icons/aicore_white/aiblastdoors_shutters.dmi b/icons/aicore_white/aiblastdoors_shutters.dmi
diff --git a/icons/aicore_white/aicore.dmi b/icons/aicore_white/aicore.dmi
diff --git a/icons/aicore_white/almayer_aicore_white.dmi b/icons/aicore_white/almayer_aicore_white.dmi
diff --git a/icons/turf/walls/window_frames.dmi b/icons/turf/walls/window_frames.dmi
diff --git a/icons/turf/walls/windows.dmi b/icons/turf/walls/windows.dmi
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -77315,7 +77315,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" = (
@@ -120970,7 +120970,7 @@ oJR
 tFe
 asD
 xQV
-gBO
+qQS
 aqU
 aCZ
 dgg
@@ -121780,7 +121780,7 @@ mLE
 bUx
 mLE
 tmK
-gBO
+qQS
 aug
 avL
 aqU