Merge branch 'master' into folder-icon-update

cmss13-devs · Sep 24, 2024 · 9b8e748 · 9b8e748
2 parents bd9bf39 + 826a340
commit 9b8e748
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
@@ -817,6 +817,15 @@
 	health = 40
 	window_frame = /obj/structure/window_frame/shiva
 
+/obj/structure/window/framed/prefab
+	name = "poly-kevlon framed window"
+	icon = 'icons/turf/walls/ice_colony/shiva_windows.dmi'
+	icon_state = "prefab_window0"
+	basestate = "prefab_window"
+	desc = "A semi-transparent (not entirely opaque) pane of material set into a poly-kevlon frame. Very smashable."
+	health = 40
+	window_frame = /obj/structure/window_frame/prefab
+
 //Solaris windows
 
 /obj/structure/window/framed/solaris

diff --git a/code/game/objects/structures/window_frame.dm b/code/game/objects/structures/window_frame.dm
@@ -277,6 +277,12 @@
 	icon_state = "shiva_window0_frame"
 	basestate = "shiva_window"
 
+/obj/structure/window_frame/prefab
+	name = "poly-kevlon window frame"
+	icon = 'icons/turf/walls/ice_colony/shiva_windows.dmi'
+	icon_state = "prefab_window0_frame"
+	basestate = "prefab_window"
+
 //Solaris frames
 
 /obj/structure/window_frame/solaris

diff --git a/icons/turf/walls/ice_colony/shiva_windows.dmi b/icons/turf/walls/ice_colony/shiva_windows.dmi