cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-19 11:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609

Browse Source 
# Conflicts:
#	code/_macros.dm
#	code/controllers/master_controller.dm
#	vorestation.dme
This commit is contained in:
Leshana
2017-06-09 22:54:16 -04:00
parent 4c3993df65 03dae14050
commit 69a50ec225
42 changed files with 1914 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/window.dm
+5
View File
@@ -472,6 +472,11 @@
if (constructed)
state = 0
/obj/structure/window/reinforced/full
dir = 5
icon_state = "fwindow"
maxhealth = 60
/obj/structure/window/reinforced/tinted
name = "tinted window"
desc = "It looks rather strong and opaque. Might take a few good hits to shatter it."