From 72b0000f6aba8898bec9bb5b7ae1b59a4c3e619d Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Thu, 20 Nov 2014 00:41:43 -0500 Subject: [PATCH] Fixes a bug where core samplers dispensed bags that you could not take rock slivers out of. --- code/modules/detectivework/evidence.dm | 2 +- .../research/xenoarchaeology/tools/tools_coresampler.dm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index b5f6dfa2330..b416b250bf5 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -77,7 +77,7 @@ /obj/item/weapon/evidencebag/attack_self(mob/user as mob) if(contents.len) - var/obj/item/I = stored_item + var/obj/item/I = contents[1] user.visible_message("[user] takes [I] out of [src]", "You take [I] out of [src].",\ "You hear someone rustle around in a plastic bag, and remove something.") overlays.Cut() //remove the overlays diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm index 344a6ccb225..af67103bff7 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm @@ -79,7 +79,8 @@ //update the sample bag filled_bag.icon_state = "evidence" var/image/I = image("icon"=R, "layer"=FLOAT_LAYER) - filled_bag.underlays += I + filled_bag.overlays += I + filled_bag.overlays += "evidence" filled_bag.w_class = 1 user << "\blue You take a core sample of the [item_to_sample]."