shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2289 from Citadel-Station-13/upstream-merge-29740

Browse Source 
[MIRROR] Fixes Explosive Lattice blobs being way more fragile than they should be
This commit is contained in:
LetterJay
2017-08-07 07:25:53 -05:00
committed by GitHub
parent 814a814299 7e539bfe3b
commit 0f77c62fc5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/blob_reagents.dm
+1 -1
View File
@@ -313,7 +313,7 @@
/datum/reagent/blob/explosive_lattice/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag)
if(damage_flag == "bomb")
return 0
else if(damage_flag != "melee" || damage_flag != "bullet" || damage_flag != "laser")
else if(damage_flag != "melee" && damage_flag != "bullet" && damage_flag != "laser")
return damage * 1.5
return ..()