Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into make-emotes-local

2020-12-02 08:16:22 -08:00
parent 4b8c9e6f85 2f34f2dac5
commit 809e270290
74 changed files with 666 additions and 413 deletions
@@ -109,7 +109,7 @@
 	name = "Alcohol Intolerance"
 	desc = "You take toxin damage from alcohol rather than getting drunk."
 	value = 0
-	mob_trait = TRAIT_NO_ALCOHOL
+	mob_trait = TRAIT_TOXIC_ALCOHOL
 	medical_record_text = "Patient's body does not react properly to ethyl alcohol."

 /datum/quirk/alcohol_intolerance/add()