From 93efbde5a9a64a127cfa15c6086b17d5469779d3 Mon Sep 17 00:00:00 2001 From: Jerry Wester Date: Fri, 6 Jan 2023 01:29:50 -0700 Subject: [PATCH] point of locking your modsuit i mean really why --- code/datums/wires/mod.dm | 7 ++----- code/modules/mod/mod_activation.dm | 4 ---- code/modules/mod/mod_control.dm | 8 -------- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/code/datums/wires/mod.dm b/code/datums/wires/mod.dm index 3f04456810..7949d4d5f7 100644 --- a/code/datums/wires/mod.dm +++ b/code/datums/wires/mod.dm @@ -5,8 +5,8 @@ req_skill = JOB_SKILL_TRAINED /datum/wires/mod/New(atom/holder) - wires = list(WIRE_HACK, WIRE_DISABLE, WIRE_SHOCK, WIRE_INTERFACE) - add_duds(2) + wires = list(WIRE_DISABLE, WIRE_SHOCK, WIRE_INTERFACE) + add_duds(3) ..() /datum/wires/mod/interactable(mob/user) @@ -20,15 +20,12 @@ var/list/status = list() status += "The orange light is [mod.seconds_electrified ? "on" : "off"]." status += "The red light is [mod.malfunctioning ? "off" : "blinking"]." - status += "The green light is [mod.locked ? "on" : "off"]." status += "The yellow light is [mod.interface_break ? "off" : "on"]." return status /datum/wires/mod/on_pulse(wire) var/obj/item/mod/control/mod = holder switch(wire) - if(WIRE_HACK) - mod.locked = !mod.locked if(WIRE_DISABLE) mod.malfunctioning = TRUE if(WIRE_SHOCK) diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm index efc5c37c5c..80cf0a3d95 100644 --- a/code/modules/mod/mod_activation.dm +++ b/code/modules/mod/mod_activation.dm @@ -97,10 +97,6 @@ balloon_alert(user, "deploy all parts first!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) return FALSE - if(locked && !active && !allowed(user) && !force_deactivate) - balloon_alert(user, "access insufficient!") - playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) - return FALSE if(!cell?.charge && !force_deactivate) balloon_alert(user, "suit not powered!") playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE) diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index d30b8a235e..dc726a995e 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -44,8 +44,6 @@ var/active = FALSE /// If the suit wire/module hatch is open. var/open = FALSE - /// If the suit is ID locked. - var/locked = FALSE /// If the suit is malfunctioning. var/malfunctioning = FALSE /// If the suit is currently activating/deactivating. @@ -107,8 +105,6 @@ cell_drain = theme.cell_drain initial_modules += theme.inbuilt_modules wires = new /datum/wires/mod(src) - if(length(req_access)) - locked = TRUE if(ispath(cell)) cell = new cell(src) helmet = new /obj/item/clothing/head/helmet/space/mod(src) @@ -365,10 +361,6 @@ if(open) return cell -/obj/item/mod/control/emag_act(mob/user) - locked = !locked - balloon_alert(user, "[locked ? "locked" : "unlocked"]") - /obj/item/mod/control/emp_act(severity) . = ..() to_chat(wearer, span_notice("[severity > 1 ? "Light" : "Strong"] electromagnetic pulse detected!"))