cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-02-10 07:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1396 from Support-Sergal/OrangeCreamsicle

Browse Source 
Added a Orange creamsicle, and a new snack!
This commit is contained in:
Dahlular
2021-08-14 23:13:13 -06:00
committed by GitHub
parent c3524f66cf a7f9c83933
commit 5b875682c2
8 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/food_and_drinks/food/snacks_vend.dm
View File

@@ -119,4 +119,15 @@
filling_color = "#FFD700"
tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3)
foodtype = GRAIN | VEGETABLES
price = 3
/obj/item/reagent_containers/food/snacks/bird_seed
name = "Sunflower Seeds"
desc = "An plastic bag that has a red cardinal as it's mascot on the front with ingredients of olive oil and starlight grown Sunflowers with a hint of a secret spice. "
icon_state = "avianseed"
trash = /obj/item/trash/bird_seed
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4)
filling_color = "#b497162f"
tastes = list("olives" = 1, "Nuts" = 3, "spice" = 2)
foodtype = GRAIN | VEGETABLES
price = 3

6
code/modules/food_and_drinks/recipes/drinks_recipes.dm
View File

@@ -911,3 +911,9 @@
id = /datum/reagent/consumable/ethanol/cum_in_a_hot_tub/semen
results = list(/datum/reagent/consumable/ethanol/cum_in_a_hot_tub/semen = 3)
required_reagents = list(/datum/reagent/consumable/ethanol/vodka = 2, /datum/reagent/consumable/semen = 1, /datum/reagent/consumable/ethanol/irish_cream = 0.1)
/datum/chemical_reaction/orange_creamsicle
name = "Orange Creamsical"
id = /datum/reagent/consumable/orange_creamsicle
results = list(/datum/reagent/consumable/orange_creamsicle = 4)
required_reagents = list(/datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/milk = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/orangejuice = 1)

10
code/modules/reagents/chemistry/reagents/drink_reagents.dm
View File

@@ -991,3 +991,13 @@
M.set_drugginess(75)
M.apply_status_effect(/datum/status_effect/throat_soothed)
..()
/datum/reagent/consumable/orange_creamsicle
name = "Orange Creamsicle"
description = "A Summer time drink that can be frozen and eaten or drunk from a glass!"
color = "#ffb46e" // rgb(255, 180, 110)
taste_description = "ice cream and orange soda"
glass_icon_state = "orangecreamsicle"
glass_desc = "A Summer time drink that can be frozen and eaten or Drinked from a glass!"
glass_name = "Orange Creamsicle"
hydration = 4

17
code/modules/vending/snack.dm
View File

@@ -5,17 +5,18 @@
product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
icon_state = "snack"
products = list(/obj/item/reagent_containers/food/snacks/candy = 6,
/obj/item/reagent_containers/food/drinks/dry_ramen = 6,
/obj/item/reagent_containers/food/snacks/chips = 6,
/obj/item/reagent_containers/food/snacks/sosjerky = 6,
/obj/item/reagent_containers/food/snacks/no_raisin = 6,
/obj/item/reagent_containers/food/snacks/spacetwinkie = 6,
/obj/item/reagent_containers/food/drinks/dry_ramen = 6,
/obj/item/reagent_containers/food/snacks/chips = 6,
/obj/item/reagent_containers/food/snacks/sosjerky = 6,
/obj/item/reagent_containers/food/snacks/no_raisin = 6,
/obj/item/reagent_containers/food/snacks/spacetwinkie = 6,
/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6,
/obj/item/reagent_containers/food/snacks/soyfood = 6)
/obj/item/reagent_containers/food/snacks/bird_seed =6,
/obj/item/reagent_containers/food/snacks/soyfood = 6)
contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6)
premium = list(/obj/item/storage/box/donkpockets = 1,
/obj/item/reagent_containers/food/snacks/poppypretzel = 3,
/obj/item/reagent_containers/food/snacks/carbonnanotube_noodles = 4)
/obj/item/reagent_containers/food/snacks/poppypretzel = 3,
/obj/item/reagent_containers/food/snacks/carbonnanotube_noodles = 4)
refill_canister = /obj/item/vending_refill/snack
var/chef_compartment_access = "28" //ACCESS_KITCHEN