Merge pull request #5760 from Anewbe/bioacid

Adds BIOACID damage type
This commit is contained in:
Atermonera
2018-12-06 13:19:05 -08:00
committed by GitHub
3 changed files with 11 additions and 2 deletions

View File

@@ -7,6 +7,7 @@
#define CLONE "clone"
#define HALLOSS "halloss"
#define ELECTROCUTE "electrocute"
#define BIOACID "bioacid"
#define CUT "cut"
#define BRUISE "bruise"

View File

@@ -36,6 +36,11 @@
adjustHalLoss(damage * blocked)
if(ELECTROCUTE)
electrocute_act(damage, used_weapon, 1.0, def_zone)
if(BIOACID)
if(isSynthetic())
adjustFireLoss(damage * blocked)
else
adjustToxLoss(damage * blocked)
flash_weak_pain()
updatehealth()
return 1

View File

@@ -123,6 +123,7 @@
damage_type = BURN
agony = 10
check_armour = "bio"
armor_penetration = 25 // It's acid
combustion = FALSE
@@ -130,9 +131,10 @@
name = "neurotoxic spit"
icon_state = "neurotoxin"
damage = 5
damage_type = TOX
damage_type = BIOACID
agony = 80
check_armour = "bio"
armor_penetration = 25 // It's acid-based
combustion = FALSE
@@ -140,9 +142,10 @@
name = "neurotoxic spit"
icon_state = "neurotoxin"
damage = 20
damage_type = TOX
damage_type = BIOACID
agony = 20
check_armour = "bio"
armor_penetration = 25 // It's acid-based
/obj/item/projectile/energy/phoron
name = "phoron bolt"