reverts ui_interaction on examine and returns it to examine_more. Sti…

…ll a little iffy on this.
shiptest-ss13 · Jan 17, 2025 · fdb1c95 · fdb1c95
1 parent 4870394
commit fdb1c95
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 6 deletions.
diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm
@@ -124,7 +124,7 @@
 	if(!user.canUseTopic(src, !issilicon(user)) || !is_operational)
 		return
 
-/obj/machinery/computer/examine(mob/user)
+/obj/machinery/computer/examine_more(mob/user)
 	. = ..()
 	ui_interact(user)
 	return
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
@@ -44,10 +44,9 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 		ui = new(user, src, "CrewConsole")
 		ui.open()
 
-/obj/machinery/computer/crew/examine(mob/user)
+/obj/machinery/computer/crew/examine_more(mob/user)
 	. = ..()
 	interact(user)
-	return
 
 /datum/crewmonitor/ui_close(mob/user)
 	ui_sources -= user

diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
@@ -32,6 +32,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 31)
 		. += "<span class='notice'>It's <b>screwed</b> and secured to the wall.</span>"
 	else
 		. += "<span class='notice'>It's <i>unscrewed</i> from the wall, and can be <b>detached</b>.</span>"
+
+/obj/item/radio/intercom/wideband/examine_more(mob/user)
+	. = ..()
 	interact(user)
 
 /obj/item/radio/intercom/attackby(obj/item/I, mob/living/user, params)

diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
@@ -263,7 +263,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
 			. += "<span class='notice'>It is missing wiring.</span>"
 		if(2)
 			. += "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"] the interface.</span>"
-			ui_interact(user)
+
+/obj/machinery/airalarm/examine_more(mob/user)
+	. = ..()
+	if(buildstage == 2)
+		ui_interact(user)
+
 
 /obj/machinery/airalarm/ui_status(mob/user)
 	if(user.has_unlimited_silicon_privilege && aidisabled)

diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm
@@ -27,6 +27,9 @@
 	. = ..()
 	if(screen_on)
 		. += "<span class='notice'>Alt-click to close it.</span>"
+
+/obj/item/modular_computer/laptop/examine_more(mob/user)
+	. = ..()
 	if(screen_on && enabled)
 		interact(user)
 

diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm
@@ -23,7 +23,8 @@
 		icon_state = icon_state_powered = icon_state_unpowered = "[base_icon_state]-[finish_color]"
 	return ..()
 
-/obj/item/modular_computer/tablet/examine(mob/user)
+/obj/item/modular_computer/tablet/examine_more(mob/user)
+	. = ..()
 	if(screen_on && enabled)
 		interact(user)
 

diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm
@@ -39,6 +39,9 @@
 /obj/machinery/modular_computer/examine(mob/user)
 	. = ..()
 	. += get_modular_computer_parts_examine(user)
+
+/obj/machinery/modular_computer/examine_more(mob/user)
+	. = ..()
 	if(cpu.enabled)
 		interact(user)
 

diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
@@ -326,13 +326,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/auto_name, 25)
 			. += "The cover is broken. It may be hard to force it open."
 		else
 			. += "The cover is closed."
-			ui_interact(user)
 
 	. += "<span class='notice'>Alt-Click the APC to [ locked ? "unlock" : "lock"] the interface.</span>"
 
 	if(issilicon(user))
 		. += "<span class='notice'>Ctrl-Click the APC to switch the breaker [ operating ? "off" : "on"].</span>"
 
+/obj/machinery/power/apc/examine_more(mob/user)
+	. = ..()
+	ui_interact(user)
+
 // update the APC icon to show the three base states
 // also add overlays for indicator lights
 /obj/machinery/power/apc/update_appearance(updates=check_updates())