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

Fix apc building and unnable to change electric armor value from VV #21508

Merged
JamieD1 merged 2 commits into from
Feb 25, 2024
Merged

Fix apc building and unnable to change electric armor value from VV #21508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ead3894
fix
warface1234455 Feb 24, 2024
e72a11c
ffffff
warface1234455 Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions code/game/objects/objs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
3 changes: 3 additions & 0 deletions code/modules/power/apc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -242,6 +243,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)
Expand Down