diff --git a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm index f0ab360d36a..38ef66fc5b2 100644 --- a/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm +++ b/code/WorkInProgress/Cael_Aislinn/Jungle/jungle_temple.dm @@ -86,9 +86,6 @@ for(var/coin_type in typesof(/obj/item/weapon/coin)) possible_spawns += coin_type - //no icon_state for mythril coins - possible_spawns -= /obj/item/weapon/coin/mythril - var/coin_type = pick(possible_spawns) for(var/i=0,iChoose") - dat += text("
Adamantine inserted: [amt_adamantine] ")//I don't even know these color codes, so fuck it. - if (chosen == "adamantine") - dat += text("chosen") - else - dat += text("Choose") dat += text("

Will produce [coinsToProduce] [chosen] coins if enough materials are available.
") //dat += text("The dial which controls the number of conins to produce seems to be stuck. A technician has already been dispatched to fix this.") @@ -238,30 +228,6 @@ newCoins++ src.updateUsrDialog() sleep(5); - if("adamantine") - 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/adamantine(M) - amt_adamantine -= 20 - coinsToProduce-- - 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/money_bag.dm b/code/modules/mining/money_bag.dm index 44383b0412d..fbcca4984bb 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -17,7 +17,6 @@ var/amt_plasma = 0 var/amt_uranium = 0 var/amt_clown = 0 - var/amt_adamantine = 0 for (var/obj/item/weapon/coin/C in contents) if (istype(C,/obj/item/weapon/coin/diamond)) @@ -34,8 +33,6 @@ amt_uranium++; if (istype(C,/obj/item/weapon/coin/clown)) amt_clown++; - if (istype(C,/obj/item/weapon/coin/adamantine)) - amt_adamantine++; var/dat = text("The contents of the moneybag reveal...
") if (amt_gold) @@ -52,8 +49,6 @@ dat += text("Uranium coins: [amt_uranium] Remove one
") if (amt_clown) dat += text("Bananium coins: [amt_clown] Remove one
") - if (amt_adamantine) - dat += text("Adamantine coins: [amt_adamantine] Remove one
") /* var/credits=0 var/list/ore=list() @@ -113,8 +108,6 @@ COIN = locate(/obj/item/weapon/coin/uranium,src.contents) if("clown") COIN = locate(/obj/item/weapon/coin/clown,src.contents) - if("adamantine") - COIN = locate(/obj/item/weapon/coin/adamantine,src.contents) if(!COIN) return COIN.loc = src.loc @@ -131,5 +124,4 @@ new /obj/item/weapon/coin/silver(src) new /obj/item/weapon/coin/silver(src) new /obj/item/weapon/coin/gold(src) - new /obj/item/weapon/coin/gold(src) - new /obj/item/weapon/coin/adamantine(src) \ No newline at end of file + new /obj/item/weapon/coin/gold(src) \ No newline at end of file diff --git a/code/modules/mining/surprises/tg.dm b/code/modules/mining/surprises/tg.dm index 8e413da0a53..e8801ac2fbb 100644 --- a/code/modules/mining/surprises/tg.dm +++ b/code/modules/mining/surprises/tg.dm @@ -84,7 +84,6 @@ /obj/item/weapon/dice=3, /obj/item/weapon/staff=2, /obj/effect/decal/cleanable/dirt=3, - /obj/item/weapon/coin/mythril=3 ) flags = CONTIGUOUS_WALLS | CONTIGUOUS_FLOORS diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 9b330492fc7..0e1909ec474 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -22,7 +22,6 @@ Note: Must be placed west/left of and R&D console to function. var/uranium_amount = 0.0 var/diamond_amount = 0.0 var/clown_amount = 0.0 - var/adamantine_amount = 0.0 /obj/machinery/r_n_d/protolathe/New() @@ -111,9 +110,6 @@ Note: Must be placed west/left of and R&D console to function. if(clown_amount >= 2000) var/obj/item/stack/sheet/mineral/clown/G = new /obj/item/stack/sheet/mineral/clown(src.loc) G.amount = round(clown_amount / G.perunit) - if(adamantine_amount >= 2000) - var/obj/item/stack/sheet/mineral/adamantine/G = new /obj/item/stack/sheet/mineral/adamantine(src.loc) - G.amount = round(adamantine_amount / G.perunit) del(src) return 1 else @@ -182,8 +178,6 @@ Note: Must be placed west/left of and R&D console to function. diamond_amount += amount * 2000 if(/obj/item/stack/sheet/mineral/clown) clown_amount += amount * 2000 - if(/obj/item/stack/sheet/mineral/adamantine) - adamantine_amount += amount * 2000 else new stacktype(src.loc, amount) busy = 0 diff --git a/code/modules/research/xenoarchaeology/finds/finds.dm b/code/modules/research/xenoarchaeology/finds/finds.dm index 5c6231d789f..1a058912beb 100644 --- a/code/modules/research/xenoarchaeology/finds/finds.dm +++ b/code/modules/research/xenoarchaeology/finds/finds.dm @@ -225,7 +225,6 @@ possible_spawns += /obj/item/stack/sheet/glass possible_spawns += /obj/item/stack/sheet/rglass possible_spawns += /obj/item/stack/sheet/mineral/plasma - possible_spawns += /obj/item/stack/sheet/mineral/mythril possible_spawns += /obj/item/stack/sheet/mineral/gold possible_spawns += /obj/item/stack/sheet/mineral/silver possible_spawns += /obj/item/stack/sheet/mineral/enruranium