Merge branch, update to current

This commit is contained in:
Archie
2021-01-08 07:26:35 -03:00
155 changed files with 19439 additions and 18617 deletions
@@ -1743,6 +1743,7 @@ datum/reagent/consumable/ethanol/creme_de_coconut
value = 2
/datum/reagent/consumable/ethanol/peppermint_patty/on_mob_life(mob/living/carbon/M)
M.apply_status_effect(/datum/status_effect/throat_soothed)
M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, BODYTEMP_NORMAL)
..()
@@ -760,6 +760,10 @@
glass_name = "glass of menthol"
glass_desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
/datum/reagent/consumable/menthol/on_mob_life(mob/living/L)
L.apply_status_effect(/datum/status_effect/throat_soothed)
..()
/datum/reagent/consumable/grenadine
name = "Grenadine"
description = "Not cherry flavored!"