From 786709093c9084a00ef0e5c6f88d9a44c8f49cbb Mon Sep 17 00:00:00 2001 From: Remie Richards Date: Sun, 2 Aug 2015 20:59:02 +0100 Subject: [PATCH 1/2] Makes it so clicking on the storage window of a storage item (backpack,box) acts as if you clicked the item, removing it from the storage, and equipping it, NO MORE PIXEL HUNTING! --- code/game/objects/items/weapons/storage/storage.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 82758639261..91857fbb703 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -168,6 +168,7 @@ if(display_contents_with_number) for(var/datum/numbered_display/ND in display_contents) + ND.sample_object.mouse_opacity = 2 ND.sample_object.screen_loc = "[cx]:16,[cy]:16" ND.sample_object.maptext = "[(ND.number > 1)? "[ND.number]" : ""]" ND.sample_object.layer = 20 @@ -177,6 +178,7 @@ cy-- else for(var/obj/O in contents) + O.mouse_opacity = 2 //This is here so storage items that spawn with contents correctly have the "click around item to equip" O.screen_loc = "[cx]:16,[cy]:16" O.maptext = "" O.layer = 20 @@ -310,6 +312,7 @@ orient2hud(usr) for(var/mob/M in can_see_contents()) show_to(M) + W.mouse_opacity = 2 //So you can click on the area around the item to equip it, instead of having to pixel hunt update_icon() return 1 @@ -339,6 +342,7 @@ W.maptext = "" W.on_exit_storage(src) update_icon() + W.mouse_opacity = initial(W.mouse_opacity) return 1 From 06a4be7708fc98103f59a829e13ed1d5e1982fb9 Mon Sep 17 00:00:00 2001 From: Remie Richards Date: Tue, 4 Aug 2015 23:04:19 +0100 Subject: [PATCH 2/2] Applies the same "NO MORE PIXEL HUNTING" fix to the Cyborg Module Inventory too. --- code/modules/mob/living/silicon/robot/robot_modules.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 3cd0e9781c6..c594fbfdfbb 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -54,8 +54,10 @@ /obj/item/weapon/robot_module/proc/fix_modules() for(var/obj/item/I in modules) I.flags |= NODROP + I.mouse_opacity = 2 if(emag) emag.flags |= NODROP + emag.mouse_opacity = 2 /obj/item/weapon/robot_module/proc/on_emag() return