Revert "Merge branch 'master' into robotic-limbs-PT2"

This reverts commit 73b5267425, reversing
changes made to 2e780bfff2.
This commit is contained in:
DeltaFire
2020-10-11 00:51:39 +02:00
parent c5bb85d794
commit 27a099c6bf
207 changed files with 3486 additions and 8567 deletions
@@ -484,12 +484,12 @@
return FALSE
var/list/D = holder.get_data("blood")
if(D && D["changeling_loudness"])
return (D["changeling_loudness"] >= LINGBLOOD_DETECTION_THRESHOLD ? D["changeling_loudness"] : FALSE)
return (D["changeling_loudness"] >= 4 ? D["changeling_loudness"] : FALSE)
else
return FALSE
/datum/chemical_reaction/reagent_explosion/lingblood/on_reaction(datum/reagents/holder, multiplier, specialreact)
if(specialreact > LINGBLOOD_EXPLOSION_THRESHOLD)
if(specialreact >= 10)
return ..()
else
return FALSE