mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 13:30:42 +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
@@ -12,9 +12,9 @@
|
||||
var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device
|
||||
var/obj/item/tank/bombtank = null //the second part of the bomb is a phoron tank
|
||||
|
||||
/obj/item/device/onetankbomb/examine(mob/user)
|
||||
/obj/item/device/onetankbomb/examine(mob/user, show_extended)
|
||||
. = ..()
|
||||
examinate(user, bombtank)
|
||||
examinate(user, bombtank, show_extended)
|
||||
|
||||
/obj/item/device/onetankbomb/update_icon()
|
||||
if(bombtank)
|
||||
|
||||
@@ -626,7 +626,7 @@
|
||||
var/datum/tgui_module/armor_values/AV = new /datum/tgui_module/armor_values(usr, capitalize_first_letters(name), armor_details)
|
||||
AV.ui_interact(usr)
|
||||
if(href_list["examine_fluff"])
|
||||
examine_fluff(usr)
|
||||
examine(usr, show_extended = TRUE)
|
||||
if(ismob(href))
|
||||
do_rig_thing(href, href_list)
|
||||
return
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
/obj/item/clothing/wrists/watch/spy/checktime()
|
||||
to_chat(usr, "You check your watch. Unfortunately for you, it's not a real watch, dork.")
|
||||
|
||||
/obj/item/clothing/wrists/watch/examine(mob/user, distance, is_adjacent)
|
||||
/obj/item/clothing/wrists/watch/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
. = ..()
|
||||
if (distance <= 1)
|
||||
checktime()
|
||||
|
||||
@@ -95,10 +95,10 @@
|
||||
icon_state = "evidenceobj"
|
||||
return
|
||||
|
||||
/obj/item/evidencebag/examine(mob/user)
|
||||
/obj/item/evidencebag/examine(mob/user, show_extended)
|
||||
. = ..()
|
||||
if (stored_item)
|
||||
examinate(user, stored_item)
|
||||
examinate(user, stored_item, show_extended)
|
||||
|
||||
/obj/item/evidencebag/attackby(obj/item/attacking_item, mob/user)
|
||||
if(attacking_item.ispen() || istype(attacking_item, /obj/item/device/flashlight/pen))
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
var/obj/item/device/electronic_assembly/clothing/IC = null
|
||||
var/obj/item/integrated_circuit/built_in/action_button/action_circuit = null // This gets pulsed when someone clicks the button on the hud, OR when certain interactions are performed (such as clicking on something with gloves worn)
|
||||
|
||||
/obj/item/clothing/examine(mob/user)
|
||||
/obj/item/clothing/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
if(IC)
|
||||
examinate(user, IC)
|
||||
. = ..()
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
for(var/obj/item/integrated_circuit/built_in/device_input/I in EA.contents)
|
||||
I.do_work()
|
||||
|
||||
/obj/item/device/assembly/electronic_assembly/examine(mob/user)
|
||||
/obj/item/device/assembly/electronic_assembly/examine(mob/user, show_extended)
|
||||
. = ..()
|
||||
if(EA)
|
||||
for(var/obj/item/integrated_circuit/IC in EA.contents)
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
a creative player the means to solve many problems. Circuits are held inside an electronic assembly, and are wired using special tools.
|
||||
*/
|
||||
|
||||
/obj/item/integrated_circuit/examine(mob/user)
|
||||
/obj/item/integrated_circuit/examine(mob/user, show_extended)
|
||||
interact(user)
|
||||
external_examine(user)
|
||||
. = ..()
|
||||
|
||||
@@ -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("???")
|
||||
|
||||
|
||||
@@ -337,7 +337,7 @@
|
||||
P.focused_conv.cl_send(P, html_decode(text), M)
|
||||
registered_message = text
|
||||
|
||||
/obj/item/modular_computer/examine(mob/user, distance, is_adjacent)
|
||||
/obj/item/modular_computer/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
. = ..()
|
||||
var/obj/item/card/id/id = GetID()
|
||||
if(istype(id) && is_adjacent)
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
/atom/movable/openspace/mimic/attack_hand(mob/user)
|
||||
to_chat(user, SPAN_NOTICE("You cannot reach \the [src] from here."))
|
||||
|
||||
/atom/movable/openspace/mimic/examine(...)
|
||||
/atom/movable/openspace/mimic/examine(..., show_extended)
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
. = associated_atom.examine(arglist(args)) // just pass all the args to the copied atom
|
||||
|
||||
@@ -187,9 +187,9 @@
|
||||
/atom/movable/openspace/turf_proxy/attack_generic(mob/user as mob)
|
||||
loc.attack_generic(user)
|
||||
|
||||
/atom/movable/openspace/turf_proxy/examine(mob/examiner)
|
||||
/atom/movable/openspace/turf_proxy/examine(mob/examiner, show_extended)
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
. = loc.examine(examiner)
|
||||
. = loc.examine(examiner, show_extended = show_extended)
|
||||
|
||||
|
||||
// -- TURF MIMIC --
|
||||
@@ -214,6 +214,6 @@
|
||||
/atom/movable/openspace/turf_mimic/attack_generic(mob/user as mob)
|
||||
to_chat(user, SPAN_NOTICE("You cannot reach \the [src] from here."))
|
||||
|
||||
/atom/movable/openspace/turf_mimic/examine(mob/examiner)
|
||||
/atom/movable/openspace/turf_mimic/examine(mob/examiner, show_extended)
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
. = delegate.examine(examiner)
|
||||
. = delegate.examine(examiner, show_extended = show_extended)
|
||||
|
||||
@@ -275,11 +275,11 @@
|
||||
icon_state = null
|
||||
. = ..()
|
||||
|
||||
/obj/structure/ship_weapon_dummy/examine(mob/user)
|
||||
/obj/structure/ship_weapon_dummy/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
|
||||
if(connected)
|
||||
return connected.examine(user)
|
||||
return connected.examine(user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
else
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
friends += owner
|
||||
QDEL_IN(src, 30 SECONDS)
|
||||
|
||||
/mob/living/simple_animal/hostile/mirror_shade/examine(mob/user)
|
||||
/mob/living/simple_animal/hostile/mirror_shade/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
if(!QDELETED(owner))
|
||||
/// Technically suspicious, but these have 30 seconds of lifetime so it's probably fine.
|
||||
return owner.examine(user)
|
||||
|
||||
@@ -99,7 +99,7 @@ If you add a drink with an empty icon sprite, ensure it is in the same folder, e
|
||||
return 1
|
||||
return ..()
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/get_examine_text(mob/user, distance, is_adjacent, infix, suffix)
|
||||
/obj/item/reagent_containers/food/drinks/get_examine_text(mob/user, distance, is_adjacent, infix, suffix, get_extended = FALSE)
|
||||
. = ..()
|
||||
if (distance > 1)
|
||||
return
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
. = ..()
|
||||
|
||||
// Called by /turf/examine() to show current weather status.
|
||||
/obj/abstract/weather_system/examine(mob/user, distance)
|
||||
/obj/abstract/weather_system/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended)
|
||||
SHOULD_CALL_PARENT(FALSE)
|
||||
var/singleton/state/weather/weather_state = weather_system.current_state
|
||||
if(istype(weather_state))
|
||||
|
||||
Reference in New Issue
Block a user