From f91cd25b64ee8e4e37e929358f97e5c427de72e7 Mon Sep 17 00:00:00 2001 From: GDLW Date: Tue, 9 May 2023 15:34:54 +0200 Subject: [PATCH] blueberry gum added a chem, vendor item and trash variant for the item. Also reorganized some files. The blueberry chem does nothing more than recoloring the player, that's it --- .../chemistry/reagents/consumable_reagents.dm | 17 +++++++ GainStation13/code/modules/vending/mealdor.dm | 5 +- GainStation13/code/obj/items/minor_items.dm | 49 ++++++++++++++++++- .../reagents/reagent_containers/glass.dm | 6 --- tgstation.dme | 2 +- 5 files changed, 69 insertions(+), 10 deletions(-) diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index 1226d120..8b7edef6 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -93,3 +93,20 @@ /datum/reagent/consumable/caloriteblessing/on_mob_end_metabolize(mob/living/L) REMOVE_TRAIT(L, TRAIT_GOTTAGOFAST, type) ..() + + +//BLUEBERRY CHEM - ONLY CHANGES PLAYER'S COLOR AND NOTHING MORE + +/datum/reagent/blueberry_juice + name = "Blueberry Juice" + description = "Non-infectious. Hopefully." + reagent_state = LIQUID + color = "#0004ff" + var/list/random_color_list = list("#0058db","#5d00c7","#0004ff","#0057e7") + taste_description = "blueberry pie" + var/no_mob_color = FALSE + +/datum/reagent/blueberry_juice/on_mob_life(mob/living/carbon/M) + if(!no_mob_color) + M.add_atom_colour(pick(random_color_list), WASHABLE_COLOUR_PRIORITY) + ..() diff --git a/GainStation13/code/modules/vending/mealdor.dm b/GainStation13/code/modules/vending/mealdor.dm index 4973fc1c..3c050243 100644 --- a/GainStation13/code/modules/vending/mealdor.dm +++ b/GainStation13/code/modules/vending/mealdor.dm @@ -42,10 +42,11 @@ /obj/item/reagent_containers/food/snacks/salad = 20, /obj/item/reagent_containers/food/snacks/salad/hellcobb = 10, /obj/item/clothing/under/cowkini = 5, + /obj/item/reagent_containers/food/snacks/blueberry_gum = 5 ) premium = list( - /obj/item/reagent_containers/food/drinks/soda_cans/air = 1, - /obj/item/reagent_containers/food/snacks/donut/chaos = 2 + /obj/item/reagent_containers/food/drinks/soda_cans/air = 3, + /obj/item/reagent_containers/food/snacks/donut/chaos = 3 ) refill_canister = /obj/item/vending_refill/mealdor diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm index da1f1c3a..9a4b6122 100644 --- a/GainStation13/code/obj/items/minor_items.dm +++ b/GainStation13/code/obj/items/minor_items.dm @@ -1,4 +1,7 @@ -/////GS13 - miscellanous items +/////GS13 - miscellanous items. If it's a small item, a container or something +/////then it should land here, instead of making a seperate .dm file + +//fatoray research scraps (maintloot) /obj/item/trash/fatoray_scrap1 name = "raygun scraps" @@ -11,3 +14,47 @@ icon = 'GainStation13/icons/obj/fatoray.dmi' icon_state = "fatoray_scrap2" desc = "Small parts that seemingly once belonged to some sort of a raygun." + +// GS13 fatty liquid beakers defs, for admin stuff and mapping junk + +/obj/item/reagent_containers/glass/beaker/lipoifier + list_reagents = list(/datum/reagent/consumable/lipoifier = 50) + +/obj/item/reagent_containers/glass/beaker/cornoil + list_reagents = list(/datum/reagent/consumable/cornoil = 50) + +/obj/item/reagent_containers/glass/beaker/cornoil + list_reagents = list(/datum/reagent/blueberry_juice = 50) + +/obj/item/reagent_containers/glass/beaker/cornoil + list_reagents = list(/datum/chemical_reaction/fizulphite = 50) + +/obj/item/reagent_containers/glass/beaker/cornoil + list_reagents = list(/datum/chemical_reaction/extilphite = 50) + +/obj/item/reagent_containers/glass/beaker/cornoil + list_reagents = list(/datum/reagent/consumable/caloriteblessing = 50) + +/obj/item/reagent_containers/glass/beaker/cornoil + list_reagents = list(/datum/reagent/consumable/flatulose = 50) + +//blueberry gum snack + +/obj/item/reagent_containers/food/snacks/blueberry_gum + name = "blueberry gum" + icon = 'GainStation13/icons/obj/gum.dmi' + icon_state = "gum_wrapped" + desc = "Doesn't cause anything more than some discoloration... probably." + trash = /obj/item/trash/blueberry_gum + list_reagents = list(/datum/reagent/blueberry_juice = 0.5) + filling_color = "#001aff" + tastes = list("blueberry gum" = 1) + foodtype = FRUIT + price = 5 + +//blueberry gum trash + +/obj/item/trash/blueberry_gum + name = "chewed gum" + icon = 'GainStation13/icons/obj/gum.dmi' + icon_state = "gum_chewed" diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index e2468c83..cb38d885 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -254,12 +254,6 @@ /obj/item/reagent_containers/glass/beaker/synthflesh list_reagents = list(/datum/reagent/medicine/synthflesh = 50) -/obj/item/reagent_containers/glass/beaker/lipoifier - list_reagents = list(/datum/reagent/consumable/lipoifier = 50) //GS13 - -/obj/item/reagent_containers/glass/beaker/cornoil - list_reagents = list(/datum/reagent/consumable/cornoil = 50) //GS13 - /obj/item/reagent_containers/glass/bucket name = "bucket" desc = "It's a bucket." diff --git a/tgstation.dme b/tgstation.dme index c745950d..196a60f9 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3344,8 +3344,8 @@ #include "GainStation13\code\modules\vending\GBBurrito.dm" #include "GainStation13\code\modules\vending\mealdor.dm" #include "GainStation13\code\obj\items\minor_items.dm" -#include "GainStation13\code\obj\structure\scale.dm" #include "GainStation13\code\obj\structure\calorite_doors.dm" +#include "GainStation13\code\obj\structure\scale.dm" #include "GainStation13\code\obj\weapons\fatoray.dm" #include "hyperstation\code\__DEFINES\economy.dm" #include "hyperstation\code\__DEFINES\wendigo.dm"