From 7512adf2f5b501cb4856aecd972c4c5e879cae44 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sat, 29 Nov 2014 16:54:49 -0800 Subject: [PATCH 1/3] Fixes a potentially abusable bug involving the chameleon projector and playing cards. --- code/game/objects/items/devices/chameleonproj.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 4f70aa1024e5..337f65ca00b4 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -21,6 +21,9 @@ afterattack(atom/target, mob/user, proximity) if(!proximity) return + if(istype(target,/obj/item/toy/cards/singlecard)) + user << "\blue Unable to Scan [target]." + return if(istype(target,/obj/item)) playsound(src, 'sound/weapons/flash.ogg', 100, 1, 1) user << "\blue Scanned [target]." From 28bff4161e323bedcac43394af2cefd85a9c34ad Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sat, 29 Nov 2014 16:57:12 -0800 Subject: [PATCH 2/3] Makes unable to scan message red instead of blue --- code/game/objects/items/devices/chameleonproj.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 337f65ca00b4..4a18f8f29b73 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -21,8 +21,8 @@ afterattack(atom/target, mob/user, proximity) if(!proximity) return - if(istype(target,/obj/item/toy/cards/singlecard)) - user << "\blue Unable to Scan [target]." + if(istype(target,/obj/item/toy/cards/singlecard) || istype(target,/obj/item/toy/cards/) + user << "\red Unable to scan [target]." return if(istype(target,/obj/item)) playsound(src, 'sound/weapons/flash.ogg', 100, 1, 1) From 34d4bb0da41f577c161188e0287938957409f1e6 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Sat, 29 Nov 2014 17:18:00 -0800 Subject: [PATCH 3/3] Whoops, Left in some unfinished code, removed --- code/game/objects/items/devices/chameleonproj.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 4a18f8f29b73..008a469dff9b 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -21,7 +21,7 @@ afterattack(atom/target, mob/user, proximity) if(!proximity) return - if(istype(target,/obj/item/toy/cards/singlecard) || istype(target,/obj/item/toy/cards/) + if(istype(target,/obj/item/toy/cards/singlecard)) user << "\red Unable to scan [target]." return if(istype(target,/obj/item))