cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 07:39:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2488 from CHOMPStationBot/upstream-merge-10993

Browse Source 
[MIRROR] Stack Examine Improvements, Log Examine Fix
This commit is contained in:
Nadyr
2021-07-10 01:47:29 -04:00
committed by GitHub
parent 19630dcdcc 693f1e68e6
commit 60fa095962
6 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+7 -4
View File
@@ -56,14 +56,17 @@
icon_state = "[initial(icon_state)]_3"
item_state = initial(icon_state)
/obj/item/stack/proc/get_examine_string()
if(!uses_charge)
return "There [src.amount == 1 ? "is" : "are"] [src.amount] [src.singular_name]\s in the stack."
else
return "There is enough charge for [get_amount()]."
/obj/item/stack/examine(mob/user)
. = ..()
if(Adjacent(user))
if(!uses_charge)
. += "There are [src.amount] [src.singular_name]\s in the stack."
else
. += "There is enough charge for [get_amount()]."
. += get_examine_string()
/obj/item/stack/attack_self(mob/user)
tgui_interact(user)