diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 14e00a1e..c4e53366 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -55,7 +55,7 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list) GLOB.breasts_size_list = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. - GLOB.genital_fluids_list = list ("Milk", "Water", "Semen", "Femcum") + GLOB.genital_fluids_list = list ("Milk", "Water", "Semen", "Femcum", "Honey") GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger") for(var/K in GLOB.breasts_shapes_list) var/datum/sprite_accessory/breasts/value = GLOB.breasts_shapes_list[K] diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 114f2416..6c0e8863 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -840,6 +840,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Semen" if(/datum/reagent/consumable/femcum) dat += "Femcum" + if(/datum/reagent/consumable/alienhoney) + dat += "Femcum" else dat += "Nothing?" //This else is a safeguard for errors, and if it happened, they wouldn't be able to change this pref, @@ -883,6 +885,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "Semen" if(/datum/reagent/consumable/femcum) dat += "Femcum" + if(/datum/reagent/consumable/alienhoney) + dat += "Honey" else dat += "Nothing?" //This else is a safeguard for errors, and if it happened, they wouldn't be able to change this pref, @@ -2184,6 +2188,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) features["balls_fluid"] = /datum/reagent/consumable/semen if("Femcum") features["balls_fluid"] = /datum/reagent/consumable/femcum + if("Honey") + features["balls_fluid"] = /datum/reagent/consumable/alienhoney if("egg_size") var/new_size @@ -2218,13 +2224,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) new_shape = input(user, "Breast Fluid", "Character Preference") as null|anything in GLOB.genital_fluids_list switch(new_shape) if("Milk") - features["balls_fluid"] = /datum/reagent/consumable/milk + features["breasts_fluid"] = /datum/reagent/consumable/milk if("Water") - features["balls_fluid"] = /datum/reagent/water + features["breasts_fluid"] = /datum/reagent/water if("Semen") - features["balls_fluid"] = /datum/reagent/consumable/semen + features["breasts_fluid"] = /datum/reagent/consumable/semen if("Femcum") - features["balls_fluid"] = /datum/reagent/consumable/femcum + features["breasts_fluid"] = /datum/reagent/consumable/femcum + if("Honey") + features["breasts_fluid"] = /datum/reagent/consumable/alienhoney if("breasts_color") var/new_breasts_color = input(user, "Breast Color:", "Character Preference") as color|null diff --git a/hyperstation/code/modules/reagents/chemistry/reagents/food_reagents.dm b/hyperstation/code/modules/reagents/chemistry/reagents/food_reagents.dm new file mode 100644 index 00000000..8aebb5bf --- /dev/null +++ b/hyperstation/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -0,0 +1,11 @@ +/datum/reagent/consumable/alienhoney //for players who want bee character bewbs that produce honey. + name = "alien honey" + description = "Sweet honey that came from a alien source. This honey doesn't possess the same healing or nutrition properties as earth-bound bee honey." + color = "#d3a308" + value = 3 //plentiful, so wouldnt be worth as much. + nutriment_factor = 5 * REAGENTS_METABOLISM + metabolization_rate = 1 * REAGENTS_METABOLISM + taste_description = "sweetness" + +/datum/reagent/consumable/alienhoney/on_mob_life(mob/living/carbon/M) //can still be eaten/drank, but will provide no benefits like normal honey. Still good for a food sauce. + M.reagents.add_reagent(/datum/reagent/consumable/sugar,2) //metabolisms in the system as sugar. diff --git a/tgstation.dme b/tgstation.dme index 786d2983..a860c9f5 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3046,6 +3046,7 @@ #include "hyperstation\code\modules\integrated_electronics\input.dm" #include "hyperstation\code\modules\mob\mob_helpers.dm" #include "hyperstation\code\modules\patreon\patreon.dm" +#include "hyperstation\code\modules\reagents\chemistry\reagents\food_reagents.dm" #include "hyperstation\code\modules\resize\resizing.dm" #include "hyperstation\code\modules\resize\sizechems.dm" #include "hyperstation\code\modules\resize\sizegun.dm"