From ead3894de6346995dc0f8448311f441e89e88b2d Mon Sep 17 00:00:00 2001 From: Bop Date: Sat, 24 Feb 2024 15:05:41 +0700 Subject: [PATCH 1/2] fix --- code/modules/power/apc.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 215bfb7fab95..1051e6d47e0d 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -242,6 +242,8 @@ /obj/machinery/power/apc/Initialize(mapload) . = ..() + if(!mapload) + return has_electronics = APC_ELECTRONICS_SECURED // is starting with a power cell installed, create it and set its charge level if(cell_type) From e72a11c1b3ec5005e10d1a57158e4c17da960ae9 Mon Sep 17 00:00:00 2001 From: Bop Date: Sat, 24 Feb 2024 16:13:14 +0700 Subject: [PATCH 2/2] ffffff --- code/game/objects/objs.dm | 7 ++++--- code/modules/power/apc.dm | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 686438b8b836..17600b743162 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -276,9 +276,10 @@ bio = text2num(result["values"][BIO]),\ rad = text2num(result["values"][RAD]),\ fire = text2num(result["values"][FIRE]),\ - acid = text2num(result["values"][ACID])) - log_admin("[key_name(usr)] modified the armor on [src] ([type]) to melee: [armor.melee], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], fire: [armor.fire], acid: [armor.acid]") - message_admins(span_notice("[key_name_admin(usr)] modified the armor on [src] ([type]) to melee: [armor.melee], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], fire: [armor.fire], acid: [armor.acid]")) + acid = text2num(result["values"][ACID]),\ + electric = text2num(result["values"][ELECTRIC])) + log_admin("[key_name(usr)] modified the armor on [src] ([type]) to melee: [armor.melee], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], fire: [armor.fire], acid: [armor.acid], electric: [armor.electric]") + message_admins(span_notice("[key_name_admin(usr)] modified the armor on [src] ([type]) to melee: [armor.melee], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], fire: [armor.fire], acid: [armor.acid], electric: [armor.electric]")) if(href_list[VV_HK_MASS_DEL_TYPE]) if(check_rights(R_DEBUG|R_SERVER)) var/action_type = tgui_alert(usr, "Strict type ([type]) or type and all subtypes?",,list("Strict type","Type and subtypes","Cancel")) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 1051e6d47e0d..d176c1302069 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -207,6 +207,7 @@ name = "[area.name] APC" stat |= MAINT addtimer(CALLBACK(src, PROC_REF(update)), 5) + update_appearance(UPDATE_ICON) /obj/machinery/power/apc/Destroy() GLOB.apcs_list -= src