cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes strings to paths on the mining machinery code

Browse Source
This commit is contained in:
Aranclanos
2014-01-03 03:23:28 -03:00
parent 00a62742b6
commit b5fc39236f
2 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/machine_processing.dm
+14 -15
View File
@@ -206,7 +206,7 @@
if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
if (ore_glass > 0)
ore_glass--;
generate_mineral("/obj/item/stack/sheet/glass")
generate_mineral(/obj/item/stack/sheet/glass)
else
on = 0
continue
@@ -214,49 +214,49 @@
if (ore_glass > 0 && ore_iron > 0)
ore_glass--;
ore_iron--;
generate_mineral("/obj/item/stack/sheet/rglass")
generate_mineral(/obj/item/stack/sheet/rglass)
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)
if (ore_gold > 0)
ore_gold--;
generate_mineral("/obj/item/stack/sheet/mineral/gold")
generate_mineral(/obj/item/stack/sheet/mineral/gold)
else
on = 0
continue
if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
if (ore_silver > 0)
ore_silver--;
generate_mineral("/obj/item/stack/sheet/mineral/silver")
generate_mineral(/obj/item/stack/sheet/mineral/silver)
else
on = 0
continue
if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
if (ore_diamond > 0)
ore_diamond--;
generate_mineral("/obj/item/stack/sheet/mineral/diamond")
generate_mineral(/obj/item/stack/sheet/mineral/diamond)
else
on = 0
continue
if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
if (ore_plasma > 0)
ore_plasma--;
generate_mineral("/obj/item/stack/sheet/mineral/plasma")
generate_mineral(/obj/item/stack/sheet/mineral/plasma)
else
on = 0
continue
if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0)
if (ore_uranium > 0)
ore_uranium--;
generate_mineral("/obj/item/stack/sheet/mineral/uranium")
generate_mineral(/obj/item/stack/sheet/mineral/uranium)
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)
if (ore_iron > 0)
ore_iron--;
generate_mineral("/obj/item/stack/sheet/metal")
generate_mineral(/obj/item/stack/sheet/metal)
else
on = 0
continue
@@ -264,14 +264,14 @@
if (ore_iron > 0 && ore_plasma > 0)
ore_iron--;
ore_plasma--;
generate_mineral("/obj/item/stack/sheet/plasteel")
generate_mineral(/obj/item/stack/sheet/plasteel)
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 == 0 && selected_clown == 1)
if (ore_clown > 0)
ore_clown--;
generate_mineral("/obj/item/stack/sheet/mineral/clown")
generate_mineral(/obj/item/stack/sheet/mineral/clown)
else
on = 0
continue
@@ -281,7 +281,7 @@
if (ore_uranium >= 2 && ore_diamond >= 1)
ore_uranium -= 2
ore_diamond -= 1
generate_mineral("/obj/item/stack/sheet/mineral/adamantine")
generate_mineral(/obj/item/stack/sheet/mineral/adamantine)
else
on = 0
continue
@@ -289,7 +289,7 @@
if (ore_silver >= 1 && ore_plasma >= 3)
ore_silver -= 1
ore_plasma -= 3
generate_mineral("/obj/item/stack/sheet/mineral/mythril")
generate_mineral(/obj/item/stack/sheet/mineral/mythril)
else
on = 0
continue*/
@@ -342,7 +342,7 @@
ore_iron--
if (selected_clown == 1)
ore_clown--
generate_mineral("/obj/item/weapon/ore/slag")
generate_mineral(/obj/item/weapon/ore/slag)
on = 0
else
on = 0
@@ -392,7 +392,6 @@
unload_mineral(O)
/obj/machinery/mineral/processing_unit/proc/generate_mineral(var/S)
var/P = text2path(S)
/obj/machinery/mineral/processing_unit/proc/generate_mineral(var/P)
var/O = new P(src)
unload_mineral(O)
code/modules/mining/mint.dm
+10 -11
View File
@@ -130,7 +130,7 @@
switch(chosen)
if("metal")
while(amt_iron > 0 && coinsToProduce > 0)
create_coins("obj/item/weapon/coin/iron")
create_coins(/obj/item/weapon/coin/iron)
amt_iron -= 20
coinsToProduce--
newCoins++
@@ -138,7 +138,7 @@
sleep(5);
if("gold")
while(amt_gold > 0 && coinsToProduce > 0)
create_coins("/obj/item/weapon/coin/gold")
create_coins(/obj/item/weapon/coin/gold)
amt_gold -= 20
coinsToProduce--
newCoins++
@@ -146,7 +146,7 @@
sleep(5);
if("silver")
while(amt_silver > 0 && coinsToProduce > 0)
create_coins("/obj/item/weapon/coin/silver")
create_coins(/obj/item/weapon/coin/silver)
amt_silver -= 20
coinsToProduce--
newCoins++
@@ -154,7 +154,7 @@
sleep(5);
if("diamond")
while(amt_diamond > 0 && coinsToProduce > 0)
create_coins("/obj/item/weapon/coin/diamond")
create_coins(/obj/item/weapon/coin/diamond)
amt_diamond -= 20
coinsToProduce--
newCoins++
@@ -162,7 +162,7 @@
sleep(5);
if("plasma")
while(amt_plasma > 0 && coinsToProduce > 0)
create_coins("/obj/item/weapon/coin/plasma")
create_coins(/obj/item/weapon/coin/plasma)
amt_plasma -= 20
coinsToProduce--
newCoins++
@@ -170,7 +170,7 @@
sleep(5);
if("uranium")
while(amt_uranium > 0 && coinsToProduce > 0)
create_coins("/obj/item/weapon/coin/uranium")
create_coins(/obj/item/weapon/coin/uranium)
amt_uranium -= 20
coinsToProduce--
newCoins++
@@ -178,7 +178,7 @@
sleep(5)
if("clown")
while(amt_clown > 0 && coinsToProduce > 0)
create_coins("/obj/item/weapon/coin/clown")
create_coins(/obj/item/weapon/coin/clown)
amt_clown -= 20
coinsToProduce--
newCoins++
@@ -186,7 +186,7 @@
sleep(5);
if("adamantine")
while(amt_adamantine > 0 && coinsToProduce > 0)
create_coins("/obj/item/weapon/coin/adamantine")
create_coins(/obj/item/weapon/coin/adamantine)
amt_adamantine -= 20
coinsToProduce--
newCoins++
@@ -194,7 +194,7 @@
sleep(5);
if("mythril")
while(amt_adamantine > 0 && coinsToProduce > 0)
create_coins("/obj/item/weapon/coin/mythril")
create_coins(/obj/item/weapon/coin/mythril)
amt_mythril -= 20
coinsToProduce--
newCoins++
@@ -206,10 +206,9 @@
src.updateUsrDialog()
return
/obj/machinery/mineral/mint/proc/create_coins(var/S)
/obj/machinery/mineral/mint/proc/create_coins(var/P)
var/turf/T = get_step(src,output_dir)
if(T)
var/P = text2path(S)
var/obj/item/O = new P(src)
var/obj/item/weapon/moneybag/M = locate(/obj/item/weapon/moneybag/, T)
if(!M)