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

add defines for damage flags

Browse Source
This commit is contained in:
Mieszko Jedrzejczak
2021-08-20 21:09:21 +02:00
parent df51d7370d
commit 559fa37756
183 changed files with 456 additions and 449 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()
@@ -170,6 +170,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
. = ..()