cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-23 12:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into economy-update-junk

Browse Source
This commit is contained in:
Dahlular
2022-07-06 16:28:45 -06:00
committed by GitHub
parent 7b9f638832 0584d6b79a
commit c7c6e2d193
196 changed files with 865 additions and 721 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/customizables.dm
+2 -2
View File
@@ -103,8 +103,8 @@
/obj/item/reagent_containers/food/snacks/customizable/update_snack_overlays(obj/item/reagent_containers/food/snacks/S)
var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling")
if(S.filling_color == "#FFFFFF")
filling.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
if(S.filling_color == COLOR_WHITE)
filling.color = pick(COLOR_RED, COLOR_BLUE, COLOR_DARK_GREEN, COLOR_YELLOW)
else
filling.color = S.filling_color
code/modules/food_and_drinks/food/snacks.dm
+1 -1
View File
@@ -273,7 +273,7 @@ All foods are distributed among various categories. Use common sense.
cut_overlays()
var/mutable_appearance/filling = mutable_appearance(icon, "[initial(icon_state)]_filling")
if(S.filling_color == "#FFFFFF")
filling.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
filling.color = pick(COLOR_RED, COLOR_BLUE, COLOR_DARK_GREEN, COLOR_YELLOW)
else
filling.color = S.filling_color
code/modules/food_and_drinks/food/snacks/meat.dm
+7 -7
View File
@@ -12,7 +12,7 @@
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/plain
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/plain
slices_num = 3
filling_color = "#FF0000"
filling_color = COLOR_RED
tastes = list("meat" = 1)
foodtype = MEAT | RAW
@@ -90,7 +90,7 @@
icon_state = "slimemeat"
desc = "Because jello wasn't offensive enough to vegans."
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/toxin/slimejelly = 3)
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("slime" = 1, "jelly" = 1)
foodtype = MEAT | RAW | TOXIC
@@ -125,7 +125,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
icon_state = "shadowmeat"
desc = "Ow, the edge."
filling_color = "#202020"
filling_color = COLOR_NEARLY_BLACK
tastes = list("darkness" = 1, "meat" = 1)
foodtype = MEAT | RAW
@@ -147,7 +147,7 @@
name = "bone"
icon_state = "skeletonmeat"
desc = "There's a point where this needs to stop, and clearly we have passed it."
filling_color = "#F0F0F0"
filling_color = COLOR_VERY_VERY_LIGHT_GRAY
tastes = list("bone" = 1)
slice_path = null //can't slice a bone into cutlets
foodtype = GROSS
@@ -167,7 +167,7 @@
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
icon_state = "ipcmeat"
desc = "Gross robot meat."
filling_color = "#000000"
filling_color = COLOR_BLACK
tastes = list("metal" = 1)
/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
@@ -218,7 +218,7 @@
desc = "A slice from a huge tomato."
icon_state = "tomatomeat"
list_reagents = list(/datum/reagent/consumable/nutriment = 2)
filling_color = "#FF0000"
filling_color = COLOR_RED
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/killertomato
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/killertomato
tastes = list("tomato" = 1)
@@ -241,7 +241,7 @@
icon_state = "xenomeat"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
bitesize = 4
filling_color = "#32CD32"
filling_color = COLOR_LIME
cooked_type = /obj/item/reagent_containers/food/snacks/meat/steak/xeno
slice_path = /obj/item/reagent_containers/food/snacks/meat/rawcutlet/xeno
tastes = list("meat" = 1, "acid" = 1)
code/modules/food_and_drinks/food/snacks_bread.dm
+1 -1
View File
@@ -72,7 +72,7 @@
name = "xenomeatbread slice"
desc = "A slice of delicious meatbread. Extra Heretical."
icon_state = "xenobreadslice"
filling_color = "#32CD32"
filling_color = COLOR_LIME
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT
code/modules/food_and_drinks/food/snacks_cake.dm
+8 -8
View File
@@ -125,7 +125,7 @@
name = "lime cake slice"
desc = "Just a slice of cake, it is enough for everyone."
icon_state = "limecake_slice"
filling_color = "#00FF00"
filling_color = COLOR_GREEN
tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR | ANTITOXIC
@@ -222,7 +222,7 @@
name = "slime cake slice"
desc = "A slice of slime cake."
icon_state = "slimecake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1)
foodtype = GRAIN | DAIRY | SUGAR
@@ -290,7 +290,7 @@
name = "angel food cake slice"
desc = "A slice of heavenly cake."
icon_state = "holy_cake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
foodtype = GRAIN | DAIRY | SUGAR
@@ -308,7 +308,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "pound cake slice"
desc = "A slice of condensed cake made for filling people up quickly."
icon_state = "pound_cake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD
@@ -325,7 +325,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "hardware cake slice"
desc = "A slice of electronic boards and some acid."
icon_state = "hardware_cake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("acid" = 1, "metal" = 1, "regret" = 10)
foodtype = GRAIN | GROSS
@@ -342,7 +342,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "vanilla cake slice"
desc = "A slice of vanilla frosted cake."
icon_state = "vanillacake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10)
foodtype = GRAIN | SUGAR | DAIRY
@@ -359,7 +359,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "clown cake slice"
desc = "A slice of bad jokes, and silly props."
icon_state = "clowncake_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
foodtype = GRAIN | SUGAR | DAIRY
@@ -376,7 +376,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
name = "peach cake slice"
desc = "A slice of peach cake."
icon_state = "peach_slice"
filling_color = "#00FFFF"
filling_color = COLOR_CYAN
tastes = list("cake" = 1, "sugar" = 1, "peachjuice" = 10)
foodtype = GRAIN | SUGAR | DAIRY
code/modules/food_and_drinks/food/snacks_meat.dm
+5 -5
View File
@@ -108,7 +108,7 @@
icon_state = "spiderleg"
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2)
cooked_type = /obj/item/reagent_containers/food/snacks/boiledspiderleg
filling_color = "#000000"
filling_color = COLOR_BLACK
tastes = list("cobwebs" = 1)
foodtype = MEAT | TOXIC
@@ -137,7 +137,7 @@
desc = "A ball of meat."
icon_state = "meatball"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#800000"
filling_color = COLOR_RED
tastes = list("meat" = 1)
foodtype = MEAT
@@ -207,7 +207,7 @@
icon_state = "khinkali"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 2)
bitesize = 3
filling_color = "#F0F0F0"
filling_color = COLOR_VERY_VERY_LIGHT_GRAY
tastes = list("meat" = 1, "onions" = 1, "garlic" = 1)
foodtype = MEAT
@@ -274,7 +274,7 @@
trash = /obj/item/trash/plate
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/capsaicin = 2, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/capsaicin = 2)
filling_color = "#000000"
filling_color = COLOR_BLACK
tastes = list("hot peppers" = 1, "cobwebs" = 1)
foodtype = MEAT
@@ -320,7 +320,7 @@
icon_state = "pigblanket"
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
filling_color = "#800000"
filling_color = COLOR_RED
tastes = list("meat" = 1, "butter" = 1)
/obj/item/reagent_containers/food/snacks/kebab/rat
code/modules/food_and_drinks/food/snacks_other.dm
+3 -3
View File
@@ -176,7 +176,7 @@
bitesize = 1
trash = /obj/item/trash/plate
list_reagents = list(/datum/reagent/toxin/minttoxin = 2)
filling_color = "#800000"
filling_color = COLOR_RED
foodtype = TOXIC | SUGAR
/obj/item/reagent_containers/food/snacks/eggwrap
@@ -204,7 +204,7 @@
desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health."
icon_state = "spidereggs"
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin = 2)
filling_color = "#008000"
filling_color = COLOR_DARK_GREEN
tastes = list("cobwebs" = 1)
foodtype = MEAT | TOXIC
@@ -232,7 +232,7 @@
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_egg"
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FF3333" // R225 G051 B051
filling_color = COLOR_RED_LIGHT // R225 G051 B051
tastes = list("seaweed" = 1, "cobwebs" = 1, "salty" = 2)
foodtype = MEAT | VEGETABLES
code/modules/food_and_drinks/food/snacks_pastry.dm
+1 -1
View File
@@ -580,7 +580,7 @@
desc = "The food of choice for the seasoned botanist."
icon_state = "dankpocket"
list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4)
filling_color = "#00FF00"
filling_color = COLOR_GREEN
tastes = list("meat" = 2, "dough" = 2)
foodtype = GRAIN | VEGETABLES
code/modules/food_and_drinks/food/snacks_sushi.dm
+1 -1
View File
@@ -71,7 +71,7 @@
icon = 'modular_citadel/icons/obj/food/food.dmi'
icon_state = "sushie_egg"
list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2)
filling_color = "#FF3333" // R225 G051 B051
filling_color = COLOR_RED_LIGHT // R225 G051 B051
tastes = list("seaweed" = 1, "salty" = 2)
foodtype = MEAT | VEGETABLES
code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+1 -1
View File
@@ -358,7 +358,7 @@ datum/crafting_recipe/food/donut/meat
desc = "The food of choice for the seasoned botanist."
icon_state = "dankpocket"
list_reagents = list(/datum/reagent/toxin/lipolicide = 3, /datum/reagent/drug/space_drugs = 3, /datum/reagent/consumable/nutriment = 4)
filling_color = "#00FF00"
filling_color = COLOR_GREEN
tastes = list("meat" = 2, "dough" = 2)
foodtype = GRAIN | VEGETABLES