cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

Browse Source 
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
This commit is contained in:
Miniature
2011-12-07 07:53:20 +10:30
parent 5fec6c6319 df04d75c48
commit af301633f6
72 changed files with 750 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/mining/machine_processing.dm
View File

@@ -254,6 +254,13 @@
else
on = 0
continue
if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_adamantine == 0)
if (ore_glass > 0)
ore_glass--;
new /obj/item/stack/sheet/rglass(output.loc)
else
on = 0
continue
if (selected_glass == 0 && selected_gold == 1 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_adamantine == 0)
if (ore_gold > 0)
ore_gold--;
@@ -296,10 +303,10 @@
else
on = 0
continue
if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_adamantine == 0)
if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_adamantine == 0)
if (ore_iron > 0)
ore_iron--;
new /obj/item/stack/sheet/metal(output.loc)
new /obj/item/stack/sheet/r_metal(output.loc)
else
on = 0
continue