[MIRROR] Defines damage flags. (Hopefully without 50+ commits) (#491)

* Defines damage flags. (#53158)

* Defines damage flags. (Hopefully without 50+ commits)

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
This commit is contained in:
SkyratBot
2020-08-24 22:52:31 +02:00
committed by GitHub
co-authored by TemporalOroboros
parent a6c3cbb8e3
commit 3bd294f26f
278 changed files with 731 additions and 700 deletions
+2 -2
View File
@@ -16,7 +16,7 @@
/obj/structure/Initialize()
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)
. = ..()
if(smoothing_flags)
QUEUE_SMOOTH(src)
@@ -131,4 +131,4 @@
return "<span class='warning'>It's falling apart!</span>"
/obj/structure/rust_heretic_act()
take_damage(500, BRUTE, "melee", 1)
take_damage(500, BRUTE, MELEE, 1)