cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4558 from VOREStation/upstream-merge-5760

Browse Source 
[MIRROR] Adds BIOACID damage type
This commit is contained in:
Spades
2019-03-02 08:10:04 -05:00
committed by GitHub
parent bd8c62bde8 2eac9ec282
commit d47c2366de
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/projectiles/projectile/energy.dm
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"