diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 231f4c6be60..9c487ab018d 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -140,8 +140,7 @@ /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/chemistry) "at" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/poddoor{ id_tag = "lavalandsyndi_chemistry" }, @@ -959,8 +958,7 @@ /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/engineering) "bB" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4; level = 2 @@ -1080,8 +1078,7 @@ /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/engineering) "bP" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_lava_base/engineering) @@ -1593,8 +1590,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_lava_base/testlab) "dS" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id_tag = "lavalandsyndi"; @@ -1783,8 +1779,7 @@ /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/syndicate_lava_base/virology) "ek" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_lava_base/testlab) "el" = ( @@ -2068,8 +2063,7 @@ /turf/simulated/floor/mineral/plastitanium, /area/ruin/unpowered/syndicate_lava_base/cargo) "eF" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor{ id_tag = "lavalandsyndi_cargo" @@ -2094,8 +2088,7 @@ }, /area/ruin/unpowered/syndicate_lava_base/virology) "eI" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_lava_base/virology) "eJ" = ( @@ -2339,8 +2332,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_lava_base/cargo) "fa" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_lava_base/cargo) @@ -2503,8 +2495,7 @@ /turf/simulated/floor/plasteel/white, /area/ruin/unpowered/syndicate_lava_base/chemistry) "fn" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_lava_base/chemistry) @@ -3421,8 +3412,7 @@ /turf/simulated/floor/plasteel/white/side, /area/ruin/unpowered/syndicate_lava_base/virology) "hH" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/poddoor/preopen{ id_tag = "lavalandsyndi_virology" }, @@ -4378,8 +4368,7 @@ /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/engineering) "jx" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id_tag = "lavalandsyndi_bar" @@ -5044,8 +5033,7 @@ /turf/simulated/floor/plasteel, /area/ruin/unpowered/syndicate_lava_base/engineering) "kD" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_lava_base/engineering) "kG" = ( @@ -5724,8 +5712,7 @@ /turf/simulated/wall/mineral/plastitanium/explosive, /area/ruin/unpowered/syndicate_lava_base/telecomms) "mp" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id_tag = "lavalandsyndi_telecomms" @@ -5896,8 +5883,7 @@ /turf/simulated/wall/mineral/plastitanium/nodiagonal, /area/ruin/unpowered/syndicate_lava_base/arrivals) "mU" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_lava_base/bar) @@ -6659,8 +6645,7 @@ /turf/simulated/floor/plasteel/dark, /area/ruin/unpowered/syndicate_lava_base/telecomms) "ox" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor{ id_tag = "lavalandsyndi_arrivals" @@ -6703,8 +6688,7 @@ /turf/simulated/wall/mineral/plastitanium/explosive, /area/ruin/unpowered/syndicate_lava_base/engineering) "BF" = ( -/obj/structure/grille, -/obj/structure/window/plastitanium, +/obj/effect/spawner/window/plastitanium, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id_tag = "lavalandsyndi"; diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm index 1e81177c53f..1d498888588 100644 --- a/code/game/objects/effects/spawners/windowspawner.dm +++ b/code/game/objects/effects/spawners/windowspawner.dm @@ -41,13 +41,40 @@ window_to_spawn_regular = /obj/structure/window/reinforced window_to_spawn_full = /obj/structure/window/full/reinforced +/obj/effect/spawner/window/plasma + name = "plasma window spawner" + icon_state = "pwindow_spawner" + window_to_spawn_regular = /obj/structure/window/plasmabasic + window_to_spawn_full = /obj/structure/window/full/plasmabasic + /obj/effect/spawner/window/reinforced/plasma name = "reinforced plasma window spawner" - icon_state = "pwindow_spawner" + icon_state = "prwindow_spawner" window_to_spawn_regular = /obj/structure/window/plasmareinforced window_to_spawn_full = /obj/structure/window/full/plasmareinforced +/obj/effect/spawner/window/reinforced/tinted + name = "tinted reinforced window spawner" + icon_state = "twindow_spawner" + window_to_spawn_regular = /obj/structure/window/reinforced/tinted + window_to_spawn_full = /obj/structure/window/full/reinforced/tinted + /obj/effect/spawner/window/shuttle name = "shuttle window spawner" icon_state = "swindow_spawner" - window_to_spawn_full = /obj/structure/window/shuttle + window_to_spawn_full = /obj/structure/window/full/shuttle + +/obj/effect/spawner/window/shuttle/survival_pod + name = "pod window spawner" + icon_state = "podwindow_spawner" + window_to_spawn_full = /obj/structure/window/full/shuttle/survival_pod + +/obj/effect/spawner/window/plastitanium + name = "plastitanium window spawner" + icon_state = "plastitaniumwindow_spawner" + window_to_spawn_full = /obj/structure/window/full/plastitanium + +/obj/effect/spawner/window/ice + name = "ice window spawner" + icon_state = "icewindow_spawner" + window_to_spawn_full = /obj/structure/window/full/reinforced/ice diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 000ad2d225f..0e0bb55df85 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -191,7 +191,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list( ..() GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( - new/datum/stack_recipe/window("plastitanium window", /obj/structure/window/plastitanium, 2, time = 0, on_floor = TRUE, window_checks = TRUE) + new/datum/stack_recipe/window("plastitanium window", /obj/structure/window/full/plastitanium, 2, time = 0, on_floor = TRUE, window_checks = TRUE) )) /obj/item/stack/sheet/plastitaniumglass @@ -204,7 +204,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) resistance_flags = ACID_PROOF merge_type = /obj/item/stack/sheet/plastitaniumglass - full_window = /obj/structure/window/plastitanium + full_window = /obj/structure/window/full/plastitanium /obj/item/stack/sheet/plastitaniumglass/New(loc, amount) recipes = GLOB.plastitaniumglass_recipes diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index afdfdfbd6ef..d7f5470d91a 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -669,15 +669,12 @@ /obj/structure/window/full/shuttle/tinted opacity = TRUE -/obj/structure/window/plastitanium +/obj/structure/window/full/plastitanium name = "plastitanium window" desc = "An evil looking window of plasma and titanium." icon = 'icons/obj/smooth_structures/plastitanium_window.dmi' icon_state = "plastitanium_window" - dir = FULLTILE_WINDOW_DIR max_integrity = 100 - fulltile = TRUE - flags = PREVENT_CLICK_UNDER reinf = TRUE heat_resistance = 1600 armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) @@ -685,9 +682,7 @@ smooth = SMOOTH_TRUE canSmoothWith = null explosion_block = 3 - level = 3 glass_type = /obj/item/stack/sheet/plastitaniumglass - glass_amount = 2 /obj/structure/window/reinforced/clockwork name = "brass window" diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 0c7b836b322..615718bb834 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -70,23 +70,13 @@ //Pod turfs and objects //Window -/obj/structure/window/shuttle/survival_pod +/obj/structure/window/full/shuttle/survival_pod name = "pod window" icon = 'icons/obj/smooth_structures/pod_window.dmi' icon_state = "smooth" - dir = FULLTILE_WINDOW_DIR - max_integrity = 100 - fulltile = TRUE - flags = PREVENT_CLICK_UNDER - reinf = TRUE - heat_resistance = 1600 - armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) smooth = SMOOTH_MORE - canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod) - explosion_block = 3 - level = 3 glass_type = /obj/item/stack/sheet/titaniumglass - glass_amount = 2 + canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/full/shuttle/survival_pod) /obj/structure/window/reinforced/survival_pod name = "pod window" diff --git a/icons/obj/smooth_structures/clockwork_window.dmi b/icons/obj/smooth_structures/clockwork_window.dmi index 90309ac3d52..e326e93ce8d 100644 Binary files a/icons/obj/smooth_structures/clockwork_window.dmi and b/icons/obj/smooth_structures/clockwork_window.dmi differ diff --git a/icons/obj/smooth_structures/pod_window.dmi b/icons/obj/smooth_structures/pod_window.dmi index 0fe7501225c..643449e5335 100644 Binary files a/icons/obj/smooth_structures/pod_window.dmi and b/icons/obj/smooth_structures/pod_window.dmi differ diff --git a/icons/obj/smooth_structures/rice_window.dmi b/icons/obj/smooth_structures/rice_window.dmi index f5e7a6dd57a..5b3bebb2539 100644 Binary files a/icons/obj/smooth_structures/rice_window.dmi and b/icons/obj/smooth_structures/rice_window.dmi differ diff --git a/icons/obj/smooth_structures/tinted_window.dmi b/icons/obj/smooth_structures/tinted_window.dmi index be9affafeea..c0cffb23b88 100644 Binary files a/icons/obj/smooth_structures/tinted_window.dmi and b/icons/obj/smooth_structures/tinted_window.dmi differ diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi index 9bdcb4c3f7a..6621a04b939 100644 Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ