diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 25113a87ed4..ad57f5658d4 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -20,8 +20,8 @@ GLOBAL_LIST_INIT(glass_recipes, list ( new /datum/stack_recipe("fishbowl", /obj/machinery/fishtank/bowl, 1, time = 1 SECONDS), )), new /datum/stack_recipe("glass shard", /obj/item/shard, time = 0 SECONDS), - new /datum/stack_recipe/window("directional window", /obj/structure/window/basic, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), - new /datum/stack_recipe/window("fulltile window", /obj/structure/window/full/basic, 2, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), + new /datum/stack_recipe/window("directional window", /obj/structure/window/basic, time = 1 SECONDS, on_floor = TRUE, window_checks = TRUE), + new /datum/stack_recipe/window("fulltile window", /obj/structure/window/full/basic, 2, time = 2 SECONDS, on_floor = TRUE, window_checks = TRUE), new /datum/stack_recipe("glass ashtray", /obj/item/ashtray/glass, 1, time = 1 SECONDS), new /datum/stack_recipe("dropper", /obj/item/reagent_containers/dropper, 1, time = 1 SECONDS), )) @@ -99,11 +99,11 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( new /datum/stack_recipe("glass shard", /obj/item/shard, time = 0 SECONDS), new /datum/stack_recipe/window("windoor frame", /obj/structure/windoor_assembly, 5, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), null, - new /datum/stack_recipe/window("directional reinforced window", /obj/structure/window/reinforced, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), - new /datum/stack_recipe/window("fulltile reinforced window", /obj/structure/window/full/reinforced, 2, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), + new /datum/stack_recipe/window("directional reinforced window", /obj/structure/window/reinforced, time = 1 SECONDS, on_floor = TRUE, window_checks = TRUE), + new /datum/stack_recipe/window("fulltile reinforced window", /obj/structure/window/full/reinforced, 2, time = 2 SECONDS, on_floor = TRUE, window_checks = TRUE), null, - new /datum/stack_recipe/window("directional electrochromic window", /obj/structure/window/reinforced/polarized, 2, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), - new /datum/stack_recipe/window("fulltile electrochromic window", /obj/structure/window/full/reinforced/polarized, 4, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE) + new /datum/stack_recipe/window("directional electrochromic window", /obj/structure/window/reinforced/polarized, 2, time = 1 SECONDS, on_floor = TRUE, window_checks = TRUE), + new /datum/stack_recipe/window("fulltile electrochromic window", /obj/structure/window/full/reinforced/polarized, 4, time = 2 SECONDS, on_floor = TRUE, window_checks = TRUE) )) /obj/item/stack/sheet/rglass @@ -134,8 +134,8 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( GLOBAL_LIST_INIT(pglass_recipes, list ( new /datum/stack_recipe("plasma shard", /obj/item/shard/plasma, time = 0 SECONDS), - new /datum/stack_recipe/window("directional window", /obj/structure/window/plasmabasic, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), - new /datum/stack_recipe/window("fulltile window", /obj/structure/window/full/plasmabasic, 2, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE) + new /datum/stack_recipe/window("directional window", /obj/structure/window/plasmabasic, time = 2 SECONDS, on_floor = TRUE, window_checks = TRUE), + new /datum/stack_recipe/window("fulltile window", /obj/structure/window/full/plasmabasic, 2, time = 4 SECONDS, on_floor = TRUE, window_checks = TRUE) )) /obj/item/stack/sheet/rglass/cyborg @@ -208,8 +208,8 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( GLOBAL_LIST_INIT(prglass_recipes, list ( new /datum/stack_recipe("plasma shard", /obj/item/shard/plasma, time = 0 SECONDS), - new /datum/stack_recipe/window("directional reinforced window", /obj/structure/window/plasmareinforced, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), - new /datum/stack_recipe/window("fulltile reinforced window", /obj/structure/window/full/plasmareinforced, 2, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE) + new /datum/stack_recipe/window("directional reinforced window", /obj/structure/window/plasmareinforced, time = 2 SECONDS, on_floor = TRUE, window_checks = TRUE), + new /datum/stack_recipe/window("fulltile reinforced window", /obj/structure/window/full/plasmareinforced, 2, time = 4 SECONDS, on_floor = TRUE, window_checks = TRUE) )) /obj/item/stack/sheet/plasmarglass @@ -244,7 +244,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( recipes = GLOB.prglass_recipes GLOBAL_LIST_INIT(titaniumglass_recipes, list( - new /datum/stack_recipe/window("shuttle window", /obj/structure/window/full/shuttle, 2, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE) + new /datum/stack_recipe/window("shuttle window", /obj/structure/window/full/shuttle, 2, time = 5 SECONDS, on_floor = TRUE, window_checks = TRUE) )) ////////////////////////////// @@ -277,8 +277,8 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list( GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( new /datum/stack_recipe("plastitanium shard", /obj/item/shard/plastitanium, time = 0 SECONDS), - new /datum/stack_recipe/window("directional plastitanium window", /obj/structure/window/plastitanium, 1, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), - new /datum/stack_recipe/window("fulltile plastitanium window", /obj/structure/window/full/plastitanium, 2, time = 0 SECONDS, on_floor = TRUE, window_checks = TRUE), + new /datum/stack_recipe/window("directional plastitanium window", /obj/structure/window/plastitanium, 1, time = 3 SECONDS, on_floor = TRUE, window_checks = TRUE), + new /datum/stack_recipe/window("fulltile plastitanium window", /obj/structure/window/full/plastitanium, 2, time = 5 SECONDS, on_floor = TRUE, window_checks = TRUE), )) ////////////////////////////// diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index f8a0030be41..1e38cb6a361 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -19,7 +19,7 @@ var/state = WINDOW_OUT_OF_FRAME var/reinf = FALSE var/heat_resistance = 800 - var/decon_speed = null + var/decon_speed = 2 SECONDS var/fulltile = FALSE var/shardtype = /obj/item/shard var/glass_decal = /obj/effect/decal/cleanable/glass @@ -80,9 +80,6 @@ if(fulltile) setDir() - if(decon_speed == null && fulltile) - decon_speed = 2 SECONDS - //windows only block while reinforced and fulltile, so we'll use the proc real_explosion_block = explosion_block explosion_block = EXPLOSION_BLOCK_PROC @@ -534,7 +531,7 @@ if(barricaded) to_chat(user, SPAN_WARNING("[src] is already barricaded!")) return - + if(used.get_amount() < 2) to_chat(user, SPAN_WARNING("You need at least two planks of wood to barricade [src]!")) return @@ -546,7 +543,7 @@ to_chat(user, SPAN_NOTICE("You begin boarding up [src]...")) if(!do_after_once(user, 4 SECONDS, target = src)) return - + /// Quick checks to make sure nothing has changed during the timer. if(!density || barricaded) return @@ -699,6 +696,7 @@ heat_resistance = 32000 max_integrity = 150 explosion_block = 1 + decon_speed = 3 SECONDS armor = list(MELEE = 75, BULLET = 5, LASER = 0, ENERGY = 0, BOMB = 45, RAD = 100, FIRE = 99, ACID = 100) rad_insulation_beta = RAD_NO_INSULATION rad_insulation_gamma = RAD_GAMMA_WINDOW @@ -716,6 +714,7 @@ heat_resistance = 32000 max_integrity = 500 explosion_block = 2 + decon_speed = 5 SECONDS armor = list(MELEE = 85, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 60, RAD = 100, FIRE = 99, ACID = 100) rad_insulation_beta = RAD_NO_INSULATION rad_insulation_gamma = RAD_GAMMA_WINDOW @@ -735,6 +734,7 @@ heat_resistance = 32000 max_integrity = 600 explosion_block = 2 + decon_speed = 7 SECONDS armor = list(MELEE = 85, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 60, RAD = 100, FIRE = 99, ACID = 100) rad_insulation_beta = RAD_NO_INSULATION rad_insulation_gamma = RAD_GAMMA_WINDOW @@ -790,6 +790,7 @@ heat_resistance = 32000 max_integrity = 300 explosion_block = 1 + decon_speed = 3 SECONDS armor = list(MELEE = 75, BULLET = 5, LASER = 0, ENERGY = 0, BOMB = 45, RAD = 100, FIRE = 99, ACID = 100) edge_overlay_file = 'icons/obj/smooth_structures/windows/window_edges.dmi' env_smash_level = ENVIRONMENT_SMASH_WALLS // these windows are a fair bit tougher @@ -811,6 +812,7 @@ heat_resistance = 32000 max_integrity = 1000 explosion_block = 2 + decon_speed = 5 SECONDS armor = list(MELEE = 85, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 60, RAD = 100, FIRE = 99, ACID = 100) edge_overlay_file = 'icons/obj/smooth_structures/windows/reinforced_window_edges.dmi' env_smash_level = ENVIRONMENT_SMASH_RWALLS // these ones are insanely tough @@ -861,6 +863,7 @@ reinf = TRUE heat_resistance = 1600 explosion_block = 3 + decon_speed = 6 SECONDS armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, RAD = 100, FIRE = 80, ACID = 100) smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE, SMOOTH_GROUP_TITANIUM_WALLS) canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE, SMOOTH_GROUP_TITANIUM_WALLS) @@ -884,6 +887,7 @@ max_integrity = 1200 reinf = TRUE heat_resistance = 32000 + decon_speed = 7 SECONDS armor = list(MELEE = 85, BULLET = 20, LASER = 0, ENERGY = 0, BOMB = 60, RAD = 100, FIRE = 99, ACID = 100) explosion_block = 3 glass_type = /obj/item/stack/sheet/plastitaniumglass