Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

This commit is contained in:
Poojawa
2019-10-08 02:55:32 -05:00
276 changed files with 4886 additions and 1609 deletions
@@ -5,5 +5,5 @@
. = ..()
if(ishuman(target))
var/mob/living/carbon/human/M = target
M.adjustBrainLoss(20)
M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 20)
M.hallucination += 30