From 8ee8875e8026af2dc1d4a86e8bc9e41a85775cb9 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Sun, 25 Dec 2011 12:37:20 -0700 Subject: [PATCH] Fixed some bugginess with evidence bags. --- code/WorkInProgress/detective_work.dm | 1 + code/game/objects/items/weapons/evidence.dm | 3 +++ 2 files changed, 4 insertions(+) diff --git a/code/WorkInProgress/detective_work.dm b/code/WorkInProgress/detective_work.dm index 673c81bbb78..6a6023950e8 100644 --- a/code/WorkInProgress/detective_work.dm +++ b/code/WorkInProgress/detective_work.dm @@ -136,6 +136,7 @@ obj/machinery/computer/forensic_scanning scanning = I.contents[1] scanning.loc = src I.underlays -= scanning + I.icon_state = "evidenceobj" else scanning = I M.drop_item() diff --git a/code/game/objects/items/weapons/evidence.dm b/code/game/objects/items/weapons/evidence.dm index aa20e83a851..1d7f5cc69ef 100644 --- a/code/game/objects/items/weapons/evidence.dm +++ b/code/game/objects/items/weapons/evidence.dm @@ -23,6 +23,9 @@ if(!(O && istype(O)) || O.anchored == 1) user << "You can't put that inside the [src]!" return ..() + if(O in user) + user << "You are wearing that." + return if(src.contents.len > 0) user << "The [src] already has something inside it." return ..()