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
+3 -3
View File
@@ -35,8 +35,8 @@
var/datum/effect_system/sparks/spark_system
/obj/machinery/power/emitter/examine(mob/user)
..()
/obj/machinery/power/emitter/examine(mob/user, distance, is_adjacent)
. = ..()
switch(state)
if(EMITTER_LOOSE)
to_chat(user, SPAN_NOTICE("\The [src] isn't attached to anything and is not ready to fire."))
@@ -44,7 +44,7 @@
to_chat(user, SPAN_NOTICE("\The [src] is bolted to the floor, but not yet ready to fire."))
if(EMITTER_WELDED)
to_chat(user, SPAN_WARNING("\The [src] is bolted and welded to the floor, and ready to fire."))
if(Adjacent(user))
if(is_adjacent)
to_chat(user, SPAN_NOTICE("The shot counter display reads: [shot_counter]"))
/obj/machinery/power/emitter/Destroy()
@@ -95,7 +95,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
desc = "[initial(desc)] It seems completely assembled."
if(powered)
desc = initial(desc)
..()
. = ..()
return
/obj/structure/particle_accelerator/attackby(obj/item/W, mob/user)
@@ -249,7 +249,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
desc = "[initial(desc)] It seems completely assembled."
if(powered)
desc = initial(desc)
..()
. = ..()
return