cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split examine verb and function, and improve it (#17251)

Browse Source 
* Split examine verb and function, and include adjacency and distance checking in examine function

* Fix various issues

* Update code/modules/mob/examinations.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Add required define vars

* Update code/game/objects/items/stacks/wrap.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
Cody Brittain
2023-09-09 08:07:36 +00:00
committed by GitHub
co-authored by SleepyGemmy
parent 39228d3a2c
commit ce5ac79e3c
241 changed files with 617 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+9 -7
View File
@@ -162,8 +162,9 @@ All custom items with worn sprites must follow the contained sprite system: http
icon_state = "corvo_cigarette"
item_state = "corvo_cigarette"
/obj/item/clothing/mask/fluff/corvo_cigarette/examine(mob/user)
if(..(user, 1))
/obj/item/clothing/mask/fluff/corvo_cigarette/examine(mob/user, distance, is_adjacent)
. = ..()
if(distance <= 1)
to_chat(user, "It is [active ? "on" : "off"].")
@@ -473,8 +474,8 @@ All custom items with worn sprites must follow the contained sprite system: http
w_class = ITEMSIZE_NORMAL
var/has_spear = TRUE
/obj/item/fluff/tokash_spear/examine(mob/user)
if(..(user, 1) && has_spear)
/obj/item/fluff/tokash_spear/examine(mob/user, distance, is_adjacent)
if(distance <= 1 && has_spear)
to_chat(user, "It currently holds an old looking spearhead.")
/obj/item/fluff/tokash_spear/update_icon()
@@ -1640,7 +1641,7 @@ All custom items with worn sprites must follow the contained sprite system: http
return ..()
/obj/item/fluff/nasira_burner/examine(mob/user)
..(user)
. = ..()
if(lit)
to_chat(user, "\The [src] is currently lit.")
@@ -1853,8 +1854,9 @@ All custom items with worn sprites must follow the contained sprite system: http
add_overlay("card_spin_fx")
addtimer(CALLBACK(src, PROC_REF(finish_selection), usr), 3 SECONDS)
/obj/item/fluff/ielia_tarot/examine(mob/user)
if(..(user, 1))
/obj/item/fluff/ielia_tarot/examine(mob/user, distance, is_adjacent)
. = ..()
if(distance <= 1)
if(first_card && second_card && third_card)
to_chat(user, "The following constellations are displayed on the starfinder: [first_card], [second_card], and [third_card].")