Merge pull request #9867 from Ghommie/Ghommie-cit375

Ports "examine-code refactor"
This commit is contained in:
BlackMajor
2019-11-25 11:31:03 +13:00
committed by GitHub
332 changed files with 1296 additions and 1350 deletions
+2 -2
View File
@@ -78,6 +78,6 @@
candrain=!candrain
/obj/item/clothing/gloves/space_ninja/examine(mob/user)
..()
. = ..()
if(HAS_TRAIT_FROM(src, TRAIT_NODROP, NINJA_SUIT_TRAIT))
to_chat(user, "The energy drain mechanism is <B>[candrain?"active":"inactive"]</B>.")
. += "The energy drain mechanism is <B>[candrain?"active":"inactive"]</B>."
+3 -3
View File
@@ -149,12 +149,12 @@ Contents:
/obj/item/clothing/suit/space/space_ninja/examine(mob/user)
..()
. = ..()
if(s_initialized && user == affecting)
to_chat(user, "All systems operational. Current energy capacity: <B>[DisplayEnergy(cell.charge)]</B>.\n\
. += "All systems operational. Current energy capacity: <B>[DisplayEnergy(cell.charge)]</B>.\n\
The CLOAK-tech device is <B>[stealth?"active":"inactive"]</B>.\n\
There are <B>[s_bombs]</B> smoke bomb\s remaining.\n\
There are <B>[a_boost]</B> adrenaline booster\s remaining.")
There are <B>[a_boost]</B> adrenaline booster\s remaining."
/obj/item/clothing/suit/space/space_ninja/ui_action_click(mob/user, action)
if(istype(action, /datum/action/item_action/initialize_ninja_suit))