Merge pull request #937 from Citadel-Station-13/upstream-merge-27148

[MIRROR] Buffs honey
This commit is contained in:
LetterJay
2017-05-14 16:30:51 -04:00
committed by GitHub
2 changed files with 13 additions and 3 deletions
+7 -3
View File
@@ -516,15 +516,19 @@
/datum/reagent/consumable/honey
name = "honey"
id = "honey"
description = "Sweet sweet honey, decays into sugar."
description = "Sweet sweet honey, decays into sugar and has natural healing properties."
color = "#d3a308"
nutriment_factor = 15 * REAGENTS_METABOLISM
metabolization_rate = 1 * REAGENTS_METABOLISM
taste_description = "sweetness"
/datum/reagent/consumable/honey/on_mob_life(mob/living/M)
M.reagents.add_reagent("sugar",3)
if(prob(20))
M.heal_bodypart_damage(3,1)
if(prob(55))
M.adjustBruteLoss(-1*REM, 0)
M.adjustFireLoss(-1*REM, 0)
M.adjustOxyLoss(-1*REM, 0)
M.adjustToxLoss(-1*REM, 0)
..()
/datum/reagent/consumable/mayonnaise
+6
View File
@@ -155,6 +155,12 @@
filling.color = mix_color_from_reagents(reagents.reagent_list)
add_overlay(filling)
/obj/item/weapon/reagent_containers/glass/beaker/jar
name = "honey jar"
desc = "A jar for honey. It can hold up to 50 units of sweet delight."
icon = 'icons/obj/chemical.dmi'
icon_state = "vapour"
/obj/item/weapon/reagent_containers/glass/beaker/large
name = "large beaker"
desc = "A large beaker. Can hold up to 100 units."