cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Browse Source 
Conflicts:
	code/modules/reagents/reagent_containers/syringes.dm
This commit is contained in:
Markolie
2015-02-22 22:15:45 +01:00
parent 672305e034 59460d8567
commit 004b365110
7 changed files with 32 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/glass.dm
+1 -1
View File
@@ -337,7 +337,7 @@
icon_state = "sheet-plasmarglass"
g_amt = MINERAL_MATERIAL_AMOUNT * 2
m_amt = MINERAL_MATERIAL_AMOUNT / 2
origin_tech = "materials=4;plasma=2"
origin_tech = "materials=3;plasma=2"
var/created_window = /obj/structure/window/plasmareinforced
var/full_window = /obj/structure/window/full/plasmareinforced