diff --git a/code/game/atom/atom_examine.dm b/code/game/atom/atom_examine.dm index 7a4356bfb85..25368452ad8 100644 --- a/code/game/atom/atom_examine.dm +++ b/code/game/atom/atom_examine.dm @@ -16,14 +16,15 @@ * - is_adjacent - Whether `user` is adjacent to `src` * - infix String - String that is appended immediately after the atom's name * - suffix String - Additional string appended after the atom's name and infix + * - show_extended Boolean - Whether to show extended examination text or not. Only passed to get_examine_text() * * Returns boolean - The caller always expects TRUE */ -/atom/proc/examine(mob/user, distance, is_adjacent, infix = "", suffix = "") +/atom/proc/examine(mob/user, distance, is_adjacent, infix = "", suffix = "", show_extended) SHOULD_CALL_PARENT(TRUE) SHOULD_NOT_SLEEP(TRUE) - var/list/examine_strings = get_examine_text(user, distance, is_adjacent, infix, suffix) + var/list/examine_strings = get_examine_text(user, distance, is_adjacent, infix, suffix, show_extended) if(!length(examine_strings)) crash_with("Examine called with no examine strings on [src].") to_chat(user, EXAMINE_BLOCK(examine_strings.Join("\n"))) @@ -42,10 +43,11 @@ * - is_adjacent - Whether `user` is adjacent to `src` * - infix String - String that is appended immediately after the atom's name * - suffix String - Additional string appended after the atom's name and infix + * - show_extended Boolean - Whether to show extended examination text or not. If FALSE, will only show the existence of this text. * * Returns a `/list` of strings */ -/atom/proc/get_examine_text(mob/user, distance, is_adjacent, infix = "", suffix = "") +/atom/proc/get_examine_text(mob/user, distance, is_adjacent, infix = "", suffix = "", show_extended) SHOULD_CALL_PARENT(TRUE) SHOULD_NOT_SLEEP(TRUE) @@ -67,49 +69,28 @@ . += src.desc // Object description. // Extra object descriptions examination code. - if(desc_extended || desc_info || (desc_antag && player_is_antag(user.mind))) // Checks if the object has a extended description, a mechanics description, and/or an antagonist description (and if the user is an antagonist). - . += FONT_SMALL(SPAN_NOTICE("\[?\] This object has additional examine information available. \[Show In Chat\]")) // If any of the above are true, show that the object has more information available. - if(desc_extended) // If the item has a extended description, show that it is available. - . += FONT_SMALL("- This object has an extended description.") - if(desc_info) // If the item has a description regarding game mechanics, show that it is available. - . += FONT_SMALL(SPAN_NOTICE("- This object has additional information about mechanics.")) - if(desc_antag && player_is_antag(user.mind)) // If the item has an antagonist description and the user is an antagonist, show that it is available. - . += FONT_SMALL(SPAN_ALERT("- This object has additional information for antagonists.")) + if(show_extended) + if(desc_extended) // If the item has a extended description, show it. + . += desc_extended + if(desc_info) // If the item has a description regarding game mechanics, show it. + . += FONT_SMALL(SPAN_NOTICE("- [desc_info]")) + if(desc_antag && player_is_antag(user.mind)) // If the item has an antagonist description and the user is an antagonist, show it. + . += FONT_SMALL(SPAN_ALERT("- [desc_antag]")) + else + if(desc_extended || desc_info || (desc_antag && player_is_antag(user.mind))) // Checks if the object has a extended description, a mechanics description, and/or an antagonist description (and if the user is an antagonist). + . += FONT_SMALL(SPAN_NOTICE("\[?\] This object has additional examine information available. \[Show In Chat\]")) // If any of the above are true, show that the object has more information available. + if(desc_extended) // If the item has a extended description, show that it is available. + . += FONT_SMALL("- This object has an extended description.") + if(desc_info) // If the item has a description regarding game mechanics, show that it is available. + . += FONT_SMALL(SPAN_NOTICE("- This object has additional information about mechanics.")) + if(desc_antag && player_is_antag(user.mind)) // If the item has an antagonist description and the user is an antagonist, show that it is available. + . += FONT_SMALL(SPAN_ALERT("- This object has additional information for antagonists.")) if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.glasses) H.glasses.glasses_examine_atom(src, H) -// Same as examine(), but without the "this object has more info" thing and with the extra information instead. -/atom/proc/examine_fluff(mob/user, distance, is_adjacent, infix = "", suffix = "") - var/f_name = "\a [src][infix]." - if(src.blood_DNA && !istype(src, /obj/effect/decal)) - if(gender == PLURAL) - f_name = "some " - else - f_name = "a " - if(blood_color != "#030303") - f_name += "blood-stained [name][infix]!" - else - f_name += "oil-stained [name][infix]." - - to_chat(user, "[icon2html(src, user)] That's [f_name] [suffix]") // Object name. I.e. "This is an Object." - to_chat(user, desc) // Object description. - if(desc_extended) // If the item has a extended description, show it. - to_chat(user, desc_extended) - if(desc_info) // If the item has a description regarding game mechanics, show it. - to_chat(user, FONT_SMALL(SPAN_NOTICE("- [desc_info]"))) - if(desc_antag && player_is_antag(user.mind)) // If the item has an antagonist description and the user is an antagonist, show it. - to_chat(user, FONT_SMALL(SPAN_ALERT("- [desc_antag]"))) - - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.glasses) - H.glasses.glasses_examine_atom(src, H) - - return TRUE - // Used to check if "examine_fluff" from the HTML link in examine() is true, i.e. if it was clicked. /atom/Topic(href, href_list) . = ..() diff --git a/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm b/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm index f91c291009f..c59e252526a 100644 --- a/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm +++ b/code/game/gamemodes/endgame/bluespace_jump/bluespace_jump.dm @@ -102,7 +102,7 @@ /obj/effect/bluegoast/proc/mirror_dir(var/atom/movable/am, var/old_dir, var/new_dir) set_dir(GLOB.reverse_dir[new_dir]) -/obj/effect/bluegoast/examine() +/obj/effect/bluegoast/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) SHOULD_CALL_PARENT(FALSE) return daddy?.examine(arglist(args)) diff --git a/code/game/gamemodes/technomancer/spell_objs.dm b/code/game/gamemodes/technomancer/spell_objs.dm index 8e0a0473827..05c02e9d599 100644 --- a/code/game/gamemodes/technomancer/spell_objs.dm +++ b/code/game/gamemodes/technomancer/spell_objs.dm @@ -43,7 +43,7 @@ var/cast_sound = null // Sound file played when this is used. var/psi_cost = 0 // Psi complexus cost to use this spell. -/obj/item/spell/examine(mob/user, distance) // Nothing on examine. +/obj/item/spell/examine(mob/user, distance, is_adjacent, show_extended) // Nothing on examine. SHOULD_CALL_PARENT(FALSE) return TRUE diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 9f8d41fe9e9..90c4db44f41 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -338,7 +338,7 @@ I.forceMove(T) -/obj/item/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) +/obj/item/get_examine_text(mob/user, distance, is_adjacent, infix, suffix, get_extended = FALSE) var/size switch(src.w_class) if (ITEMSIZE_HUGE to INFINITY) diff --git a/code/game/objects/items/devices/slide_projector.dm b/code/game/objects/items/devices/slide_projector.dm index 992aa75e691..97749c9f888 100644 --- a/code/game/objects/items/devices/slide_projector.dm +++ b/code/game/objects/items/devices/slide_projector.dm @@ -171,13 +171,13 @@ desc = "It's currently showing \the [I]." update_icon() -/obj/effect/projection/examine(mob/user, distance, is_adjacent) +/obj/effect/projection/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() var/obj/item/slide = source.resolve() if(!istype(slide)) qdel(src) return - return slide.examine(user, max(distance, 1), FALSE) + return slide.examine(user, max(distance, 1), FALSE, show_extended = show_extended) /obj/effect/projection/photo alpha = 170 diff --git a/code/game/objects/items/holomenu.dm b/code/game/objects/items/holomenu.dm index f8b667f635c..9b0243ca88e 100644 --- a/code/game/objects/items/holomenu.dm +++ b/code/game/objects/items/holomenu.dm @@ -73,7 +73,7 @@ return TRUE return ..() -/obj/item/holomenu/examine(mob/user, distance, is_adjacent) +/obj/item/holomenu/examine(mob/user, distance, is_adjacent, show_extended) if(anchored && length(menu_text)) interact(user) return TRUE diff --git a/code/game/objects/items/lore_radio.dm b/code/game/objects/items/lore_radio.dm index cff9f575559..b091159ee89 100644 --- a/code/game/objects/items/lore_radio.dm +++ b/code/game/objects/items/lore_radio.dm @@ -17,7 +17,7 @@ toggle_receiving() RegisterSignal(SSdcs, COMSIG_GLOB_LORE_RADIO_BROADCAST, PROC_REF(relay_lore_radio)) -/obj/item/lore_radio/examine(var/mob/user) +/obj/item/lore_radio/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() to_chat(user, SPAN_NOTICE("\The [src] is turned [receiving ? "on" : "off"].")) if(current_station) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 559116e3224..3fac4e551f5 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -129,7 +129,7 @@ var/const/NO_EMAG_ACT = -50 . = ..() GC_TEMPORARY_HARDDEL -/obj/item/card/id/examine(mob/user, distance) +/obj/item/card/id/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() if (distance <= 1) show(user) diff --git a/code/game/objects/items/weapons/implants/implants/circuit.dm b/code/game/objects/items/weapons/implants/implants/circuit.dm index 8933920ff79..2df87d953fc 100644 --- a/code/game/objects/items/weapons/implants/implants/circuit.dm +++ b/code/game/objects/items/weapons/implants/implants/circuit.dm @@ -38,10 +38,10 @@ IC.emp_act(severity) -/obj/item/implant/integrated_circuit/examine(mob/user, distance, is_adjacent) +/obj/item/implant/integrated_circuit/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) SHOULD_CALL_PARENT(FALSE) - return IC.examine(user, distance, is_adjacent) + return IC.examine(user, distance, is_adjacent, infix, suffix, show_extended) /obj/item/implant/integrated_circuit/attackby(obj/item/attacking_item, mob/user) if(attacking_item.iscrowbar() || istype(attacking_item, /obj/item/device/integrated_electronics) || istype(attacking_item, /obj/item/integrated_circuit) || attacking_item.isscrewdriver() || istype(attacking_item, /obj/item/cell/device) ) diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm index d7fea0788c0..aacb97bd533 100644 --- a/code/game/objects/items/weapons/storage/wallets.dm +++ b/code/game/objects/items/weapons/storage/wallets.dm @@ -121,7 +121,7 @@ return ..() -/obj/item/storage/wallet/examine(mob/user, distance, is_adjacent) +/obj/item/storage/wallet/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() var/obj/item/card/id/id = GetID() if(istype(id) && is_adjacent) diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index c94b236208d..8ae65a19eef 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -102,10 +102,10 @@ . = ..() item_flags |= ITEM_FLAG_NO_BLUDGEON -/obj/item/ducttape/examine(mob/user) +/obj/item/ducttape/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) SHOULD_CALL_PARENT(FALSE) - return stuck.examine(user) + return stuck.examine(user, distance, is_adjacent, infix, suffix, show_extended) /obj/item/ducttape/proc/attach(var/obj/item/W) stuck = W diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 2c39cd8ff67..7e4d3cb37ef 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -259,10 +259,10 @@ return ..() -/obj/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) +/obj/get_examine_text(mob/user, distance, is_adjacent, infix, suffix, get_extended = FALSE) . = ..() if((obj_flags & OBJ_FLAG_ROTATABLE) || (obj_flags & OBJ_FLAG_ROTATABLE_ANCHORED)) - . += SPAN_SUBTLE("Can be rotated with alt-click.") + . += SPAN_SUBTLE("Can be rotated with alt-click.") if(contaminated) . += SPAN_ALIEN("\The [src] has been contaminated!") diff --git a/code/game/objects/structures/ECD.dm b/code/game/objects/structures/ECD.dm index a2f51a3ce07..ef8289b31c3 100644 --- a/code/game/objects/structures/ECD.dm +++ b/code/game/objects/structures/ECD.dm @@ -13,7 +13,7 @@ slowdown = 10 layer = ABOVE_HUMAN_LAYER -/obj/structure/ecd/examine(mob/living/user, distance) +/obj/structure/ecd/examine(mob/living/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() switch(state) if(ECD_LOOSE) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 44304994fd7..ee1c53edf30 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -34,7 +34,7 @@ // Since Topic() never seems to interact with usr on more than a superficial // level, it should be fine to let anyone mess with the board other than ghosts. -/obj/structure/noticeboard/examine(mob/user, distance, is_adjacent, infix, suffix) +/obj/structure/noticeboard/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) if(is_adjacent) var/dat = "Noticeboard
" for(var/obj/item/paper/P in src) diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index ff27603e141..cbd5331c6a3 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -698,7 +698,7 @@ beds++ AddOverlays(I) -/obj/structure/roller_rack/examine(mob/user) +/obj/structure/roller_rack/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) desc = "[initial(desc)] \nIt is holding [LAZYLEN(held)] beds." . = ..() diff --git a/code/game/objects/structures/therapy.dm b/code/game/objects/structures/therapy.dm index defd16ee230..d66c22632f9 100644 --- a/code/game/objects/structures/therapy.dm +++ b/code/game/objects/structures/therapy.dm @@ -22,7 +22,7 @@ playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1) closed = !closed -/obj/item/pocketwatch/examine(mob/user, distance, is_adjacent) +/obj/item/pocketwatch/examine(mob/user, distance, is_adjacent, show_extended) . = ..() if (distance <= 1) checktime() diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index d2ab915a5ae..caaec8f7f71 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -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) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 6d71d102c5a..37d572b4c79 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -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 diff --git a/code/modules/clothing/wrists/watches.dm b/code/modules/clothing/wrists/watches.dm index 4b5d40b1b4f..d4a44c1bd69 100644 --- a/code/modules/clothing/wrists/watches.dm +++ b/code/modules/clothing/wrists/watches.dm @@ -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() diff --git a/code/modules/detectivework/tools/evidencebag.dm b/code/modules/detectivework/tools/evidencebag.dm index bc46cc4b06b..f55980a691f 100644 --- a/code/modules/detectivework/tools/evidencebag.dm +++ b/code/modules/detectivework/tools/evidencebag.dm @@ -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)) diff --git a/code/modules/integrated_electronics/core/assemblies/clothing.dm b/code/modules/integrated_electronics/core/assemblies/clothing.dm index 4d9e40549b4..19e9f65585c 100644 --- a/code/modules/integrated_electronics/core/assemblies/clothing.dm +++ b/code/modules/integrated_electronics/core/assemblies/clothing.dm @@ -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) . = ..() diff --git a/code/modules/integrated_electronics/core/device.dm b/code/modules/integrated_electronics/core/device.dm index c7051265018..cf2111c40a3 100644 --- a/code/modules/integrated_electronics/core/device.dm +++ b/code/modules/integrated_electronics/core/device.dm @@ -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) diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm index 233d3931b60..2eea4b8eaca 100644 --- a/code/modules/integrated_electronics/core/integrated_circuit.dm +++ b/code/modules/integrated_electronics/core/integrated_circuit.dm @@ -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) . = ..() diff --git a/code/modules/mob/abstract/freelook/eye.dm b/code/modules/mob/abstract/freelook/eye.dm index b900d926335..89ee413e9f6 100644 --- a/code/modules/mob/abstract/freelook/eye.dm +++ b/code/modules/mob/abstract/freelook/eye.dm @@ -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 diff --git a/code/modules/mob/examinations.dm b/code/modules/mob/examinations.dm index d33b7318168..f69a17bd475 100644 --- a/code/modules/mob/examinations.dm +++ b/code/modules/mob/examinations.dm @@ -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)]") diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 658f4bdec58..45c901f5b16 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -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() diff --git a/code/modules/mob/living/silicon/robot/items/gripper.dm b/code/modules/mob/living/silicon/robot/items/gripper.dm index ec8ff84e8bf..bf9510ad871 100644 --- a/code/modules/mob/living/silicon/robot/items/gripper.dm +++ b/code/modules/mob/living/silicon/robot/items/gripper.dm @@ -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) . = ..() diff --git a/code/modules/mob/living/silicon/robot/items/robot_tools.dm b/code/modules/mob/living/silicon/robot/items/robot_tools.dm index 0c8118dbdd9..ccdbbfcbb1e 100644 --- a/code/modules/mob/living/silicon/robot/items/robot_tools.dm +++ b/code/modules/mob/living/silicon/robot/items/robot_tools.dm @@ -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)]")) diff --git a/code/modules/mob/living/simple_animal/hostile/morph.dm b/code/modules/mob/living/simple_animal/hostile/morph.dm index 12c4cfa7237..6745e0b5091 100644 --- a/code/modules/mob/living/simple_animal/hostile/morph.dm +++ b/code/modules/mob/living/simple_animal/hostile/morph.dm @@ -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 diff --git a/code/modules/mob/living/simple_animal/illusion.dm b/code/modules/mob/living/simple_animal/illusion.dm index ebc433a0d31..97757a1c88d 100644 --- a/code/modules/mob/living/simple_animal/illusion.dm +++ b/code/modules/mob/living/simple_animal/illusion.dm @@ -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("???") diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm index 95b5b59f34c..deadb4b2890 100644 --- a/code/modules/modular_computers/computers/modular_computer/interaction.dm +++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm @@ -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) diff --git a/code/modules/multiz/zmimic/mimic_movable.dm b/code/modules/multiz/zmimic/mimic_movable.dm index 01367850f6b..6e3af257280 100644 --- a/code/modules/multiz/zmimic/mimic_movable.dm +++ b/code/modules/multiz/zmimic/mimic_movable.dm @@ -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) diff --git a/code/modules/overmap/ship_weaponry/_ship_gun.dm b/code/modules/overmap/ship_weaponry/_ship_gun.dm index b1fecd458d0..d11416bc0f8 100644 --- a/code/modules/overmap/ship_weaponry/_ship_gun.dm +++ b/code/modules/overmap/ship_weaponry/_ship_gun.dm @@ -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 diff --git a/code/modules/psionics/abilities/mirror_shade.dm b/code/modules/psionics/abilities/mirror_shade.dm index 78418bd9d72..7f9cfc8abdd 100644 --- a/code/modules/psionics/abilities/mirror_shade.dm +++ b/code/modules/psionics/abilities/mirror_shade.dm @@ -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) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 00d206126b9..bc2c3642439 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -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 diff --git a/code/modules/weather/_weather.dm b/code/modules/weather/_weather.dm index 6ee73c77347..29513f89cbe 100644 --- a/code/modules/weather/_weather.dm +++ b/code/modules/weather/_weather.dm @@ -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)) diff --git a/html/changelogs/GeneralCamo - Fluff Examine fix.yml b/html/changelogs/GeneralCamo - Fluff Examine fix.yml new file mode 100644 index 00000000000..00623a40df0 --- /dev/null +++ b/html/changelogs/GeneralCamo - Fluff Examine fix.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: GeneralCamo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fluff examine text now shows in an examine box." diff --git a/maps/random_ruins/exoplanets/moghes/moghes_memorial.dm b/maps/random_ruins/exoplanets/moghes/moghes_memorial.dm index be7962a3912..9e37592db77 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_memorial.dm +++ b/maps/random_ruins/exoplanets/moghes/moghes_memorial.dm @@ -19,7 +19,7 @@ pixel_x = -16 layer = ABOVE_HUMAN_LAYER -/obj/structure/sign/moghes_memorial/examine(mob/user) +/obj/structure/sign/moghes_memorial/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() if(GLOB.all_languages[LANGUAGE_UNATHI] in user.languages) to_chat(user, SPAN_NOTICE("The inscription on the monolith reads as follows: \"This is the fifteen thousand six hundred and eighty-sixth monument erected by the Keepers of Heirlooms, \ diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_tomb.dm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_tomb.dm index 20453b31764..890e6b82c5d 100644 --- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_tomb.dm +++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_tomb.dm @@ -44,25 +44,25 @@ desc = "An ancient monolith, with carvings in what looks like Sinta'Azaziba." color = "#99957d" -/obj/structure/monolith/unathitomb/examine(mob/user) +/obj/structure/monolith/unathitomb/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() if(GLOB.all_languages[LANGUAGE_AZAZIBA] in user.languages) to_chat(user, SPAN_NOTICE("The monolith tells of the rise of an ancient kingdom, in the years before the First Hegemony. Once, they ruled these lands with justice and fairness, and times were prosperous.")) /obj/structure/monolith/unathitomb/lineage -/obj/structure/monolith/unathitomb/lineage/examine(mob/user) +/obj/structure/monolith/unathitomb/lineage/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() if(GLOB.all_languages[LANGUAGE_AZAZIBA] in user.languages) to_chat(user, SPAN_NOTICE("The monolith lists the names of the kingdom's ruling clan, the Vhrakis, and the year and manner of their death. It dates for centuries, but most of the more recent entries are related to war, plague and famine.")) /obj/structure/monolith/unathitomb/death -/obj/structure/monolith/unathitomb/death/examine(mob/user) +/obj/structure/monolith/unathitomb/death/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() if(GLOB.all_languages[LANGUAGE_AZAZIBA] in user.languages) to_chat(user, SPAN_NOTICE("This monolith tells of a great plague which ravaged the Vhrakis Kingdom, and led to its enemies falling upon it with sword. The last King Vhrakis, seeing his homeland fall and his clan slaughtered, chose to end his own life with honor within the tomb of his ancestors.")) /obj/structure/monolith/unathitomb/king -/obj/structure/monolith/unathitomb/king/examine(mob/user) +/obj/structure/monolith/unathitomb/king/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() if(GLOB.all_languages[LANGUAGE_AZAZIBA] in user.languages) to_chat(user, SPAN_NOTICE("The monolith is written in a different claw to the others. It reads \"With me dies the line of Vhrakis, at last conquered by death. To you Sinta of the future, who know not famine or war, I ask only that our name is remembered, and that my bones are left in peace. Should you violate this, may the spirits of my clan and kingdom bring vengeance upon you.\"")) diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_rev_memorial.dm b/maps/random_ruins/exoplanets/ouerea/ouerea_rev_memorial.dm index 2b6f7929865..2554b247b8f 100644 --- a/maps/random_ruins/exoplanets/ouerea/ouerea_rev_memorial.dm +++ b/maps/random_ruins/exoplanets/ouerea/ouerea_rev_memorial.dm @@ -18,7 +18,7 @@ pixel_x = -16 layer = ABOVE_HUMAN_LAYER -/obj/structure/sign/ouerea_memorial/examine(mob/user) +/obj/structure/sign/ouerea_memorial/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() if(GLOB.all_languages[LANGUAGE_UNATHI] in user.languages) to_chat(user, SPAN_NOTICE("The inscription on the monolith reads as follows. \"Let this monument stand, to honor those of us who fought for a world free from the grasping claws of foreign masters. \ diff --git a/maps/random_ruins/exoplanets/uueoaesa/izweski_probe.dm b/maps/random_ruins/exoplanets/uueoaesa/izweski_probe.dm index 569d0e97e97..b2b9d49fc28 100644 --- a/maps/random_ruins/exoplanets/uueoaesa/izweski_probe.dm +++ b/maps/random_ruins/exoplanets/uueoaesa/izweski_probe.dm @@ -15,7 +15,7 @@ desc_extended = "This model of survey probe seems to be very old. A plaque on the side bears some words in Sinta'Unathi beneath the seal of the Izweski Hegemony." start_deployed = TRUE -/obj/structure/survey_probe/hegemony/old/examine(mob/user) +/obj/structure/survey_probe/hegemony/old/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) . = ..() if(GLOB.all_languages[LANGUAGE_UNATHI] in user.languages) to_chat(user, SPAN_NOTICE("The probe's plaque identifies it as property of the Izweski Hegemony Extraterrestrial Surveying Guild - a space exploration guild dissolved shortly following First Contact. The date displayed on the ancient screen would read as 2361 by the common human calendar."))