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

Fixes plasma glass merging with normal glass

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-08 09:45:46 -05:00
parent 2e4624ee3f
commit 2d84e09851
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/window.dm
+2 -2
View File
@@ -434,7 +434,7 @@
armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 00, "acid" = 100)
max_integrity = 50
explosion_block = 1
glass_type = /obj/item/stack/sheet/glass/plasma
glass_type = /obj/item/stack/sheet/plasmaglass
/obj/structure/window/plasma/unanchored
anchored = FALSE
@@ -448,7 +448,7 @@
armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
max_integrity = 100
explosion_block = 2
glass_type = /obj/item/stack/sheet/rglass/plasma
glass_type = /obj/item/stack/sheet/plasmarglass
/obj/structure/window/plasma/reinforced/unanchored
anchored = FALSE