Refactor the fuck out of theft objectives. No more stealing your own jumpsuit.

Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/objective.dm
	code/modules/mining/money_bag.dm
	code/modules/mining/ores_coins.dm
	html/changelog.html
This commit is contained in:
Rob Nelson
2014-01-24 12:16:57 -05:00
committed by ZomgPonies
parent e937bdd4c2
commit 1f30243a08
9 changed files with 314 additions and 121 deletions
+21
View File
@@ -54,6 +54,27 @@
dat += text("Bananium coins: [amt_clown] <A href='?src=\ref[src];remove=clown'>Remove one</A><br>")
if (amt_adamantine)
dat += text("Adamantine coins: [amt_adamantine] <A href='?src=\ref[src];remove=adamantine'>Remove one</A><br>")
/*
var/credits=0
var/list/ore=list()
for(var/oredata in typesof(/datum/material) - /datum/material)
var/datum/material/ore_datum = new oredata
ore[ore_datum.id]=ore_datum
for (var/obj/item/weapon/coin/C in contents)
if (istype(C,/obj/item/weapon/coin))
var/datum/material/ore_info=ore[C.material]
ore_info.stored++
ore[C.material]=ore_info
credits += C.credits
var/dat = "<b>The contents of the moneybag reveal...</b><ul>"
for(var/ore_id in ore)
var/datum/material/ore_info=ore[ore_id]
if(ore_info.stored)
dat += "<li>[ore_info.processed_name] coins: [ore_info.stored] <A href='?src=\ref[src];remove=[ore_id]'>Remove one</A></li>"
dat += "</ul><b>Total haul:</b> $[credits]"
*/
user << browse("[dat]", "window=moneybag")
/obj/item/weapon/moneybag/attackby(obj/item/weapon/W as obj, mob/user as mob)
+9
View File
@@ -81,6 +81,8 @@
throwforce = 0.0
w_class = 1.0
var/string_attached
var/material="iron" // Ore ID, used with coinbags.
var/credits = 0 // How many credits is this coin worth?
/obj/item/weapon/coin/New()
pixel_x = rand(0,16)-8
@@ -89,30 +91,37 @@
/obj/item/weapon/coin/gold
name = "Gold coin"
icon_state = "coin_gold"
credits = 10
/obj/item/weapon/coin/silver
name = "Silver coin"
icon_state = "coin_silver"
credits = 5
/obj/item/weapon/coin/diamond
name = "Diamond coin"
icon_state = "coin_diamond"
credits = 25
/obj/item/weapon/coin/iron
name = "Iron coin"
icon_state = "coin_iron"
credits = 1
/obj/item/weapon/coin/plasma
name = "Solid plasma coin"
icon_state = "coin_plasma"
credits = 5
/obj/item/weapon/coin/uranium
name = "Uranium coin"
icon_state = "coin_uranium"
credits = 25
/obj/item/weapon/coin/clown
name = "Bananaium coin"
icon_state = "coin_clown"
credits = 1000
/obj/item/weapon/coin/adamantine
name = "Adamantine coin"