From 97c2c10b139748ea8230856ce62475e44f56936e Mon Sep 17 00:00:00 2001 From: FlattestGuitar Date: Sat, 22 Jul 2017 23:53:46 +0200 Subject: [PATCH] o7 --- code/modules/mob/living/carbon/carbon.dm | 2 +- code/modules/mob/living/carbon/human/species/station.dm | 1 - code/modules/reagents/chemistry/reagents/drinks.dm | 2 +- code/modules/reagents/chemistry/reagents/drugs.dm | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index b71374862fb..b50e1b3f394 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1022,7 +1022,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, /*TO DO - If/when stomach organs are introduced, override this at the human level sending the item to the stomach so that different stomachs can handle things in different ways VB*/ -/mob/living/carbon/proc/consume(var/obj/item/weapon/reagent_containers/food/toEat, var/bitesize_override, var/taste = 1) +/mob/living/carbon/proc/consume(var/obj/item/weapon/reagent_containers/food/toEat, var/bitesize_override, var/taste = TRUE) var/this_bite = bitesize_override ? bitesize_override : toEat.bitesize if(!toEat.reagents) return diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 52e2914df8a..33a64d6caf1 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -10,7 +10,6 @@ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS bodyflags = HAS_SKIN_TONE | HAS_BODY_MARKINGS dietflags = DIET_OMNI - taste_sensitivity = TASTE_SENSITIVITY_DULL unarmed_type = /datum/unarmed_attack/punch blurb = "Humanity originated in the Sol system, and over the last five centuries has spread \ colonies across a wide swathe of space. They hold a wide range of forms and creeds.

\ diff --git a/code/modules/reagents/chemistry/reagents/drinks.dm b/code/modules/reagents/chemistry/reagents/drinks.dm index de395b0faac..9a524aa377a 100644 --- a/code/modules/reagents/chemistry/reagents/drinks.dm +++ b/code/modules/reagents/chemistry/reagents/drinks.dm @@ -173,7 +173,7 @@ drink_icon = "nothing" drink_name = "Nothing" drink_desc = "Absolutely nothing." - taste_message = "nothing...how?" + taste_message = "nothing... how?" /datum/reagent/consumable/drink/nothing/on_mob_life(mob/living/M) if(ishuman(M) && M.job in list("Mime")) diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index 0d6fc67db5d..6a4ede5fe50 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -439,7 +439,7 @@ reagent_state = LIQUID color = "#644600" addiction_chance = 30 - taste_message = "puke...or worse" + taste_message = "puke... or worse" /datum/reagent/jenkem/on_mob_life(mob/living/M) M.Dizzy(5)