mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 05:23:22 +01:00
Fluff examine fix (#18814)
Standard examination was in an examine box. This makes it so fluff examines are also in a box. Fixes #18438 --------- Co-authored-by: Cody Brittain <cbrittain10@live.com>
This commit is contained in:
co-authored by
Cody Brittain
parent
5ae3436695
commit
91c081d044
@@ -69,7 +69,7 @@
|
||||
set src = usr.contents
|
||||
return 0
|
||||
|
||||
/mob/abstract/eye/examine(mob/user)
|
||||
/mob/abstract/eye/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
|
||||
return TRUE
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/proc/examinate(mob/user, atom/target, show_extended = FALSE)
|
||||
/proc/examinate(mob/user, atom/target, show_extended)
|
||||
if(user.is_blind() || (user.stat && !isobserver(user)))
|
||||
to_chat(user, SPAN_NOTICE("Something is there, but you cannot see it."))
|
||||
return
|
||||
@@ -19,9 +19,5 @@
|
||||
|
||||
SEND_SIGNAL(user, COMSIG_MOB_EXAMINATE, target)
|
||||
|
||||
if(!show_extended) //This won't last long. This will be passed into /examine later on
|
||||
if(!target.examine(user, distance, is_adjacent))
|
||||
crash_with("Improper /examine() override: [log_info_line(target)]")
|
||||
else
|
||||
if(!target.examine_fluff(user, distance, is_adjacent))
|
||||
crash_with("Improper /examine_fluff() override: [log_info_line(target)]")
|
||||
if(!target.examine(user, distance, is_adjacent, show_extended = show_extended))
|
||||
crash_with("Improper /examine() override: [log_info_line(target)]")
|
||||
|
||||
@@ -52,11 +52,11 @@ var/list/holder_mob_icon_cache = list()
|
||||
release_mob()
|
||||
return ..()
|
||||
|
||||
/obj/item/holder/examine(mob/user)
|
||||
/obj/item/holder/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
|
||||
if(contained)
|
||||
return contained.examine(user)
|
||||
return contained.examine(user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
return TRUE
|
||||
|
||||
/obj/item/holder/process()
|
||||
|
||||
@@ -35,10 +35,10 @@
|
||||
|
||||
var/force_holder
|
||||
|
||||
/obj/item/gripper/examine(mob/user)
|
||||
/obj/item/gripper/examine(mob/user, show_extended)
|
||||
. = ..()
|
||||
if(wrapped)
|
||||
wrapped.examine(user)
|
||||
wrapped.examine(user, show_extended = show_extended)
|
||||
|
||||
/obj/item/gripper/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
|
||||
. = ..()
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
var/mob/living/silicon/robot/R = loc
|
||||
return R.get_cell()
|
||||
|
||||
/obj/item/robot_teleporter/examine(mob/user, distance)
|
||||
/obj/item/robot_teleporter/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
. = ..()
|
||||
if(!ready_to_use && isrobot(user))
|
||||
to_chat(user, SPAN_NOTICE("Charging: [num2loadingbar(world.time / when_recharge)]"))
|
||||
|
||||
@@ -100,7 +100,7 @@
|
||||
else
|
||||
see_invisible = SEE_INVISIBLE_NOLIGHTING
|
||||
|
||||
/mob/living/simple_animal/hostile/morph/examine(mob/user, distance, is_adjacent)
|
||||
/mob/living/simple_animal/hostile/morph/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
if(morphed)
|
||||
return form.examine(user)
|
||||
else
|
||||
|
||||
@@ -29,11 +29,11 @@
|
||||
|
||||
// Because we can't perfectly duplicate some examine() output, we directly examine the AM it is copying. It's messy but
|
||||
// this is to prevent easy checks from the opposing force.
|
||||
/mob/living/simple_animal/illusion/examine(mob/user, distance, is_adjacent)
|
||||
/mob/living/simple_animal/illusion/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
|
||||
if(copying)
|
||||
return copying.examine(user, distance, is_adjacent)
|
||||
return copying.examine(user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
else
|
||||
return list("???")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user