shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6157 from Citadel-Station-13/upstream-merge-36723

Browse Source 
[MIRROR] Corrects plasma window armor inconsistency
This commit is contained in:
LetterJay
2018-03-31 06:18:48 -05:00
committed by GitHub
parent f61c73d486 6bec5afb1f
commit e35ddc7093
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/window.dm
+1 -1
View File
@@ -415,7 +415,7 @@
icon_state = "plasmawindow"
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)
armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
max_integrity = 150
explosion_block = 1
glass_type = /obj/item/stack/sheet/plasmaglass