diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 14e15de246..0404d3f09b 100644 --- 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 index ae40be1472..53be33959e 100644 --- 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/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index 31eec7604a..54f2185fe8 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 2394301f40..45f97ccde4 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/turf/walls/ice_colony/shiva_windows.dmi b/icons/turf/walls/ice_colony/shiva_windows.dmi index 2e65944a09..998900bbfc 100644 Binary files a/icons/turf/walls/ice_colony/shiva_windows.dmi and b/icons/turf/walls/ice_colony/shiva_windows.dmi differ