shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cooonflicts

Browse Source
This commit is contained in:
Artur
2020-06-16 01:23:42 +03:00
parent 86331912e7 1d3cad02ef
commit ceba739231
278 changed files with 41483 additions and 37549 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks.dm
+9 -6
View File
@@ -268,12 +268,15 @@
/obj/item/reagent_containers/food/drinks/ice
name = "ice cup"
desc = "Careful, cold ice, do not chew."
custom_price = 15
custom_price = PRICE_CHEAP_AS_FREE
icon_state = "coffee"
list_reagents = list(/datum/reagent/consumable/ice = 30)
spillable = TRUE
isGlass = FALSE
/obj/item/reagent_containers/food/drinks/ice/sustanance
custom_price = PRICE_FREE
/obj/item/reagent_containers/food/drinks/mug/ // parent type is literally just so empty mug sprites are a thing
name = "mug"
desc = "A drink served in a classy mug."
@@ -303,7 +306,7 @@
list_reagents = list(/datum/reagent/consumable/hot_coco = 30, /datum/reagent/consumable/sugar = 5)
foodtype = SUGAR
resistance_flags = FREEZE_PROOF
custom_price = 120
custom_price = PRICE_ALMOST_CHEAP
/obj/item/reagent_containers/food/drinks/dry_ramen
name = "cup ramen"
@@ -312,7 +315,7 @@
list_reagents = list(/datum/reagent/consumable/dry_ramen = 30)
foodtype = GRAIN
isGlass = FALSE
custom_price = 95
custom_price = PRICE_PRETTY_CHEAP
/obj/item/reagent_containers/food/drinks/beer
name = "space beer"
@@ -320,7 +323,7 @@
icon_state = "beer"
list_reagents = list(/datum/reagent/consumable/ethanol/beer = 30)
foodtype = GRAIN | ALCOHOL
custom_price = 60
custom_price = PRICE_PRETTY_CHEAP
/obj/item/reagent_containers/food/drinks/beer/light
name = "Carp Lite"
@@ -421,7 +424,7 @@
custom_materials = list(/datum/material/iron=250)
volume = 60
isGlass = FALSE
custom_price = 200
custom_price = PRICE_ABOVE_NORMAL
/obj/item/reagent_containers/food/drinks/flask/gold
name = "captain's flask"
@@ -452,7 +455,7 @@
reagent_flags = NONE
spillable = FALSE
isGlass = FALSE
custom_price = 45
custom_price = PRICE_CHEAP_AS_FREE
/obj/item/reagent_containers/food/drinks/soda_cans/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] is trying to eat \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+8 -9
View File
@@ -346,7 +346,7 @@
/obj/item/reagent_containers/food/drinks/bottle/applejack
name = "Buckin' Bronco's Applejack"
desc = "Kicks like a horse, tastes like an apple!"
custom_price = 100
custom_price = PRICE_CHEAP
icon_state = "applejack_bottle"
list_reagents = list(/datum/reagent/consumable/ethanol/applejack = 100)
foodtype = FRUIT
@@ -357,7 +357,6 @@
/obj/item/reagent_containers/food/drinks/bottle/champagne
name = "Eau d' Dandy Brut Champagne"
desc = "Finely sourced from only the most pretentious French vineyards."
custom_premium_price = 250
icon_state = "champagne_bottle"
list_reagents = list(/datum/reagent/consumable/ethanol/champagne = 100)
@@ -376,7 +375,7 @@
/obj/item/reagent_containers/food/drinks/bottle/trappist
name = "Mont de Requin Trappistes Bleu"
desc = "Brewed in space-Belgium. Fancy!"
custom_premium_price = 170
custom_premium_price = PRICE_ABOVE_NORMAL
icon_state = "trappistbottle"
volume = 50
list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50)
@@ -389,7 +388,7 @@
/obj/item/reagent_containers/food/drinks/bottle/orangejuice
name = "orange juice"
desc = "Full of vitamins and deliciousness!"
custom_price = 100
custom_price = PRICE_CHEAP
icon_state = "orangejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -411,7 +410,7 @@
/obj/item/reagent_containers/food/drinks/bottle/cream
name = "milk cream"
desc = "It's cream. Made from milk. What else did you think you'd find in there?"
custom_price = 100
custom_price = PRICE_CHEAP
icon_state = "cream"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -423,7 +422,7 @@
/obj/item/reagent_containers/food/drinks/bottle/tomatojuice
name = "tomato juice"
desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
custom_price = 100
custom_price = PRICE_CHEAP
icon_state = "tomatojuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -435,7 +434,7 @@
/obj/item/reagent_containers/food/drinks/bottle/limejuice
name = "lime juice"
desc = "Sweet-sour goodness."
custom_price = 100
custom_price = PRICE_CHEAP
icon_state = "limejuice"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -469,7 +468,7 @@
/obj/item/reagent_containers/food/drinks/bottle/menthol
name = "menthol"
desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
custom_price = 100
custom_price = PRICE_CHEAP
icon_state = "mentholbox"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
@@ -480,7 +479,7 @@
/obj/item/reagent_containers/food/drinks/bottle/grenadine
name = "Jester Grenadine"
desc = "Contains 0% real cherries!"
custom_price = 100
custom_price = PRICE_CHEAP
icon_state = "grenadine"
isGlass = TRUE
list_reagents = list(/datum/reagent/consumable/grenadine = 100)
code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+2 -2
View File
@@ -11,7 +11,7 @@
spillable = TRUE
resistance_flags = ACID_PROOF
obj_flags = UNIQUE_RENAME
custom_price = 25
custom_price = PRICE_REALLY_CHEAP
/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change(changetype)
cut_overlays()
@@ -47,7 +47,7 @@
possible_transfer_amounts = list()
volume = 15
custom_materials = list(/datum/material/glass=100)
custom_price = 20
custom_price = PRICE_CHEAP_AS_FREE
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change(changetype)
cut_overlays()
code/modules/food_and_drinks/food/snacks_meat.dm
+9
View File
@@ -54,6 +54,15 @@
tastes = list("fish" = 1, "chips" = 1)
foodtype = MEAT | VEGETABLES | FRIED
/obj/item/reagent_containers/food/snacks/fishfry
name = "fish fry"
desc = "All that and no bag of chips..."
icon_state = "fish_fry"
list_reagents = list (/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 3)
filling_color = "#ee7676"
tastes = list("fish" = 1, "pan seared vegtables" = 1)
foodtype = MEAT | VEGETABLES | FRIED
/obj/item/reagent_containers/food/snacks/sushi_basic
name = "funa hosomaki"
desc = "A small cylindrical kudzu skin, filled with rice and fish."
code/modules/food_and_drinks/food/snacks_other.dm
+11
View File
@@ -12,6 +12,17 @@
tastes = list("cheese" = 1)
foodtype = DAIRY
/obj/item/reagent_containers/food/snacks/royalcheese
name = "royal cheese"
desc = "Ascend the throne. Consume the wheel. Feel the POWER."
icon_state = "royalcheese"
list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/gold = 20, /datum/reagent/toxin/mutagen = 5)
w_class = WEIGHT_CLASS_BULKY
tastes = list("cheese" = 4, "royalty" = 1)
foodtype = DAIRY
/obj/item/reagent_containers/food/snacks/cheesewedge
name = "cheese wedge"
desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far."
code/modules/food_and_drinks/food/snacks_pastry.dm
+27
View File
@@ -144,6 +144,15 @@
is_decorated = TRUE
filling_color = "#879630"
/obj/item/reagent_containers/food/snacks/donut/laugh
name = "sweet pea donut"
desc = "Goes great with a glass of Bastion Burbon!"
icon_state = "donut_laugh"
bonus_reagents = list(/datum/reagent/consumable/laughter = 3)
tastes = list("donut" = 3, "fizzy tutti frutti" = 1,)
is_decorated = TRUE
filling_color = "#803280"
//////////////////////JELLY DONUTS/////////////////////////
/obj/item/reagent_containers/food/snacks/donut/jelly
@@ -234,6 +243,15 @@
is_decorated = TRUE
filling_color = "#879630"
/obj/item/reagent_containers/food/snacks/donut/jelly/laugh
name = "sweet pea jelly donut"
desc = "Goes great with a glass of Bastion Burbon!"
icon_state = "jelly_laugh"
bonus_reagents = list(/datum/reagent/consumable/laughter = 3)
tastes = list("jelly" = 3, "donut" = 1, "fizzy tutti frutti" = 1)
is_decorated = TRUE
filling_color = "#803280"
//////////////////////////SLIME DONUTS/////////////////////////
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly
@@ -315,6 +333,15 @@
is_decorated = TRUE
filling_color = "#879630"
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/laugh
name = "sweet pea jelly donut"
desc = "Goes great with a glass of Bastion Burbon!"
icon_state = "jelly_laugh"
bonus_reagents = list(/datum/reagent/consumable/laughter = 3)
tastes = list("jelly" = 3, "donut" = 1, "fizzy tutti frutti" = 1)
is_decorated = TRUE
filling_color = "#803280"
/obj/item/reagent_containers/food/snacks/donut/glaze
name = "glazed donut"
desc = "A sugar glazed donut."
code/modules/food_and_drinks/food/snacks_salad.dm
+19 -1
View File
@@ -124,4 +124,22 @@
trash = /obj/item/kitchen/knife
bonus_reagents = list(/datum/reagent/medicine/earthsblood = 1, /datum/reagent/iron = 4)
tastes = list("iron" = 1, "conspiracy" = 1)
foodtype = VEGETABLES
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/salad/edensalad
name = "\improper Salad of Eden"
desc = "A salad brimming with untapped potential."
icon_state = "eden_salad"
trash = /obj/item/reagent_containers/glass/bowl
list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/medicine/earthsblood = 3, /datum/reagent/medicine/omnizine = 5, /datum/reagent/drug/happiness = 2)
tastes = list("hope" = 1)
foodtype = VEGETABLES
/obj/item/reagent_containers/food/snacks/salad/gumbo
name = "black eyed gumbo"
desc = "A spicy and savory meat and rice dish."
icon_state = "gumbo"
trash = /obj/item/reagent_containers/glass/bowl
list_reagents = list(/datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/nutriment/vitamin = 3, /datum/reagent/consumable/nutriment = 5)
tastes = list("building heat" = 2, "savory meat and vegtables" = 1)
foodtype = GRAIN | MEAT | VEGETABLES
code/modules/food_and_drinks/food/snacks_soup.dm
+10
View File
@@ -262,3 +262,13 @@
tastes = list("bungo" = 2, "hot curry" = 4, "tropical sweetness" = 1)
filling_color = "#E6A625"
foodtype = VEGETABLES | FRUIT | DAIRY
/obj/item/reagent_containers/food/snacks/soup/peasoup
name = "pea soup"
desc = "A humble split pea soup."
icon_state = "peasoup"
bonus_reagents = list (/datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/medicine/oculine = 2)
list_reagents = list (/datum/reagent/consumable/nutriment = 8)
tastes = list("creamy peas"= 2, "parsnip" = 1)
filling_color = "#9dc530"
foodtype = VEGETABLES
code/modules/food_and_drinks/food/snacks_vend.dm
+2 -3
View File
@@ -41,7 +41,6 @@
filling_color = "#FFD700"
tastes = list("salt" = 1, "crisps" = 1)
foodtype = JUNKFOOD | FRIED
custom_price = 90
/obj/item/reagent_containers/food/snacks/no_raisin
name = "4no raisins"
@@ -69,7 +68,7 @@
junkiness = 25
filling_color = "#FFD700"
foodtype = JUNKFOOD | GRAIN | SUGAR
custom_price = 30
custom_price = PRICE_CHEAP_AS_FREE
/obj/item/reagent_containers/food/snacks/cheesiehonkers
name = "cheesie honkers"
@@ -81,7 +80,6 @@
filling_color = "#FFD700"
tastes = list("cheese" = 5, "crisps" = 2)
foodtype = JUNKFOOD | DAIRY | SUGAR
custom_price = 45
/obj/item/reagent_containers/food/snacks/syndicake
name = "syndi-cakes"
@@ -92,3 +90,4 @@
filling_color = "#F5F5DC"
tastes = list("sweetness" = 3, "cake" = 1)
foodtype = GRAIN | FRUIT | VEGETABLES
custom_price = PRICE_CHEAP
code/modules/food_and_drinks/kitchen_machinery/food_cart.dm
+16 -9
View File
@@ -1,5 +1,5 @@
#define STORAGE_CAPACITY 30
#define LIQUID_CAPACIY 200
#define LIQUID_CAPACITY 200
#define MIXER_CAPACITY 100
/obj/machinery/food_cart
@@ -19,7 +19,7 @@
/obj/machinery/food_cart/Initialize()
. = ..()
create_reagents(LIQUID_CAPACIY, OPENCONTAINER | NO_REACT)
create_reagents(LIQUID_CAPACITY, OPENCONTAINER | NO_REACT)
mixer = new /obj/item/reagent_containers(src, MIXER_CAPACITY)
mixer.name = "Mixer"
@@ -60,6 +60,9 @@
return food_stored >= STORAGE_CAPACITY
/obj/machinery/food_cart/attackby(obj/item/O, mob/user, params)
if(O.tool_behaviour == TOOL_WRENCH)
default_unfasten_wrench(user, O, 0)
return TRUE
if(istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass))
var/obj/item/reagent_containers/food/drinks/drinkingglass/DG = O
if(!DG.reagents.total_volume) //glass is empty
@@ -106,7 +109,7 @@
return
if(href_list["disposeI"])
reagents.del_reagent(href_list["disposeI"])
reagents.del_reagent(text2path(href_list["disposeI"]))
if(href_list["dispense"])
if(stored_food[href_list["dispense"]]-- <= 0)
@@ -116,9 +119,13 @@
if(sanitize(O.name) == href_list["dispense"])
O.forceMove(drop_location())
break
log_combat(usr, src, "dispensed [O] from", null, "with [stored_food[href_list["dispense"]]] remaining")
if(href_list["portion"])
portion = clamp(input("How much drink do you want to dispense per glass?") as num, 0, 50)
portion = clamp(input("How much drink do you want to dispense per glass?") as num|null, 0, 50)
if (isnull(portion))
return
if(href_list["pour"] || href_list["m_pour"])
if(glasses-- <= 0)
@@ -127,16 +134,16 @@
else
var/obj/item/reagent_containers/food/drinks/drinkingglass/DG = new(loc)
if(href_list["pour"])
reagents.trans_id_to(DG, href_list["pour"], portion)
reagents.trans_id_to(DG, text2path(href_list["pour"]), portion)
if(href_list["m_pour"])
mixer.reagents.trans_id_to(DG, href_list["m_pour"], portion)
mixer.reagents.trans_id_to(DG, text2path(href_list["m_pour"]), portion)
if(href_list["mix"])
if(reagents.trans_id_to(mixer, href_list["mix"], portion) == 0)
if(reagents.trans_id_to(mixer, text2path(href_list["mix"]), portion) == 0)
to_chat(usr, "<span class='warning'>[mixer] is full!</span>")
if(href_list["transfer"])
if(mixer.reagents.trans_id_to(src, href_list["transfer"], portion) == 0)
if(mixer.reagents.trans_id_to(src, text2path(href_list["transfer"]), portion) == 0)
to_chat(usr, "<span class='warning'>[src] is full!</span>")
updateDialog()
@@ -152,5 +159,5 @@
qdel(src)
#undef STORAGE_CAPACITY
#undef LIQUID_CAPACIY
#undef LIQUID_CAPACITY
#undef MIXER_CAPACITY
code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm
+25
View File
@@ -121,6 +121,15 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/donut/matcha
/datum/crafting_recipe/food/donut/laugh
name = "Sweet Pea Donut"
reqs = list(
/datum/reagent/consumable/laughsyrup = 3,
/obj/item/reagent_containers/food/snacks/donut/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/donut/laugh
////////////////////////////////////////////////////JELLY DONUTS///////////////////////////////////////////////////////
/datum/crafting_recipe/food/donut/jelly/apple
@@ -187,6 +196,14 @@ datum/crafting_recipe/food/donut/meat
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet
/datum/crafting_recipe/food/donut/jelly/laugh
name = "Sweet Pea Jelly Donut"
reqs = list(
/datum/reagent/consumable/laughsyrup = 3,
/obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/laugh
////////////////////////////////////////////////////SLIME DONUTS///////////////////////////////////////////////////////
/datum/crafting_recipe/food/donut/slimejelly/apple
@@ -253,3 +270,11 @@ datum/crafting_recipe/food/donut/meat
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha
/datum/crafting_recipe/food/donut/slimejelly/laugh
name = "Sweet Pea Jelly Donut"
reqs = list(
/datum/reagent/consumable/laughsyrup = 3,
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1
)
result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/laugh
code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+11
View File
@@ -171,3 +171,14 @@
)
result = /obj/item/reagent_containers/food/snacks/salad/ricepork
subcategory = CAT_MEAT
/datum/crafting_recipe/food/gumbo
name = "Black eyed gumbo"
reqs = list(
/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1,
/obj/item/reagent_containers/food/snacks/grown/peas = 1,
/obj/item/reagent_containers/food/snacks/grown/chili = 1,
/obj/item/reagent_containers/food/snacks/meat/cutlet = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/gumbo
subcategory = CAT_MEAT
code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+11
View File
@@ -194,3 +194,14 @@
)
result = /mob/living/simple_animal/hostile/bear/butter
subcategory = CAT_MISCFOOD
/datum/crafting_recipe/food/royalcheese
name = "Royal Cheese"
reqs = list(
/obj/item/reagent_containers/food/snacks/store/cheesewheel = 1,
/obj/item/clothing/head/crown = 1,
/datum/reagent/medicine/strange_reagent = 5,
/datum/reagent/toxin/mutagen = 5
)
result = /obj/item/reagent_containers/food/snacks/royalcheese
subcategory = CAT_MISCFOOD
code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm
+14 -1
View File
@@ -93,4 +93,17 @@
/obj/item/reagent_containers/food/snacks/grown/cabbage = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/caesar
subcategory = CAT_SALAD
subcategory = CAT_SALAD
/datum/crafting_recipe/food/edensalad
name = "Salad of Eden"
reqs = list(
/obj/item/reagent_containers/glass/bowl =1,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 1,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus = 1,
/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia = 1,
/obj/item/reagent_containers/food/snacks/grown/peace = 1
)
result = /obj/item/reagent_containers/food/snacks/salad/edensalad
subcategory = CAT_SALAD
code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
+11 -1
View File
@@ -135,4 +135,14 @@
/obj/item/reagent_containers/food/snacks/carpmeat = 1
)
result = /obj/item/reagent_containers/food/snacks/fishandchips
subcategory = CAT_SEAFOOD
subcategory = CAT_SEAFOOD
/datum/crafting_recipe/food/fishfry
name = "Fish fry"
reqs = list(
/obj/item/reagent_containers/food/snacks/grown/corn = 1,
/obj/item/reagent_containers/food/snacks/grown/peas =1,
/obj/item/reagent_containers/food/snacks/carpmeat = 1
)
result = /obj/item/reagent_containers/food/snacks/fishfry
subcategory = CAT_SEAFOOD
code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+13 -1
View File
@@ -255,4 +255,16 @@
/obj/item/reagent_containers/glass/bowl = 1
)
result= /obj/item/reagent_containers/food/snacks/soup/wish
subcategory = CAT_SOUP
subcategory = CAT_SOUP
/datum/crafting_recipe/food/peasoup
name = "Pea soup"
reqs = list(
/datum/reagent/water = 10,
/obj/item/reagent_containers/food/snacks/grown/peas = 2,
/obj/item/reagent_containers/food/snacks/grown/parsnip = 1,
/obj/item/reagent_containers/food/snacks/grown/carrot = 1
)
result = /obj/item/reagent_containers/food/snacks/soup/peasoup
subcategory = CAT_SOUP