Merge pull request #16579 from FlattestGuitar/armor-defines

Adds defines for damage flags
This commit is contained in:
variableundefined
2021-09-17 22:10:20 -05:00
committed by GitHub
181 changed files with 458 additions and 450 deletions
+1 -1
View File
@@ -69,7 +69,7 @@
icon_state = "particle"
damage = 60
damage_type = BRUTE
flag = "bullet"
flag = BULLET
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
weaken = 5
@@ -190,7 +190,7 @@
icon_state = null
damage = 40
damage_type = BRUTE
flag = "bomb"
flag = BOMB
range = 3
var/pressure_decrease_active = FALSE
+1 -1
View File
@@ -35,7 +35,7 @@
var/tile_dropoff_s = 0 //same as above but for stamina
var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here
var/nodamage = FALSE //Determines if the projectile will skip any damage inflictions
var/flag = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb //Cael - bio and rad are also valid
var/flag = BULLET //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb //Cael - bio and rad are also valid
var/projectile_type = "/obj/item/projectile"
var/range = 50 //This will de-increment every step. When 0, it will delete the projectile.
var/is_reflectable = FALSE // Can it be reflected or not?
+2 -2
View File
@@ -5,7 +5,7 @@
damage_type = OXY
nodamage = 1
armour_penetration = 100
flag = "magic"
flag = MAGIC
/obj/item/projectile/magic/death
name = "bolt of death"
@@ -367,5 +367,5 @@
damage_type = BURN
nodamage = FALSE
armour_penetration = 0
flag = "magic"
flag = MAGIC
hitsound = 'sound/weapons/barragespellhit.ogg'