diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index bdd520a3b9..95383fc999 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -102,16 +102,6 @@
else
machine.selected_clown = 0
- //adamantine
- if(machine.ore_adamantine)
- if (machine.selected_adamantine==1)
- dat += text("Smelting ")
- else
- dat += text("Not smelting ")
- dat += text("Adamantine: [machine.ore_adamantine]
")
- else
- machine.selected_adamantine = 0
-
//On or off
dat += text("Machine is currently ")
@@ -172,11 +162,6 @@
machine.selected_clown = 1
else
machine.selected_clown = 0
- if(href_list["sel_adamantine"])
- if (href_list["sel_adamantine"] == "yes")
- machine.selected_adamantine = 1
- else
- machine.selected_adamantine =0
if(href_list["set_on"])
if (href_list["set_on"] == "on")
machine.on = 1
@@ -214,7 +199,6 @@
var/selected_uranium = 0
var/selected_iron = 0
var/selected_clown = 0
- var/selected_adamantine = 0
var/on = 0 //0 = off, 1 =... oh you know!
/obj/machinery/mineral/processing_unit/New()
@@ -235,14 +219,14 @@
var/i
for (i = 0; i < 10; i++)
if (on)
- 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 && selected_adamantine == 0)
+ 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--;
new /obj/item/stack/sheet/glass(output.loc)
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 (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0)
if (ore_glass > 0 && ore_iron > 0)
ore_glass--;
ore_iron--;
@@ -250,49 +234,49 @@
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 (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--;
new /obj/item/stack/sheet/gold(output.loc)
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 && selected_adamantine == 0)
+ 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--;
new /obj/item/stack/sheet/silver(output.loc)
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 && selected_adamantine == 0)
+ 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--;
new /obj/item/stack/sheet/diamond(output.loc)
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 && selected_adamantine == 0)
+ 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--;
new /obj/item/stack/sheet/plasma(output.loc)
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 && selected_adamantine == 0)
+ 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--;
new /obj/item/stack/sheet/uranium(output.loc)
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 == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0)
if (ore_iron > 0)
ore_iron--;
new /obj/item/stack/sheet/metal(output.loc)
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 == 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)
if (ore_iron > 0 && ore_plasma > 0)
ore_iron--;
ore_plasma--;
@@ -300,20 +284,32 @@
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 && selected_adamantine == 0)
+ 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--;
new /obj/item/stack/sheet/clown(output.loc)
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 == 0 && selected_adamantine == 1)
- if (ore_adamantine > 0)
- ore_adamantine--;
+ //THESE TWO ARE CODED FOR URIST TO USE WHEN HE GETS AROUND TO IT.
+ //They were coded on 18 Feb 2012. If you're reading this in 2015, then firstly congratulations on the world not ending on 21 Dec 2012 and secondly, Urist is apparently VERY lazy. ~Errorage
+ /*if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0)
+ if (ore_uranium >= 2 && ore_diamond >= 1)
+ ore_uranium -= 2
+ ore_diamond -= 1
new /obj/item/stack/sheet/adamantine(output.loc)
else
on = 0
continue
+ if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0)
+ if (ore_silver >= 1 && ore_plasma >= 3)
+ ore_silver -= 1
+ ore_plasma -= 3
+ new /obj/item/stack/sheet/mythril(output.loc)
+ else
+ on = 0
+ continue*/
+
//if a non valid combination is selected
@@ -346,9 +342,6 @@
if (selected_clown == 1)
if (ore_clown <= 0)
b = 0
- if (selected_adamantine == 1)
- if (ore_adamantine <= 0)
- b = 0
if (b) //if they are, deduct one from each, produce slag and shut the machine off
if (selected_gold == 1)
@@ -365,8 +358,6 @@
ore_iron--
if (selected_clown == 1)
ore_clown--
- if (selected_adamantine == 1)
- ore_adamantine--
new /obj/item/weapon/ore/slag(output.loc)
on = 0
else
@@ -411,10 +402,6 @@
ore_clown++
del(O)
continue
- if (istype(O,/obj/item/weapon/ore/adamantine))
- ore_adamantine++
- del(O)
- continue
O.loc = src.output.loc
else
break
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index ca56bde61a..8a76e49b8b 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -43,11 +43,13 @@
if(machine.ore_diamond)
dat += text("Diamond: [machine.ore_diamond] Release
")
if(machine.ore_clown)
- dat += text("Bananium: [machine.ore_clown] Release
")
+ dat += text("Bananium: [machine.ore_clown] Release
")
if(machine.ore_adamantine)
- dat += text ("Adamantine: [machine.ore_adamantine] Release
")
+ dat += text ("Adamantine: [machine.ore_adamantine] Release
")
+ if(machine.ore_mythril)
+ dat += text ("Mythril: [machine.ore_mythril] Release
")
- dat += text("Stacking: [machine.stack_amt]
")
+ dat += text("
Stacking: [machine.stack_amt]
")
user << browse("[dat]", "window=console_stacking_machine")
@@ -124,6 +126,12 @@
G.amount = machine.ore_adamantine
G.loc = machine.output.loc
machine.ore_adamantine = 0
+ if ("mythril")
+ if (machine.ore_mythril > 0)
+ var/obj/item/stack/sheet/mythril/G = new /obj/item/stack/sheet/mythril
+ G.amount = machine.ore_mythril
+ G.loc = machine.output.loc
+ machine.ore_mythril = 0
src.updateUsrDialog()
return
@@ -153,6 +161,7 @@
var/ore_rglass = 0;
var/ore_plasteel = 0;
var/ore_adamantine = 0;
+ var/ore_mythril = 0;
var/stack_amt = 50; //ammount to stack before releassing
/obj/machinery/mineral/stacking_machine/New()
@@ -217,6 +226,10 @@
ore_adamantine+= O:amount
del(O)
continue
+ if (istype(O,/obj/item/stack/sheet/mythril))
+ ore_mythril+= O:amount
+ del(O)
+ continue
if (istype(O,/obj/item/weapon/ore/slag))
del(O)
continue
@@ -287,4 +300,10 @@
G.loc = output.loc
ore_adamantine -= stack_amt
return
+ if (ore_mythril >= stack_amt)
+ var/obj/item/stack/sheet/mythril/G = new /obj/item/stack/sheet/mythril
+ G.amount = stack_amt
+ G.loc = output.loc
+ ore_mythril -= stack_amt
+ return
return
diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm
index 66a84db521..aecd3581e5 100644
--- a/code/modules/mining/machine_unloading.dm
+++ b/code/modules/mining/machine_unloading.dm
@@ -20,7 +20,6 @@
for (var/dir in cardinal)
src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
if(src.output) break
- processing_objects.Add(src)
return
return
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 303975604c..3874633d57 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -162,15 +162,6 @@
spread = 1
-/turf/simulated/mineral/adamantine
- name = "Adamantine deposit"
- icon_state = "rock_Adamantine"
- mineralName = "Adamantine"
- mineralAmt = 3
- spreadChance = 0
- spread = 0 //It shouldn't spawn yet; will change these to match diamond once it's fully implemented. -Durandan
-
-
/turf/simulated/mineral/clown
name = "Bananium deposit"
icon_state = "rock_Clown"
@@ -255,8 +246,6 @@
new /obj/item/weapon/ore/diamond(src)
if (src.mineralName == "Clown")
new /obj/item/weapon/ore/clown(src)
- if (src.mineralName == "Adamantine")
- new /obj/item/weapon/ore/adamantine(src)
ReplaceWithFloor()
return
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index 4c129f291d..70da4fce9c 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -17,6 +17,7 @@
var/amt_uranium = 0
var/amt_clown = 0
var/amt_adamantine = 0
+ var/amt_mythril = 0
var/newCoins = 0 //how many coins the machine made in it's last load
var/processing = 0
var/chosen = "metal" //which material will be used to make coins
@@ -249,6 +250,18 @@
newCoins++
src.updateUsrDialog()
sleep(5);
+ if("mythril")
+ while(amt_adamantine > 0 && coinsToProduce > 0)
+ if (locate(/obj/item/weapon/moneybag,output.loc))
+ M = locate(/obj/item/weapon/moneybag,output.loc)
+ else
+ M = new/obj/item/weapon/moneybag(output.loc)
+ new /obj/item/weapon/coin/mythril(M)
+ amt_mythril -= 20
+ coinsToProduce--
+ newCoins++
+ src.updateUsrDialog()
+ sleep(5);
icon_state = "coinpress0"
processing = 0;
coinsToProduce = temp_coins
diff --git a/code/modules/mining/ores_materials_coins.dm b/code/modules/mining/ores_materials_coins.dm
index 89a33aae4c..d771f4500f 100644
--- a/code/modules/mining/ores_materials_coins.dm
+++ b/code/modules/mining/ores_materials_coins.dm
@@ -73,11 +73,6 @@
icon_state = "Clown ore"
origin_tech = "materials=4"
-/obj/item/weapon/ore/adamantine
- name = "Adamantine ore"
- icon_state = "Adamantine ore"
- origin_tech = "materials=5"
-
/obj/item/weapon/ore/slag
name = "Slag"
desc = "Completely useless"
@@ -136,6 +131,10 @@
name = "Adamantine coin"
icon_state = "coin_adamantine"
+/obj/item/weapon/coin/mythril
+ name = "Mythril coin"
+ icon_state = "coin_mythril"
+
/obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/cable_coil) )
var/obj/item/weapon/cable_coil/CC = W
@@ -264,6 +263,17 @@
origin_tech = "materials=4"
perunit = 2000
+/obj/item/stack/sheet/mythril
+ name = "mythril"
+ icon_state = "sheet-mythril"
+ force = 5.0
+ throwforce = 5
+ w_class = 3.0
+ throw_speed = 3
+ throw_range = 3
+ origin_tech = "materials=4"
+ perunit = 2000
+
/obj/item/stack/sheet/clown
name = "bananium"
icon_state = "sheet-clown"
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 66ef787f03..0369394f3b 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -61,7 +61,6 @@
var/amt_plasma = 0
var/amt_uranium = 0
var/amt_clown = 0
- var/amt_adamantine = 0
for (var/obj/item/weapon/ore/C in contents)
if (istype(C,/obj/item/weapon/ore/diamond))
@@ -80,8 +79,6 @@
amt_uranium++;
if (istype(C,/obj/item/weapon/ore/clown))
amt_clown++;
- if (istype(C,/obj/item/weapon/ore/adamantine))
- amt_adamantine++;
var/dat = text("The contents of the ore box reveal...
")
if (amt_gold)
@@ -100,8 +97,6 @@
dat += text("Uranium ore: [amt_uranium]
")
if (amt_clown)
dat += text("Bananium ore: [amt_clown]
")
- if (amt_adamantine)
- dat += text("Adamantine ore: [amt_adamantine]
")
dat += text("
Empty box")
user << browse("[dat]", "window=orebox")
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 5c58ec1bdb..2cf86cfbd0 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ