mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 10:03:50 +01:00
Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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?
|
||||
|
||||
@@ -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'
|
||||
|
||||
Reference in New Issue
Block a user