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
+2 -2
View File
@@ -92,9 +92,9 @@
return
/obj/item/device/assembly/examine(mob/user)
/obj/item/device/assembly/examine(mob/user, distance, is_adjacent)
. = ..()
if(. && (in_range(src, user) || loc == user))
if(distance <= 1 || loc == user)
if(secured)
to_chat(user, "\The [src] is ready!")
else
+3 -3
View File
@@ -12,8 +12,8 @@
var/obj/item/tank/bombtank = null //the second part of the bomb is a phoron tank
/obj/item/device/onetankbomb/examine(mob/user)
..(user)
user.examinate(bombtank)
. = ..()
examinate(user, bombtank)
/obj/item/device/onetankbomb/update_icon()
if(bombtank)
@@ -155,4 +155,4 @@
var/turf/simulated/T = get_turf(src)
if(!T)
return
T.assume_air(removed)
T.assume_air(removed)
+3 -3
View File
@@ -62,9 +62,9 @@
if(master)
master.update_icon()
/obj/item/device/assembly_holder/examine(mob/user)
. = ..(user)
if(. && (in_range(src, user) || src.loc == user))
/obj/item/device/assembly_holder/examine(mob/user, distance, is_adjacent)
. = ..()
if(distance <= 1 || src.loc == user)
if (src.secured)
to_chat(user, SPAN_NOTICE("\The [src] is ready!"))
else
+1 -1
View File
@@ -14,7 +14,7 @@
/obj/item/device/assembly/mousetrap/examine(mob/user)
. = ..()
if(. && armed)
if(armed)
to_chat(user, "It looks like it's armed.")
/obj/item/device/assembly/mousetrap/update_icon()