updates to most recent version and puts intent hints!
This commit is contained in:
@@ -116,6 +116,38 @@ GLOBAL_LIST_EMPTY(PDAs)
|
||||
if(inserted_item && (!isturf(loc)))
|
||||
. += "<span class='notice'>Ctrl-click to remove [inserted_item].</span>"
|
||||
|
||||
/obj/item/pda/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
|
||||
. = ..()
|
||||
|
||||
if(held_item)
|
||||
if(istype(held_item, /obj/item/cartridge) && !cartridge)
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Insert Cartridge")
|
||||
. = CONTEXTUAL_SCREENTIP_SET
|
||||
else if(istype(held_item, /obj/item/card/id) && !id)
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Insert ID")
|
||||
. = CONTEXTUAL_SCREENTIP_SET
|
||||
else if(istype(held_item, /obj/item/paicard) && !pai)
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Insert pAI")
|
||||
. = CONTEXTUAL_SCREENTIP_SET
|
||||
else if(is_type_in_list(held_item, contained_item) && !inserted_item)
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Insert [held_item]")
|
||||
. = CONTEXTUAL_SCREENTIP_SET
|
||||
else if(istype(held_item, /obj/item/photo))
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Scan photo")
|
||||
. = CONTEXTUAL_SCREENTIP_SET
|
||||
|
||||
if(id) // ID gets removed before inserted_item
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_ALT_LMB], INTENT_ANY, "Remove ID")
|
||||
. = CONTEXTUAL_SCREENTIP_SET
|
||||
else if(inserted_item)
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_ALT_LMB], INTENT_ANY, "Remove [inserted_item]")
|
||||
. = CONTEXTUAL_SCREENTIP_SET
|
||||
|
||||
if(inserted_item)
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_CTRL_LMB], INTENT_ANY, "Remove [inserted_item]")
|
||||
. = CONTEXTUAL_SCREENTIP_SET
|
||||
return . || NONE
|
||||
|
||||
/obj/item/pda/Initialize(mapload)
|
||||
if(GLOB.pda_reskins)
|
||||
unique_reskin = GLOB.pda_reskins
|
||||
|
||||
@@ -145,11 +145,11 @@ GENETICS SCANNER
|
||||
|
||||
switch (scanmode)
|
||||
if (SCANMODE_HEALTH)
|
||||
context[SCREENTIP_CONTEXT_LMB] = "Scan health"
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Scan health")
|
||||
if (SCANMODE_CHEMICAL)
|
||||
context[SCREENTIP_CONTEXT_LMB] = "Scan chemicals"
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Scan chemicals")
|
||||
if (SCANMODE_WOUND)
|
||||
context[SCREENTIP_CONTEXT_LMB] = "Scan wounds"
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Scan wounds")
|
||||
|
||||
return CONTEXTUAL_SCREENTIP_SET
|
||||
|
||||
|
||||
@@ -127,11 +127,11 @@
|
||||
|
||||
var/static/list/hovering_item_typechecks = list(
|
||||
/obj/item/stack/rods = list(
|
||||
SCREENTIP_CONTEXT_LMB = "Craft wired rod",
|
||||
SCREENTIP_CONTEXT_LMB = list(INTENT_ANY = "Craft wired rod"),
|
||||
),
|
||||
|
||||
/obj/item/stack/sheet/metal = list(
|
||||
SCREENTIP_CONTEXT_LMB = "Craft bola",
|
||||
SCREENTIP_CONTEXT_LMB = list(INTENT_ANY = "Craft bola"),
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@@ -162,22 +162,18 @@
|
||||
return NONE
|
||||
|
||||
if (isobj(target))
|
||||
context[SCREENTIP_CONTEXT_LMB] = "Attack"
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Attack")
|
||||
else
|
||||
if (turned_on)
|
||||
context[SCREENTIP_CONTEXT_RMB] = "Knockdown"
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_RMB], INTENT_ANY, "Knockdown")
|
||||
|
||||
if (user.a_intent == INTENT_HARM)
|
||||
context[SCREENTIP_CONTEXT_LMB] = "Harmful stun"
|
||||
else
|
||||
context[SCREENTIP_CONTEXT_LMB] = "Stun"
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Stun")
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HARM, "Harmful stun")
|
||||
else
|
||||
context[SCREENTIP_CONTEXT_RMB] = "Knockdown" // DON'T TELL EM, PRANKED.
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_RMB], INTENT_ANY, "Knockdown") // DON'T TELL EM, PRANKED.
|
||||
|
||||
if (user.a_intent == INTENT_HARM)
|
||||
context[SCREENTIP_CONTEXT_LMB] = "Attack" // It's fine i guess...?
|
||||
else
|
||||
context[SCREENTIP_CONTEXT_LMB] = "Stun" // STILL DO NOT DARE TELLING THEM
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_ANY, "Stun") // STILL DO NOT DARE TELLING THEM
|
||||
LAZYSET(context[SCREENTIP_CONTEXT_LMB], INTENT_HARM, "Attack") // It's fine i guess...?
|
||||
|
||||
return CONTEXTUAL_SCREENTIP_SET
|
||||
|
||||
|
||||
@@ -588,11 +588,11 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
|
||||
|
||||
var/static/list/hovering_item_typechecks = list(
|
||||
/obj/item/shard = list(
|
||||
SCREENTIP_CONTEXT_LMB = "Craft spear",
|
||||
SCREENTIP_CONTEXT_LMB = list(INTENT_ANY = "Craft spear"),
|
||||
),
|
||||
|
||||
/obj/item/assembly/igniter = list(
|
||||
SCREENTIP_CONTEXT_LMB = "Craft stunprod",
|
||||
SCREENTIP_CONTEXT_LMB = list(INTENT_ANY = "Craft stunprod"),
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@@ -503,11 +503,11 @@
|
||||
if (!(flags_1 & NODECONSTRUCT_1))
|
||||
var/static/list/tool_behaviors = list(
|
||||
TOOL_SCREWDRIVER = list(
|
||||
SCREENTIP_CONTEXT_LMB = "Disassemble",
|
||||
SCREENTIP_CONTEXT_LMB = list(INTENT_ANY = "Disassemble"),
|
||||
),
|
||||
|
||||
TOOL_WRENCH = list(
|
||||
SCREENTIP_CONTEXT_LMB = "Deconstruct",
|
||||
SCREENTIP_CONTEXT_LMB = list(INTENT_ANY = "Deconstruct"),
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user