From d0d1f1bf71efb2726527647f6c2bac3875bee4ee Mon Sep 17 00:00:00 2001 From: 1080pCat <96908085+1080pCat@users.noreply.github.com> Date: Thu, 2 Jul 2026 09:17:33 +1000 Subject: [PATCH] Fixes ORM checking access for extracting materials if the ID wire is hacked (#32135) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update machine_redemption.dm * lin*ers 😠 --- code/modules/mining/machine_redemption.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index a76b31ff8ab..ab1b611001a 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -283,7 +283,7 @@ /obj/machinery/mineral/ore_redemption/emag_act(mob/user) if(emagged) return FALSE - + to_chat(user, SPAN_NOTICE("You short out the ID scanner on [src], allowing anyone to access it.")) scan_id = FALSE emagged = TRUE @@ -326,10 +326,10 @@ /obj/machinery/mineral/ore_redemption/proc/is_electrified() if(!is_powered()) return FALSE - + if(wires.is_cut(WIRE_ELECTRIFY) || !COOLDOWN_FINISHED(src, temp_shock)) return TRUE - + return FALSE // MARK: UI @@ -381,7 +381,7 @@ . = TRUE switch(action) if("sheet", "alloy") - if(!allowed(usr)) + if(scan_id && !allowed(usr)) to_chat(usr, SPAN_WARNING("Required access not found.")) return FALSE var/id = params["id"] @@ -590,7 +590,7 @@ give_points(inserted_type, inserted) SStgui.update_uis(src) -// MARK: Wires +// MARK: Wires /datum/wires/ore_redemption holder_type = /obj/machinery/mineral/ore_redemption wire_count = 3 @@ -642,7 +642,7 @@ var/obj/machinery/mineral/ore_redemption/orm = holder . += "The orange light is [(orm.is_electrified()) ? "off" : "on"]." . += "The red light is [(orm.throw_inventory && orm.is_powered()) ? "off" : "blinking"]." - . += "The ID scanner light is [(orm.scan_id && !orm.emagged && orm.is_powered()) ? "off" : "on"]." + . += "The ID scanner light is [(orm.scan_id && !orm.emagged && orm.is_powered()) ? "on" : "off"]." /obj/machinery/mineral/ore_redemption/get_internal_wires() return wires