From e63277ee04131e064f888e9e46937f291c0bd210 Mon Sep 17 00:00:00 2001 From: Mij Date: Thu, 25 Oct 2012 08:45:52 -0700 Subject: [PATCH] Fixed my ore box mistakes Keeps strange rocks out of ore boxes. Actually changes sprites in the correct place. >.> --- code/modules/mining/satchel_ore_boxdm.dm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 5b7632c7857..09e5ae860e8 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -3,9 +3,9 @@ /obj/structure/ore_box icon = 'icons/obj/mining.dmi' - icon_state = "orebox" + icon_state = "orebox0" name = "Ore Box" - desc = "It's heavy" + desc = "A heavy box used for storing ore." density = 1 /obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -28,7 +28,7 @@ var/amt_plasma = 0 var/amt_uranium = 0 var/amt_clown = 0 - var/amt_archaeo = 0 + for (var/obj/item/weapon/ore/C in contents) if (istype(C,/obj/item/weapon/ore/diamond)) @@ -47,8 +47,6 @@ amt_uranium++; if (istype(C,/obj/item/weapon/ore/clown)) amt_clown++; - if (istype(C,/obj/item/weapon/ore/strangerock)) - amt_archaeo++; var/dat = text("The contents of the ore box reveal...
") if (amt_gold) @@ -67,8 +65,6 @@ dat += text("Uranium ore: [amt_uranium]
") if (amt_clown) dat += text("Bananium ore: [amt_clown]
") - if (amt_archaeo) - dat += text("Strange rocks: [amt_archaeo]
") dat += text("

Empty box") user << browse("[dat]", "window=orebox")