From e847f5bb33d21cb1611051b557b226d54fc921c3 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 5 Oct 2018 15:26:10 -0500 Subject: [PATCH 1/2] Increases APC health and damage resistance values --- code/modules/power/apc.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 2cfeec0276..cdd5aa3689 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -52,7 +52,7 @@ icon_state = "apc0" use_power = NO_POWER_USE req_access = null - max_integrity = 200 + max_integrity = 300 integrity_failure = 50 resistance_flags = FIRE_PROOF interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON @@ -150,7 +150,7 @@ if (!req_access) req_access = list(ACCESS_ENGINE_EQUIP) if (!armor) - armor = list("melee" = 20, "bullet" = 20, "laser" = 10, "energy" = 100, "bomb" = 30, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50) + armor = list("melee" = 40, "bullet" = 40, "laser" = 40, "energy" = 100, "bomb" = 30, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50) ..() GLOB.apcs_list += src From 21d31c57634fbab0cfb470b55c283cfb96a3a12f Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 5 Oct 2018 15:30:51 -0500 Subject: [PATCH 2/2] Gives APCs inherent damage resistance/deflection --- code/modules/power/apc.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index cdd5aa3689..7c377ffa22 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -54,6 +54,7 @@ req_access = null max_integrity = 300 integrity_failure = 50 + var/damage_deflection = 10 resistance_flags = FIRE_PROOF interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON @@ -742,6 +743,11 @@ if(!(flags_1 & NODECONSTRUCT_1)) set_broken() +/obj/machinery/power/apc/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) + if(damage_flag == "melee" && damage_amount < damage_deflection) + return 0 + . = ..() + /obj/machinery/power/apc/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) if(!(stat & BROKEN))