From 975b5a7bf2a5a2ae97ca77cfa14b6e42d245fd9f Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 26 Jul 2018 14:13:35 -0500 Subject: [PATCH] Merge pull request #5441 from Mechoid/Halogenscannerreeee Fixes the PDA Halogen Scanner's tendency to be number one. --- code/game/objects/items/devices/PDA/PDA.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 5d6c14abb9b..968861f1e41 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -1254,7 +1254,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(isnull(cartridge)) to_chat(usr, "There's no cartridge to eject.") - return + return cartridge.forceMove(get_turf(src)) if(ismob(loc)) @@ -1382,7 +1382,7 @@ var/global/list/obj/item/device/pda/PDAs = list() to_chat(user, "Blood type: [C:blood_DNA[blood]]\nDNA: [blood]") if(4) - user.visible_message("\The [user] has analyzed [C]'s radiation levels!", 1) + user.visible_message("\The [user] has analyzed [C]'s radiation levels!", "You have analyzed [C]'s radiation levels!") to_chat(user, "Analyzing Results for [C]:") if(C.radiation) to_chat(user, "Radiation Level: [C.radiation]")