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

* 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
+1 -1
View File
@@ -18,7 +18,7 @@
)
/obj/machinery/weapons_analyzer/examine(mob/user)
..()
. = ..()
var/name_of_thing = ""
if(item)
name_of_thing = item.name
@@ -169,9 +169,8 @@
/obj/effect/suspension_field/examine(mob/user)
. = ..()
if(.)
to_chat(user, SPAN_NOTICE("You can see something floating inside it:"))
to_chat(user, SPAN_NOTICE(english_list(contents)))
to_chat(user, SPAN_NOTICE("You can see something floating inside it:"))
to_chat(user, SPAN_NOTICE(english_list(contents)))
/obj/effect/suspension_field/Initialize()
. = ..()
@@ -23,8 +23,9 @@
w_class = ITEMSIZE_TINY
var/obj/item/sample
/obj/item/device/core_sampler/examine(mob/user)
if(..(user, 2))
/obj/item/device/core_sampler/examine(mob/user, distance, is_adjacent)
. = ..()
if(distance <= 2)
to_chat(user, SPAN_NOTICE("This one is [sample ? "full" : "empty"]."))
/obj/item/device/core_sampler/proc/sample_item(var/item_to_sample, var/mob/user)
@@ -58,4 +59,4 @@
sample = null
update_icon()
else
to_chat(user, SPAN_WARNING("The core sampler is empty."))
to_chat(user, SPAN_WARNING("The core sampler is empty."))