shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7627 from Poojawa/patch-3

Browse Source 
APC have Damage Resistance, Health, and armor buffs
This commit is contained in:
deathride58
2018-10-08 18:46:21 -04:00
committed by GitHub
parent e86a6df6f6 21d31c5763
commit 5101377408
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+8 -2
View File
@@ -52,8 +52,9 @@
icon_state = "apc0"
use_power = NO_POWER_USE
req_access = null
max_integrity = 200
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
@@ -150,7 +151,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
@@ -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))