Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 32e5ffa

Browse files
Fix apc building and unnable to change electric armor value from VV (#21508)
* fix * ffffff
1 parent f0e202c commit 32e5ffa

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

code/game/objects/objs.dm

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,10 @@
279279
bio = text2num(result["values"][BIO]),\
280280
rad = text2num(result["values"][RAD]),\
281281
fire = text2num(result["values"][FIRE]),\
282-
acid = text2num(result["values"][ACID]))
283-
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]")
284-
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]"))
282+
acid = text2num(result["values"][ACID]),\
283+
electric = text2num(result["values"][ELECTRIC]))
284+
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]")
285+
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]"))
285286
if(href_list[VV_HK_MASS_DEL_TYPE])
286287
if(check_rights(R_DEBUG|R_SERVER))
287288
var/action_type = tgui_alert(usr, "Strict type ([type]) or type and all subtypes?",,list("Strict type","Type and subtypes","Cancel"))

code/modules/power/apc.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@
207207
name = "[area.name] APC"
208208
stat |= MAINT
209209
addtimer(CALLBACK(src, PROC_REF(update)), 5)
210+
update_appearance(UPDATE_ICON)
210211

211212
/obj/machinery/power/apc/Destroy()
212213
GLOB.apcs_list -= src
@@ -242,6 +243,8 @@
242243

243244
/obj/machinery/power/apc/Initialize(mapload)
244245
. = ..()
246+
if(!mapload)
247+
return
245248
has_electronics = APC_ELECTRONICS_SECURED
246249
// is starting with a power cell installed, create it and set its charge level
247250
if(cell_type)

0 commit comments

Comments
 (0)