cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16579 from FlattestGuitar/armor-defines

Browse Source 
Adds defines for damage flags
This commit is contained in:
variableundefined
2021-09-17 22:10:20 -05:00
committed by GitHub
parent a271eb71a6 00dedfe6a9
commit fa3fa1dc6a
181 changed files with 458 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures.dm
+2 -2
View File
@@ -21,7 +21,7 @@
/obj/structure/Initialize(mapload)
if(!armor)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50)
return ..()
/obj/structure/Destroy()
@@ -171,6 +171,6 @@
/obj/structure/zap_act(power, zap_flags)
if(zap_flags & ZAP_OBJ_DAMAGE)
take_damage(power / 8000, BURN, "energy")
take_damage(power / 8000, BURN, ENERGY)
power -= power / 2000 //walls take a lot out of ya
. = ..()