diff --git a/_maps/map_files/shuttles/emergency_cherenkov.dmm b/_maps/map_files/shuttles/emergency_cherenkov.dmm index 3a00fcedc7d..12ad66cfb4c 100644 --- a/_maps/map_files/shuttles/emergency_cherenkov.dmm +++ b/_maps/map_files/shuttles/emergency_cherenkov.dmm @@ -42,7 +42,7 @@ /turf/simulated/floor/pod/dark, /area/shuttle/escape) "aI" = ( -/obj/effect/spawner/window/plastitanium, +/obj/effect/spawner/window/plastitanium/rad_protect, /turf/simulated/floor/plating, /area/shuttle/escape) "bf" = ( @@ -278,10 +278,10 @@ /turf/simulated/floor/catwalk, /area/shuttle/escape) "iu" = ( -/obj/effect/spawner/window/plastitanium, /obj/structure/disposalpipe/segment/corner{ dir = 4 }, +/obj/effect/spawner/window/plastitanium/rad_protect, /turf/simulated/floor/plating, /area/shuttle/escape) "iO" = ( @@ -523,8 +523,8 @@ /turf/simulated/floor/engine, /area/shuttle/escape) "ov" = ( -/obj/effect/spawner/window/plastitanium, /obj/structure/sign/greencross, +/obj/effect/spawner/window/plastitanium/rad_protect, /turf/simulated/floor/plating, /area/shuttle/escape) "oU" = ( @@ -607,10 +607,10 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/escape) "tj" = ( -/obj/effect/spawner/window/plastitanium, /obj/structure/cable{ icon_state = "0-8" }, +/obj/effect/spawner/window/plastitanium/rad_protect, /turf/simulated/floor/plating, /area/shuttle/escape) "tT" = ( @@ -796,7 +796,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/shuttle/escape) "zl" = ( -/obj/effect/spawner/window/plastitanium, +/obj/effect/spawner/window/plastitanium/rad_protect, /obj/structure/sign/radiation/rad_area, /turf/simulated/floor/plating, /area/shuttle/escape) @@ -1035,10 +1035,10 @@ /turf/simulated/floor/pod/dark, /area/shuttle/escape) "Id" = ( -/obj/effect/spawner/window/plastitanium, /obj/structure/cable{ icon_state = "0-4" }, +/obj/effect/spawner/window/plastitanium/rad_protect, /turf/simulated/floor/plating, /area/shuttle/escape) "Ir" = ( @@ -1396,10 +1396,10 @@ /turf/simulated/floor/plating/airless, /area/shuttle/escape) "Td" = ( -/obj/effect/spawner/window/plastitanium, /obj/structure/cable{ icon_state = "0-2" }, +/obj/effect/spawner/window/plastitanium/rad_protect, /turf/simulated/floor/plating, /area/shuttle/escape) "TR" = ( @@ -1410,8 +1410,8 @@ /turf/simulated/floor/mineral/plastitanium/red/brig, /area/shuttle/escape) "TX" = ( -/obj/effect/spawner/window/plastitanium, /obj/structure/disposalpipe/segment/corner, +/obj/effect/spawner/window/plastitanium/rad_protect, /turf/simulated/floor/plating, /area/shuttle/escape) "Uh" = ( diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm index 40a830c1529..9f8ea753b9b 100644 --- a/code/game/objects/effects/spawners/windowspawner.dm +++ b/code/game/objects/effects/spawners/windowspawner.dm @@ -127,3 +127,9 @@ icon_state = "plastitaniumwindow_spawner" window_to_spawn_full = /obj/structure/window/full/plastitanium useGrille = TRUE + +/obj/effect/spawner/window/plastitanium/rad_protect + name = "leaded plastitanium window spawner" + icon_state = "leaded_plastitaniumwindow_spawner" + window_to_spawn_full = /obj/structure/window/full/plastitanium/rad_protect + useGrille = TRUE diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 80a217af233..c1cbaec649d 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -827,6 +827,14 @@ rad_insulation_gamma = RAD_GAMMA_FULL_WINDOW rad_conversion_amount = 3 +/obj/structure/window/full/plastitanium/rad_protect + name = "leaded plastitanium window" + desc = "An evil looking window of plasma and titanium. It has been infused with lead and offers exceptional radiation resistance." + flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 + rad_insulation_beta = RAD_BETA_BLOCKER + rad_insulation_gamma = RAD_VERY_EXTREME_INSULATION + rad_conversion_amount = 0 + /obj/structure/window/reinforced/clockwork name = "brass window" desc = "A paper-thin pane of translucent yet reinforced brass." diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index df3e17a26ac..97a0dc40a65 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ