Merge pull request #1945 from Citadel-Station-13/upstream-merge-29112

[MIRROR] Reinforced Plasma Glass is more SME-worthy
This commit is contained in:
LetterJay
2017-07-08 14:33:20 -05:00
committed by GitHub
+4 -4
View File
@@ -432,7 +432,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 = 50
max_integrity = 150
explosion_block = 1
glass_type = /obj/item/stack/sheet/glass/plasma
@@ -446,7 +446,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 = 100
max_integrity = 500
explosion_block = 2
glass_type = /obj/item/stack/sheet/rglass/plasma
@@ -481,7 +481,7 @@
icon = 'icons/obj/smooth_structures/plasma_window.dmi'
icon_state = "plasmawindow"
dir = FULLTILE_WINDOW_DIR
max_integrity = 60
max_integrity = 100
fulltile = TRUE
flags = PREVENT_CLICK_UNDER
smooth = SMOOTH_TRUE
@@ -495,7 +495,7 @@
icon = 'icons/obj/smooth_structures/rplasma_window.dmi'
icon_state = "rplasmawindow"
dir = FULLTILE_WINDOW_DIR
max_integrity = 120
max_integrity = 1000
fulltile = TRUE
flags = PREVENT_CLICK_UNDER
smooth = SMOOTH_TRUE