From 16e0dfaaa61fc54b08670ed3c451dc7af491a634 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Sun, 29 Mar 2026 23:40:25 +0200 Subject: [PATCH] Fixes multiple objects calling examine() instead of examinate() (#95553) ## About The Pull Request ``examine()`` merely returns the list of strings to display to the user, ``examinate()`` is the proc that actually displays them to the mob ## Changelog :cl: fix: Fixes press badges and other miscellaneous objects failing to make the user examine them. /:cl: --- code/modules/admin/sound_emitter.dm | 2 +- code/modules/clothing/under/accessories/badges.dm | 4 ++-- code/modules/food_and_drinks/machinery/coffeemaker.dm | 2 +- code/modules/food_and_drinks/machinery/microwave.dm | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/admin/sound_emitter.dm b/code/modules/admin/sound_emitter.dm index 6a71db4f046..b454c37620c 100644 --- a/code/modules/admin/sound_emitter.dm +++ b/code/modules/admin/sound_emitter.dm @@ -47,7 +47,7 @@ //ATTACK GHOST IGNORING PARENT RETURN VALUE /obj/effect/sound_emitter/attack_ghost(mob/user) if(!check_rights_for(user.client, R_SOUND)) - examine(user) + user.examinate(src) return edit_emitter(user) diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm index 96495998567..a267d60217c 100644 --- a/code/modules/clothing/under/accessories/badges.dm +++ b/code/modules/clothing/under/accessories/badges.dm @@ -300,11 +300,11 @@ var/mob/living/interacting_living = interacting_with if(user.combat_mode) playsound(interacting_living, 'sound/items/weapons/throw.ogg', 30) - examine(interacting_living) + interacting_living.examinate(src) to_chat(interacting_living, span_userdanger("[user] shoves the [src] up your face!")) user.visible_message(span_warning("[user] have shoved a [src] into [interacting_living] face.")) else playsound(interacting_living, 'sound/items/weapons/throwsoft.ogg', 20) - examine(interacting_living) + interacting_living.examinate(src) to_chat(interacting_living, span_boldwarning("[user] shows the [src] to you.")) user.visible_message(span_notice("[user] shows a [src] to [interacting_living].")) diff --git a/code/modules/food_and_drinks/machinery/coffeemaker.dm b/code/modules/food_and_drinks/machinery/coffeemaker.dm index 192760ed447..2bfee2504d3 100644 --- a/code/modules/food_and_drinks/machinery/coffeemaker.dm +++ b/code/modules/food_and_drinks/machinery/coffeemaker.dm @@ -353,7 +353,7 @@ if("Eject Cartridge") eject_cartridge(user) if("Examine") - examine(user) + user.examinate(src) if("Take Cup") take_cup(user) if("Take Sugar") diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm index 1dfc3a24362..a9e82ecc73a 100644 --- a/code/modules/food_and_drinks/machinery/microwave.dm +++ b/code/modules/food_and_drinks/machinery/microwave.dm @@ -524,7 +524,7 @@ if(!length(ingredients)) if(HAS_AI_ACCESS(user)) - examine(user) + user.examinate(src) else balloon_alert(user, "it's empty!") return @@ -547,7 +547,7 @@ vampire_charging_enabled = TRUE start_cycle(user) if("examine") - examine(user) + user.examinate(src) /obj/machinery/microwave/wash(clean_types) . = ..()