From c172578fda4775989c9ee7eb885c71bd07b6fa72 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Fri, 7 Jul 2017 07:48:55 -0400 Subject: [PATCH 1/7] Ups the intergrity of reinforced plasma windows They need to be SME-worthy --- code/game/objects/structures/window.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index f4dd4089918..941b623ae0f 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -496,7 +496,7 @@ icon = 'icons/obj/smooth_structures/rplasma_window.dmi' icon_state = "rplasmawindow" dir = FULLTILE_WINDOW_DIR - max_integrity = 120 + max_integrity = 250 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE From 30c00659a9b5b7001ab42e7f7c835b0ee636ae2a Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Fri, 7 Jul 2017 07:56:23 -0400 Subject: [PATCH 2/7] Update window.dm --- code/game/objects/structures/window.dm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 941b623ae0f..904c4e41498 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -420,6 +420,7 @@ heat_resistance = 1600 armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) max_integrity = 50 + obj_integrity = 50 explosion_block = 1 glass_type = /obj/item/stack/sheet/rglass @@ -433,7 +434,8 @@ reinf = FALSE heat_resistance = 25000 armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 00, "acid" = 100) - max_integrity = 50 + max_integrity = 95 + obj_integrity = 95 explosion_block = 1 glass_type = /obj/item/stack/sheet/glass/plasma @@ -447,7 +449,8 @@ reinf = TRUE heat_resistance = 50000 armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100) - max_integrity = 100 + max_integrity = 200 + obj_integrity = 200 explosion_block = 2 glass_type = /obj/item/stack/sheet/rglass/plasma @@ -469,6 +472,7 @@ icon_state = "window" dir = FULLTILE_WINDOW_DIR max_integrity = 50 + obj_integrity = 50 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE @@ -482,7 +486,8 @@ icon = 'icons/obj/smooth_structures/plasma_window.dmi' icon_state = "plasmawindow" dir = FULLTILE_WINDOW_DIR - max_integrity = 60 + max_integrity = 100 + obj_integrity = 60 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE @@ -497,6 +502,7 @@ icon_state = "rplasmawindow" dir = FULLTILE_WINDOW_DIR max_integrity = 250 + obj_integrity = 250 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE @@ -510,6 +516,7 @@ icon_state = "r_window" dir = FULLTILE_WINDOW_DIR max_integrity = 100 + obj_integrity = 100 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE From 70f1f9a40d0a05f9639539364aa76a00ac73ce9e Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Fri, 7 Jul 2017 08:22:33 -0400 Subject: [PATCH 3/7] Update window.dm --- code/game/objects/structures/window.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 904c4e41498..33b70f69075 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -501,8 +501,8 @@ icon = 'icons/obj/smooth_structures/rplasma_window.dmi' icon_state = "rplasmawindow" dir = FULLTILE_WINDOW_DIR - max_integrity = 250 - obj_integrity = 250 + max_integrity = 500 + obj_integrity = 500 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE From 289567a2f13c5efe4ed6cb6b0558f9e336f89847 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Fri, 7 Jul 2017 08:30:04 -0400 Subject: [PATCH 4/7] Update window.dm --- code/game/objects/structures/window.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 33b70f69075..bd21df60c0a 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -487,7 +487,7 @@ icon_state = "plasmawindow" dir = FULLTILE_WINDOW_DIR max_integrity = 100 - obj_integrity = 60 + obj_integrity = 100 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE From f97f0afa7fb86e536c803e4ebc9006d2c80d9cce Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Fri, 7 Jul 2017 09:18:54 -0400 Subject: [PATCH 5/7] Update window.dm --- code/game/objects/structures/window.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index bd21df60c0a..c6b604144cb 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -420,7 +420,6 @@ heat_resistance = 1600 armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100) max_integrity = 50 - obj_integrity = 50 explosion_block = 1 glass_type = /obj/item/stack/sheet/rglass @@ -435,7 +434,6 @@ heat_resistance = 25000 armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 00, "acid" = 100) max_integrity = 95 - obj_integrity = 95 explosion_block = 1 glass_type = /obj/item/stack/sheet/glass/plasma @@ -450,7 +448,6 @@ heat_resistance = 50000 armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100) max_integrity = 200 - obj_integrity = 200 explosion_block = 2 glass_type = /obj/item/stack/sheet/rglass/plasma @@ -472,7 +469,6 @@ icon_state = "window" dir = FULLTILE_WINDOW_DIR max_integrity = 50 - obj_integrity = 50 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE @@ -487,7 +483,6 @@ icon_state = "plasmawindow" dir = FULLTILE_WINDOW_DIR max_integrity = 100 - obj_integrity = 100 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE @@ -502,7 +497,6 @@ icon_state = "rplasmawindow" dir = FULLTILE_WINDOW_DIR max_integrity = 500 - obj_integrity = 500 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE @@ -516,7 +510,6 @@ icon_state = "r_window" dir = FULLTILE_WINDOW_DIR max_integrity = 100 - obj_integrity = 100 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE From cdde74d82bc0aaa06d43924a1a5865335f849d5f Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Fri, 7 Jul 2017 14:16:03 -0400 Subject: [PATCH 6/7] Update window.dm --- code/game/objects/structures/window.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index c6b604144cb..b01d600d8e7 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -433,7 +433,7 @@ reinf = FALSE heat_resistance = 25000 armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 00, "acid" = 100) - max_integrity = 95 + max_integrity = 150 explosion_block = 1 glass_type = /obj/item/stack/sheet/glass/plasma @@ -447,7 +447,7 @@ reinf = TRUE heat_resistance = 50000 armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100) - max_integrity = 200 + max_integrity = 1000 explosion_block = 2 glass_type = /obj/item/stack/sheet/rglass/plasma From 6c31809bf09fc12182f3f4c2e77949c30a9effbd Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Fri, 7 Jul 2017 15:11:53 -0400 Subject: [PATCH 7/7] Update window.dm --- code/game/objects/structures/window.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index b01d600d8e7..16d30b50807 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -447,7 +447,7 @@ reinf = TRUE heat_resistance = 50000 armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100) - max_integrity = 1000 + max_integrity = 500 explosion_block = 2 glass_type = /obj/item/stack/sheet/rglass/plasma @@ -496,7 +496,7 @@ icon = 'icons/obj/smooth_structures/rplasma_window.dmi' icon_state = "rplasmawindow" dir = FULLTILE_WINDOW_DIR - max_integrity = 500 + max_integrity = 1000 fulltile = TRUE flags = PREVENT_CLICK_UNDER smooth = SMOOTH_TRUE