diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index f6538657c91..067349b2372 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -176,7 +176,8 @@ /obj/item/weapon/reagent_containers/food/snacks/meatsnack = 2, /obj/item/weapon/reagent_containers/food/snacks/maps = 2, /obj/item/weapon/reagent_containers/food/snacks/nathisnack = 2, - /obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 4 + /obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 4, + /obj/item/weapon/reagent_containers/food/snacks/candy/koko = 5 ) contraband = list( /obj/item/weapon/reagent_containers/food/snacks/syndicake = 6, @@ -195,7 +196,8 @@ /obj/item/weapon/reagent_containers/food/snacks/meatsnack = 22, /obj/item/weapon/reagent_containers/food/snacks/maps = 23, /obj/item/weapon/reagent_containers/food/snacks/nathisnack = 24, - /obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 60 + /obj/item/weapon/reagent_containers/food/snacks/koisbar_clean = 60, + /obj/item/weapon/reagent_containers/food/snacks/candy/koko = 40 ) /obj/machinery/vending/cola diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 005f3903c67..d9eab69e270 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -15,6 +15,10 @@ name = "\improper K'ois Bar Wrapper" icon_state = "koisbar" +/obj/item/trash/kokobar + name = "\improper Koko Bar Wrapper" + icon_state = "kokobar" + /obj/item/trash/raisins name = "\improper 4no raisins" icon_state= "4no_raisins" diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 066be10843c..60c98734eb1 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1207,6 +1207,36 @@ if (prob(dose)) M.vomit() + +/datum/reagent/mental/kokoreed + name = "Koko Reed Juice" + id = "kokoreed" + description = "Juice from the Koko reed plant. Caused unique mental effects in unathi" + reagent_state = LIQUID + color = "#008000" + metabolism = 0.0016 * REM + overdose = 3 + data = 0 + taste_description = "sugar" + goodmessage = list("You feel pleasantly warm.","You feel like you've been basking in the sun.","You feel focused and warm...") + badmessage = list() + worstmessage = list() + suppress_traumas = list() + conflicting_reagent = null + min_dose = 0.0064 * REM + var/datum/modifier/modifier + +/datum/reagent/mental/kokoreed/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + . = ..() + if(M.bodytemperature > 310) + M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) + +/datum/reagent/mental/kokoreed/overdose(var/mob/living/carbon/M, var/alien, var/removed, var/scale) + . = ..() + if(isunathi(M)) + if (!modifier) + modifier = M.add_modifier(/datum/modifier/stimulant, MODIFIER_REAGENT, src, _strength = 1, override = MODIFIER_OVERRIDE_STRENGTHEN) + /datum/reagent/mannitol name = "Mannitol" id = "mannitol" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 5adef33204b..28abbe9a5b6 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -511,6 +511,22 @@ . = ..() reagents.add_reagent("sugar", 3) + +/obj/item/weapon/reagent_containers/food/snacks/candy/koko + name = "\improper Koko bar" + desc = "A sweet, yet gritty candy bar cultivated exclusively on the Compact ruled world of Ha zana. It's a good pick-me-up for Unathi, but has no affect on other species." + icon_state = "kokobar" + trash = /obj/item/trash/kokobar + filling_color = "#7D5F46" + nutriment_amt = 4 + nutriment_desc = list("Koko Reed" = 2, "fibers" = 1) + bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/candy/koko/Initialize() + . = ..() + reagents.add_reagent("sugar", 3) + reagents.add_reagent("kokoreed", 7) + /obj/item/weapon/reagent_containers/food/snacks/candy/donor name = "donor candy" desc = "A little treat for blood donors. Made with real sugar!" diff --git a/html/changelogs/koko.yml b/html/changelogs/koko.yml new file mode 100644 index 00000000000..a18dba9baa6 --- /dev/null +++ b/html/changelogs/koko.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Lady Fowl + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Add's KoKo bars, a unathi themed candy." diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 251089695b1..660587ef8b4 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index ad7de617b21..352d5c13c28 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ