cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 17:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/machinery/vending.dm
This commit is contained in:
PsiOmega
2015-04-10 15:25:34 +02:00
parent 05da117d10 4c44482dfc
commit 1ba8dcbca9
12 changed files with 1093 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/items/stacks/sheets/glass.dm
View File

@@ -161,6 +161,7 @@
singular_name = "reinforced glass sheet"
icon_state = "sheet-rglass"
charge_costs = list(500, 1000)
stacktype = /obj/item/stack/sheet/glass/reinforced
/*
* Phoron Glass sheets