From 2cd1580acd7744e8c15ce0a510eda98463c4cb73 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 11 Jan 2014 02:35:10 +1030 Subject: [PATCH] Added filling_color var to food items for use in sandwiches. Conflicts: code/modules/reagents/reagent_containers/food/snacks.dm code/modules/reagents/reagent_containers/food/snacks/grown.dm --- .../reagents/reagent_containers/food.dm | 1 + .../reagent_containers/food/sandwich.dm | 83 +++++ .../reagent_containers/food/snacks.dm | 304 ++++++++++++++++++ .../reagent_containers/food/snacks/grown.dm | 96 +++++- .../reagent_containers/food/snacks/meat.dm | 1 + 5 files changed, 484 insertions(+), 1 deletion(-) create mode 100644 code/modules/reagents/reagent_containers/food/sandwich.dm diff --git a/code/modules/reagents/reagent_containers/food.dm b/code/modules/reagents/reagent_containers/food.dm index 4f14338886f..53bdeca5f84 100644 --- a/code/modules/reagents/reagent_containers/food.dm +++ b/code/modules/reagents/reagent_containers/food.dm @@ -4,6 +4,7 @@ /obj/item/weapon/reagent_containers/food possible_transfer_amounts = null volume = 50 //Sets the default container amount for all food items. + var/filling_color = "#FFFFFF" //Used by sandwiches. /obj/item/weapon/reagent_containers/food/New() ..() diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm new file mode 100644 index 00000000000..12cc0c253f9 --- /dev/null +++ b/code/modules/reagents/reagent_containers/food/sandwich.dm @@ -0,0 +1,83 @@ +/obj/item/weapon/reagent_containers/food/snacks/breadslice/attackby(obj/item/W as obj, mob/user as mob) + + if(istype(W,/obj/item/weapon/shard) || istype(W,/obj/item/weapon/reagent_containers/food/snacks)) + var/obj/item/weapon/reagent_containers/food/snacks/csandwich/S = new(get_turf(src)) + S.attackby(W,user) + del(src) + ..() + +/obj/item/weapon/reagent_containers/food/snacks/csandwich + name = "sandwich" + desc = "The best thing since sliced bread." + icon_state = "breadslice" + trash = /obj/item/trash/plate + bitesize = 2 + + var/list/ingredients = list() + +/obj/item/weapon/reagent_containers/food/snacks/csandwich/attackby(obj/item/W as obj, mob/user as mob) + + var/sandwich_limit = 4 + for(var/obj/item/O in ingredients) + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/breadslice)) + sandwich_limit += 4 + + if(src.contents.len > sandwich_limit) + user << "\red If you put anything else on \the [src] it's going to collapse." + return + else if(istype(W,/obj/item/weapon/shard)) + user << "\blue You hide [W] in \the [src]." + user.drop_item() + W.loc = src + update() + return + else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks)) + user << "\blue You layer [W] over \the [src]." + var/obj/item/weapon/reagent_containers/F = W + F.reagents.trans_to(src, F.reagents.total_volume) + user.drop_item() + W.loc = src + ingredients += W + update() + return + ..() + +/obj/item/weapon/reagent_containers/food/snacks/csandwich/proc/update() + var/fullname = "" //We need to build this from the contents of the var. + var/i = 0 + + overlays.Cut() + + for(var/obj/item/weapon/reagent_containers/food/snacks/O in ingredients) + + i++ + if(i == 1) + fullname += "[O.name]" + else if(i == ingredients.len) + fullname += " and [O.name]" + else + fullname += ", [O.name]" + + var/image/I = new(src.icon, "sandwich_filling") + I.color = O.filling_color + I.pixel_x = pick(list(-1,0,1)) + I.pixel_y = (i*2)+1 + overlays += I + + var/image/T = new(src.icon, "sandwich_top") + T.pixel_x = pick(list(-1,0,1)) + T.pixel_y = (ingredients.len * 2)+3 + overlays += T + + name = lowertext("[fullname] sandwich") + if(length(name) > 80) name = "[pick(list("absurd","colossal","enormous","ridiculous"))] sandwich" + w_class = n_ceil(Clamp((ingredients.len/2),1,3)) + +/obj/item/weapon/reagent_containers/food/snacks/csandwich/Del() + for(var/obj/item/O in ingredients) + del(O) + ..() + +/obj/item/weapon/reagent_containers/food/snacks/csandwich/examine() + ..() + usr << "\blue You think you can see [pick(ingredients)] in there." \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 0d23b0b588c..847274571ed 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -253,6 +253,8 @@ desc = "Probably too incredible for mortal men to fully enjoy." icon_state = "aesirsalad" trash = /obj/item/trash/snack_bowl + filling_color = "#468C00" + New() ..() reagents.add_reagent("nutriment", 8) @@ -264,6 +266,8 @@ desc = "Nougat love it or hate it." icon_state = "candy" trash = /obj/item/trash/candy + filling_color = "#7D5F46" + New() ..() reagents.add_reagent("nutriment", 1) @@ -284,6 +288,8 @@ name = "candy corn" desc = "It's a handful of candy corn. Can be stored in a detective's hat." icon_state = "candy_corn" + filling_color = "#FFFCB0" + New() ..() reagents.add_reagent("nutriment", 4) @@ -295,6 +301,8 @@ desc = "Commander Riker's What-The-Crisps" icon_state = "chips" trash = /obj/item/trash/chips + filling_color = "#E8C31E" + New() ..() reagents.add_reagent("nutriment", 3) @@ -304,6 +312,8 @@ name = "cookie" desc = "COOKIE!!!" icon_state = "COOKIE!!!" + filling_color = "#DBC94F" + New() ..() reagents.add_reagent("nutriment", 5) @@ -313,6 +323,8 @@ name = "Chocolate Bar" desc = "Such, sweet, fattening food." icon_state = "chocolatebar" + filling_color = "#7D5F46" + New() ..() reagents.add_reagent("nutriment", 2) @@ -324,6 +336,8 @@ name = "Chocolate Egg" desc = "Such, sweet, fattening food." icon_state = "chocolateegg" + filling_color = "#7D5F46" + New() ..() reagents.add_reagent("nutriment", 3) @@ -335,6 +349,7 @@ name = "donut" desc = "Goes great with Robust Coffee." icon_state = "donut1" + filling_color = "#D9C386" /obj/item/weapon/reagent_containers/food/snacks/donut/normal name = "donut" @@ -354,6 +369,8 @@ name = "Chaos Donut" desc = "Like life, it never quite tastes the same." icon_state = "donut1" + filling_color = "#ED11E6" + New() ..() reagents.add_reagent("nutriment", 2) @@ -391,6 +408,8 @@ name = "Jelly Donut" desc = "You jelly?" icon_state = "jdonut1" + filling_color = "#ED1169" + New() ..() reagents.add_reagent("nutriment", 3) @@ -406,6 +425,8 @@ name = "Jelly Donut" desc = "You jelly?" icon_state = "jdonut1" + filling_color = "#ED1169" + New() ..() reagents.add_reagent("nutriment", 3) @@ -421,6 +442,8 @@ name = "Jelly Donut" desc = "You jelly?" icon_state = "jdonut1" + filling_color = "#ED1169" + New() ..() reagents.add_reagent("nutriment", 3) @@ -436,6 +459,8 @@ name = "egg" desc = "An egg!" icon_state = "egg" + filling_color = "#FDFFD1" + New() ..() reagents.add_reagent("nutriment", 1) @@ -498,6 +523,8 @@ name = "Fried egg" desc = "A fried egg, with a touch of salt and pepper." icon_state = "friedegg" + filling_color = "#FFDF78" + New() ..() reagents.add_reagent("nutriment", 2) @@ -509,6 +536,8 @@ name = "Boiled egg" desc = "A hard boiled egg." icon_state = "egg" + filling_color = "#FFFFFF" + New() ..() reagents.add_reagent("nutriment", 2) @@ -526,6 +555,8 @@ desc = "An appendix which looks perfectly healthy." icon = 'icons/obj/surgery.dmi' icon_state = "appendix" + filling_color = "#E00D34" + New() ..() reagents.add_reagent("nutriment", 3) @@ -535,21 +566,48 @@ name = "inflamed appendix" desc = "An appendix which appears to be inflamed." icon_state = "appendixinflamed" + filling_color = "#E00D7A" /obj/item/weapon/reagent_containers/food/snacks/tofu name = "Tofu" icon_state = "tofu" desc = "We all love tofu." + filling_color = "#FFFEE0" + New() ..() reagents.add_reagent("nutriment", 3) src.bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/tofurkey + name = "Tofurkey" + desc = "A fake turkey made from tofu." + icon_state = "tofurkey" + filling_color = "#FFFEE0" + + New() + ..() + reagents.add_reagent("nutriment", 12) + reagents.add_reagent("stoxin", 3) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/stuffing + name = "Stuffing" + desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!" + icon_state = "stuffing" + filling_color = "#C9AC83" + + New() + ..() + reagents.add_reagent("nutriment", 3) + bitesize = 1 /obj/item/weapon/reagent_containers/food/snacks/carpmeat name = "carp fillet" desc = "A fillet of spess carp meat" icon_state = "fishfillet" + filling_color = "#FFDEFE" + New() ..() reagents.add_reagent("nutriment", 3) @@ -560,6 +618,8 @@ name = "Fish Fingers" desc = "A finger of fish." icon_state = "fishfingers" + filling_color = "#FFDEFE" + New() ..() reagents.add_reagent("nutriment", 4) @@ -570,6 +630,8 @@ name = "huge mushroom slice" desc = "A slice from a huge mushroom." icon_state = "hugemushroomslice" + filling_color = "#E0D7C5" + New() ..() reagents.add_reagent("nutriment", 3) @@ -580,6 +642,8 @@ name = "tomato slice" desc = "A slice from a huge tomato" icon_state = "tomatomeat" + filling_color = "#DB0000" + New() ..() reagents.add_reagent("nutriment", 3) @@ -589,6 +653,8 @@ name = "bear meat" desc = "A very manly slab of meat." icon_state = "bearmeat" + filling_color = "#DB0000" + New() ..() reagents.add_reagent("nutriment", 12) @@ -599,15 +665,20 @@ name = "meat" desc = "A slab of meat" icon_state = "xenomeat" + filling_color = "#43DE18" + New() ..() reagents.add_reagent("nutriment", 3) src.bitesize = 6 + /obj/item/weapon/reagent_containers/food/snacks/meatball name = "Meatball" desc = "A great meal all round." icon_state = "meatball" + filling_color = "#DB0000" + New() ..() reagents.add_reagent("nutriment", 3) @@ -617,6 +688,8 @@ name = "Sausage" desc = "A piece of mixed, long meat." icon_state = "sausage" + filling_color = "#DB0000" + New() ..() reagents.add_reagent("nutriment", 6) @@ -626,6 +699,8 @@ name = "Donk-pocket" desc = "The food of choice for the seasoned traitor." icon_state = "donkpocket" + filling_color = "#DEDEAB" + New() ..() reagents.add_reagent("nutriment", 4) @@ -643,6 +718,8 @@ name = "brainburger" desc = "A strange looking burger. It looks almost sentient." icon_state = "brainburger" + filling_color = "#F2B6EA" + New() ..() reagents.add_reagent("nutriment", 6) @@ -653,6 +730,8 @@ name = "Ghost Burger" desc = "Spooky! It doesn't look very filling." icon_state = "ghostburger" + filling_color = "#FFF2FF" + New() ..() reagents.add_reagent("nutriment", 2) @@ -662,6 +741,7 @@ /obj/item/weapon/reagent_containers/food/snacks/human var/hname = "" var/job = null + filling_color = "#D63C3C" /obj/item/weapon/reagent_containers/food/snacks/human/burger name = "-burger" @@ -676,6 +756,8 @@ name = "burger" desc = "The cornerstone of every nutritious breakfast." icon_state = "hburger" + filling_color = "#D63C3C" + New() ..() reagents.add_reagent("nutriment", 6) @@ -685,6 +767,8 @@ name = "Fillet -o- Carp Sandwich" desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp." icon_state = "fishburger" + filling_color = "#FFDEFE" + New() ..() reagents.add_reagent("nutriment", 6) @@ -695,6 +779,8 @@ name = "Tofu Burger" desc = "What.. is that meat?" icon_state = "tofuburger" + filling_color = "#FFFEE0" + New() ..() reagents.add_reagent("nutriment", 6) @@ -704,6 +790,8 @@ name = "roburger" desc = "The lettuce is the only organic component. Beep." icon_state = "roburger" + filling_color = "#CCCCCC" + New() ..() reagents.add_reagent("nanites", 2) @@ -713,7 +801,9 @@ name = "roburger" desc = "This massive patty looks like poison. Beep." icon_state = "roburger" + filling_color = "#CCCCCC" volume = 100 + New() ..() reagents.add_reagent("nanites", 100) @@ -723,6 +813,8 @@ name = "xenoburger" desc = "Smells caustic. Tastes like heresy." icon_state = "xburger" + filling_color = "#43DE18" + New() ..() reagents.add_reagent("nutriment", 8) @@ -732,6 +824,8 @@ name = "Clown Burger" desc = "This tastes funny..." icon_state = "clownburger" + filling_color = "#FF00FF" + New() ..() /* @@ -746,6 +840,8 @@ name = "Mime Burger" desc = "Its taste defies language." icon_state = "mimeburger" + filling_color = "#FFFFFF" + New() ..() reagents.add_reagent("nutriment", 6) @@ -756,6 +852,8 @@ desc = "That's all you can say!" icon_state = "omelette" trash = /obj/item/trash/plate + filling_color = "#FFF9A8" + //var/herp = 0 New() ..() @@ -793,6 +891,8 @@ name = "Muffin" desc = "A delicious and spongy little cake" icon_state = "muffin" + filling_color = "#E0CF9B" + New() ..() reagents.add_reagent("nutriment", 6) @@ -803,6 +903,7 @@ desc = "Just like back home, on clown planet! HONK!" icon_state = "pie" trash = /obj/item/trash/plate + filling_color = "#FBFFB8" /obj/item/weapon/reagent_containers/food/snacks/pie/New() ..() @@ -832,6 +933,8 @@ desc = "Mmm, waffles" icon_state = "waffles" trash = /obj/item/trash/waffles + filling_color = "#E6DEB5" + New() ..() reagents.add_reagent("nutriment", 8) @@ -842,6 +945,8 @@ desc = "The only good recipe for eggplant." icon_state = "eggplantparm" trash = /obj/item/trash/plate + filling_color = "#4D2F5E" + New() ..() reagents.add_reagent("nutriment", 6) @@ -852,6 +957,8 @@ desc = "Not made of people. Honest." //Totally people. icon_state = "soylent_green" trash = /obj/item/trash/waffles + filling_color = "#B8E6B5" + New() ..() reagents.add_reagent("nutriment", 10) @@ -862,6 +969,8 @@ desc = "Not made of people. Honest." //Actually honest for once. icon_state = "soylent_yellow" trash = /obj/item/trash/waffles + filling_color = "#E6FA61" + New() ..() reagents.add_reagent("nutriment", 10) @@ -873,6 +982,8 @@ icon_state = "meatpie" desc = "An old barber recipe, very delicious!" trash = /obj/item/trash/plate + filling_color = "#948051" + New() ..() reagents.add_reagent("nutriment", 10) @@ -883,6 +994,8 @@ icon_state = "meatpie" desc = "A delicious tofu pie." trash = /obj/item/trash/plate + filling_color = "#FFFEE0" + New() ..() reagents.add_reagent("nutriment", 10) @@ -892,6 +1005,8 @@ name = "amanita pie" desc = "Sweet and tasty poison pie." icon_state = "amanita_pie" + filling_color = "#FFCCCC" + New() ..() reagents.add_reagent("nutriment", 5) @@ -903,6 +1018,8 @@ name = "plump pie" desc = "I bet you love stuff made out of plump helmets!" icon_state = "plump_pie" + filling_color = "#B8279B" + New() ..() if(prob(10)) @@ -920,6 +1037,8 @@ icon_state = "xenomeatpie" desc = "A delicious meatpie. Probably heretical." trash = /obj/item/trash/plate + filling_color = "#43DE18" + New() ..() reagents.add_reagent("nutriment", 10) @@ -930,6 +1049,8 @@ desc = "A savory dish of alien wing wang in soy." icon_state = "wingfangchu" trash = /obj/item/trash/snack_bowl + filling_color = "#43DE18" + New() ..() reagents.add_reagent("nutriment", 6) @@ -941,6 +1062,8 @@ icon_state = "kabob" desc = "A human meat, on a stick." trash = /obj/item/stack/rods + filling_color = "#A85340" + New() ..() reagents.add_reagent("nutriment", 8) @@ -951,6 +1074,8 @@ icon_state = "kabob" desc = "Delicious meat, on a stick." trash = /obj/item/stack/rods + filling_color = "#A85340" + New() ..() reagents.add_reagent("nutriment", 8) @@ -961,6 +1086,8 @@ icon_state = "kabob" desc = "Vegan meat, on a stick." trash = /obj/item/stack/rods + filling_color = "#FFFEE0" + New() ..() reagents.add_reagent("nutriment", 8) @@ -971,6 +1098,8 @@ desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!" icon_state = "cubancarp" trash = /obj/item/trash/plate + filling_color = "#E9ADFF" + New() ..() reagents.add_reagent("nutriment", 6) @@ -984,6 +1113,8 @@ icon_state = "popcorn" trash = /obj/item/trash/popcorn var/unpopped = 0 + filling_color = "#FFFAD4" + New() ..() unpopped = rand(1,10) @@ -1001,6 +1132,8 @@ icon_state = "sosjerky" desc = "Beef jerky made from the finest space cows." trash = /obj/item/trash/sosjerky + filling_color = "#631212" + New() ..() reagents.add_reagent("nutriment", 4) @@ -1011,6 +1144,8 @@ icon_state = "4no_raisins" desc = "Best raisins in the universe. Not sure why." trash = /obj/item/trash/raisins + filling_color = "#343834" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1019,6 +1154,8 @@ name = "Space Twinkie" icon_state = "space_twinkie" desc = "Guaranteed to survive longer then you will." + filling_color = "#FFE591" + New() ..() reagents.add_reagent("sugar", 4) @@ -1029,6 +1166,8 @@ icon_state = "cheesie_honkers" desc = "Bite sized cheesie snacks that will honk all over your mouth" trash = /obj/item/trash/cheesie + filling_color = "#FFA305" + New() ..() reagents.add_reagent("nutriment", 4) @@ -1074,6 +1213,8 @@ name = "Syndi-Cakes" icon_state = "syndi_cakes" desc = "An extremely moist snack cake that tastes just as good after being nuked." + filling_color = "#FF5D05" + trash = /obj/item/trash/syndi_cakes New() ..() @@ -1085,6 +1226,8 @@ name = "Loaded Baked Potato" desc = "Totally baked." icon_state = "loadedbakedpotato" + filling_color = "#9C7A68" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1095,6 +1238,8 @@ desc = "AKA: French Fries, Freedom Fries, etc" icon_state = "fries" trash = /obj/item/trash/plate + filling_color = "#EDDD00" + New() ..() reagents.add_reagent("nutriment", 4) @@ -1105,6 +1250,8 @@ desc = "Dope from a soy." icon_state = "soydope" trash = /obj/item/trash/plate + filling_color = "#C4BF76" + New() ..() reagents.add_reagent("nutriment", 2) @@ -1114,6 +1261,8 @@ name = "Spagetti" desc = "Now thats a nice pasta!" icon_state = "spagetti" + filling_color = "#EDDD00" + New() ..() reagents.add_reagent("nutriment", 1) @@ -1124,6 +1273,8 @@ desc = "Fries. Covered in cheese. Duh." icon_state = "cheesyfries" trash = /obj/item/trash/plate + filling_color = "#EDDD00" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1133,6 +1284,8 @@ name = "Fortune cookie" desc = "A true prophecy in each cookie!" icon_state = "fortune_cookie" + filling_color = "#E8E79E" + New() ..() reagents.add_reagent("nutriment", 3) @@ -1142,6 +1295,8 @@ name = "Burned mess" desc = "Someone should be demoted from chef for this." icon_state = "badrecipe" + filling_color = "#211F02" + New() ..() reagents.add_reagent("toxin", 1) @@ -1153,6 +1308,8 @@ desc = "A piece of hot spicy meat." icon_state = "meatstake" trash = /obj/item/trash/plate + filling_color = "#7A3D11" + New() ..() reagents.add_reagent("nutriment", 4) @@ -1165,6 +1322,8 @@ desc = "Jello gelatin, from Alfred Hubbard's cookbook" icon_state = "spacylibertyduff" trash = /obj/item/trash/snack_bowl + filling_color = "#42B873" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1176,6 +1335,8 @@ desc = "Looks curiously toxic" icon_state = "amanitajelly" trash = /obj/item/trash/snack_bowl + filling_color = "#ED0758" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1188,6 +1349,8 @@ desc = "It's all twisted up!" icon_state = "poppypretzel" bitesize = 2 + filling_color = "#916E36" + New() ..() reagents.add_reagent("nutriment", 5) @@ -1199,6 +1362,8 @@ desc = "You've got balls kid, BALLS!" icon_state = "meatballsoup" trash = /obj/item/trash/snack_bowl + filling_color = "#785210" + New() ..() reagents.add_reagent("nutriment", 8) @@ -1209,6 +1374,8 @@ name = "slime soup" desc = "If no water is available, you may substitute tears." icon_state = "slimesoup" + filling_color = "#C4DBA0" + New() ..() reagents.add_reagent("slimejelly", 5) @@ -1219,6 +1386,8 @@ name = "Tomato soup" desc = "Smells like copper" icon_state = "tomatosoup" + filling_color = "#FF0000" + New() ..() reagents.add_reagent("nutriment", 2) @@ -1230,6 +1399,8 @@ name = "Clown's Tears" desc = "Not very funny." icon_state = "clownstears" + filling_color = "#C4FBFF" + New() ..() reagents.add_reagent("nutriment", 4) @@ -1242,6 +1413,8 @@ desc = "A true vegan meal" //TODO icon_state = "vegetablesoup" trash = /obj/item/trash/snack_bowl + filling_color = "#AFC4B5" + New() ..() reagents.add_reagent("nutriment", 8) @@ -1253,6 +1426,8 @@ desc = "To think, the botanist would've beat you to death with one of these." icon_state = "nettlesoup" trash = /obj/item/trash/snack_bowl + filling_color = "#AFC4B5" + New() ..() reagents.add_reagent("nutriment", 8) @@ -1265,6 +1440,8 @@ desc = "The mystery is, why aren't you eating it?" icon_state = "mysterysoup" trash = /obj/item/trash/snack_bowl + filling_color = "#F082FF" + New() ..() var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10) @@ -1310,6 +1487,8 @@ desc = "I wish this was soup." icon_state = "wishsoup" trash = /obj/item/trash/snack_bowl + filling_color = "#D1F4FF" + New() ..() reagents.add_reagent("water", 10) @@ -1323,6 +1502,8 @@ desc = "A five alarm Texan Chili!" icon_state = "hotchili" trash = /obj/item/trash/snack_bowl + filling_color = "#FF3C00" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1335,6 +1516,8 @@ name = "Cold Chili" desc = "This slush is barely a liquid!" icon_state = "coldchili" + filling_color = "#2B00FF" + trash = /obj/item/trash/snack_bowl New() ..() @@ -1365,6 +1548,8 @@ desc = "Just add water!" icon_state = "monkeycube" bitesize = 12 + filling_color = "#ADAC7F" + var/wrapped = 0 New() @@ -1526,6 +1711,8 @@ name = "Spell Burger" desc = "This is absolutely Ei Nath." icon_state = "spellburger" + filling_color = "#D505FF" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1535,6 +1722,8 @@ name = "Big Bite Burger" desc = "Forget the Big Mac. THIS is the future!" icon_state = "bigbiteburger" + filling_color = "#E3D681" + New() ..() reagents.add_reagent("nutriment", 14) @@ -1545,6 +1734,8 @@ desc = "Viva La Mexico!" icon_state = "enchiladas" trash = /obj/item/trash/tray + filling_color = "#A36A1F" + New() ..() reagents.add_reagent("nutriment",8) @@ -1556,6 +1747,8 @@ desc = "Eeee Eee!" icon_state = "monkeysdelight" trash = /obj/item/trash/tray + filling_color = "#5C3C11" + New() ..() reagents.add_reagent("nutriment", 10) @@ -1568,6 +1761,8 @@ name = "Baguette" desc = "Bon appetit!" icon_state = "baguette" + filling_color = "#E3D796" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1579,6 +1774,8 @@ name = "Fish and Chips" desc = "I do say so myself chap." icon_state = "fishandchips" + filling_color = "#E3D796" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1590,6 +1787,8 @@ desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud." icon_state = "sandwich" trash = /obj/item/trash/plate + filling_color = "#D9BE29" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1600,6 +1799,8 @@ desc = "Now if you only had a pepper bar." icon_state = "toastedsandwich" trash = /obj/item/trash/plate + filling_color = "#D9BE29" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1611,6 +1812,8 @@ desc = "Goes great with Tomato soup!" icon_state = "toastedsandwich" trash = /obj/item/trash/plate + filling_color = "#D9BE29" + New() ..() reagents.add_reagent("nutriment", 7) @@ -1621,6 +1824,8 @@ desc = "Drinking this feels like being a vampire! A tomato vampire..." icon_state = "tomatosoup" trash = /obj/item/trash/snack_bowl + filling_color = "#D92929" + New() ..() reagents.add_reagent("nutriment", 5) @@ -1632,6 +1837,8 @@ desc = "Waffles from Roffle. Co." icon_state = "rofflewaffles" trash = /obj/item/trash/waffles + filling_color = "#FF00F7" + New() ..() reagents.add_reagent("nutriment", 8) @@ -1642,6 +1849,8 @@ name = "Stew" desc = "A nice and warm stew. Healthy and strong." icon_state = "stew" + filling_color = "#9E673A" + New() ..() reagents.add_reagent("nutriment", 10) @@ -1655,6 +1864,8 @@ desc = "A slice of bread covered with delicious jam." icon_state = "jellytoast" trash = /obj/item/trash/plate + filling_color = "#B572AB" + New() ..() reagents.add_reagent("nutriment", 1) @@ -1674,6 +1885,8 @@ name = "Jelly Burger" desc = "Culinary delight..?" icon_state = "jellyburger" + filling_color = "#B572AB" + New() ..() reagents.add_reagent("nutriment", 5) @@ -1715,6 +1928,8 @@ desc = "A plain dish of noodles, this sucks." icon_state = "spagettiboiled" trash = /obj/item/trash/plate + filling_color = "#FCEE81" + New() ..() reagents.add_reagent("nutriment", 2) @@ -1725,6 +1940,8 @@ desc = "A boring dish of boring rice." icon_state = "boiledrice" trash = /obj/item/trash/snack_bowl + filling_color = "#FFFBDB" + New() ..() reagents.add_reagent("nutriment", 2) @@ -1735,6 +1952,8 @@ desc = "Where's the Jam!" icon_state = "rpudding" trash = /obj/item/trash/snack_bowl + filling_color = "#FFFBDB" + New() ..() reagents.add_reagent("nutriment", 4) @@ -1745,6 +1964,8 @@ desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!" icon_state = "pastatomato" trash = /obj/item/trash/plate + filling_color = "#DE4545" + New() ..() reagents.add_reagent("nutriment", 6) @@ -1756,6 +1977,8 @@ desc = "Now thats a nic'e meatball!" icon_state = "meatballspagetti" trash = /obj/item/trash/plate + filling_color = "#DE4545" + New() ..() reagents.add_reagent("nutriment", 8) @@ -1765,6 +1988,8 @@ name = "Spesslaw" desc = "A lawyers favourite" icon_state = "spesslaw" + filling_color = "#DE4545" + New() ..() reagents.add_reagent("nutriment", 8) @@ -1774,6 +1999,8 @@ name = "Poppy Pretzel" desc = "A large soft pretzel full of POP!" icon_state = "poppypretzel" + filling_color = "#AB7D2E" + New() ..() reagents.add_reagent("nutriment", 5) @@ -1784,6 +2011,8 @@ desc = "Tasty fries from fresh Carrots." icon_state = "carrotfries" trash = /obj/item/trash/plate + filling_color = "#FAA005" + New() ..() reagents.add_reagent("nutriment", 3) @@ -1794,6 +2023,8 @@ name = "Super Bite Burger" desc = "This is a mountain of a burger. FOOD!" icon_state = "superbiteburger" + filling_color = "#CCA26A" + New() ..() reagents.add_reagent("nutriment", 40) @@ -1803,6 +2034,8 @@ name = "Candied Apple" desc = "An apple coated in sugary sweetness." icon_state = "candiedapple" + filling_color = "#F21873" + New() ..() reagents.add_reagent("nutriment", 3) @@ -1812,6 +2045,8 @@ name = "Apple Pie" desc = "A pie containing sweet sweet love...or apple." icon_state = "applepie" + filling_color = "#E0EDC5" + New() ..() reagents.add_reagent("nutriment", 4) @@ -1822,6 +2057,8 @@ name = "Cherry Pie" desc = "Taste so good, make a grown man cry." icon_state = "cherrypie" + filling_color = "#FF525A" + New() ..() reagents.add_reagent("nutriment", 4) @@ -1831,6 +2068,8 @@ name = "Two Bread" desc = "It is very bitter and winy." icon_state = "twobread" + filling_color = "#DBCC9A" + New() ..() reagents.add_reagent("nutriment", 2) @@ -1841,6 +2080,8 @@ desc = "You wish you had some peanut butter to go with this..." icon_state = "jellysandwich" trash = /obj/item/trash/plate + filling_color = "#9E3A78" + New() ..() reagents.add_reagent("nutriment", 2) @@ -1869,6 +2110,8 @@ name = "mint" desc = "it is only wafer thin." icon_state = "mint" + filling_color = "#F2F2F2" + New() ..() reagents.add_reagent("minttoxin", 1) @@ -1879,6 +2122,8 @@ desc = "A delicious and hearty mushroom soup." icon_state = "mushroomsoup" trash = /obj/item/trash/snack_bowl + filling_color = "#E386BF" + New() ..() reagents.add_reagent("nutriment", 8) @@ -1888,6 +2133,8 @@ name = "plump helmet biscuit" desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour." icon_state = "phelmbiscuit" + filling_color = "#CFB4C4" + New() ..() if(prob(10)) @@ -1905,6 +2152,8 @@ desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat." icon_state = "chawanmushi" trash = /obj/item/trash/snack_bowl + filling_color = "#F0F2E4" + New() ..() reagents.add_reagent("nutriment", 5) @@ -1915,6 +2164,8 @@ desc = "Wait, how do you spell it again..?" icon_state = "beetsoup" trash = /obj/item/trash/snack_bowl + filling_color = "#FAC9FF" + New() ..() switch(rand(1,6)) @@ -1938,6 +2189,8 @@ desc = "A tasty salad with apples on top." icon_state = "herbsalad" trash = /obj/item/trash/snack_bowl + filling_color = "#76B87F" + New() ..() reagents.add_reagent("nutriment", 8) @@ -1948,6 +2201,8 @@ desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it." icon_state = "validsalad" trash = /obj/item/trash/snack_bowl + filling_color = "#76B87F" + New() ..() reagents.add_reagent("nutriment", 8) @@ -1959,6 +2214,8 @@ desc = "A tasty dessert that won't make it through a metal detector." icon_state = "gappletart" trash = /obj/item/trash/plate + filling_color = "#FFFF00" + New() ..() reagents.add_reagent("nutriment", 8) @@ -2013,6 +2270,7 @@ icon_state = "meatbread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice slices_num = 5 + filling_color = "#FF7575" New() ..() reagents.add_reagent("nutriment", 30) @@ -2023,6 +2281,7 @@ desc = "A slice of delicious meatbread." icon_state = "meatbreadslice" trash = /obj/item/trash/plate + filling_color = "#FF7575" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread @@ -2031,6 +2290,7 @@ icon_state = "xenomeatbread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice slices_num = 5 + filling_color = "#8AFF75" New() ..() reagents.add_reagent("nutriment", 30) @@ -2041,6 +2301,7 @@ desc = "A slice of delicious meatbread. Extra Heretical." icon_state = "xenobreadslice" trash = /obj/item/trash/plate + filling_color = "#8AFF75" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread @@ -2049,6 +2310,7 @@ icon_state = "bananabread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice slices_num = 5 + filling_color = "#EDE5AD" New() ..() reagents.add_reagent("banana", 20) @@ -2060,6 +2322,7 @@ desc = "A slice of delicious banana bread." icon_state = "bananabreadslice" trash = /obj/item/trash/plate + filling_color = "#EDE5AD" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread @@ -2068,6 +2331,7 @@ icon_state = "tofubread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/tofubreadslice slices_num = 5 + filling_color = "#F7FFE0" New() ..() reagents.add_reagent("nutriment", 30) @@ -2078,6 +2342,7 @@ desc = "A slice of delicious tofubread." icon_state = "tofubreadslice" trash = /obj/item/trash/plate + filling_color = "#F7FFE0" bitesize = 2 @@ -2087,6 +2352,7 @@ icon_state = "carrotcake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice slices_num = 5 + filling_color = "#FFD675" New() ..() reagents.add_reagent("nutriment", 25) @@ -2098,6 +2364,7 @@ desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie." icon_state = "carrotcake_slice" trash = /obj/item/trash/plate + filling_color = "#FFD675" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake @@ -2106,6 +2373,7 @@ icon_state = "braincake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/braincakeslice slices_num = 5 + filling_color = "#E6AEDB" New() ..() reagents.add_reagent("nutriment", 25) @@ -2117,6 +2385,7 @@ desc = "Lemme tell you something about prions. THEY'RE DELICIOUS." icon_state = "braincakeslice" trash = /obj/item/trash/plate + filling_color = "#E6AEDB" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake @@ -2125,6 +2394,7 @@ icon_state = "cheesecake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice slices_num = 5 + filling_color = "#FAF7AF" New() ..() reagents.add_reagent("nutriment", 25) @@ -2135,6 +2405,7 @@ desc = "Slice of pure cheestisfaction" icon_state = "cheesecake_slice" trash = /obj/item/trash/plate + filling_color = "#FAF7AF" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake @@ -2143,6 +2414,7 @@ icon_state = "plaincake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice slices_num = 5 + filling_color = "#F7EDD5" New() ..() reagents.add_reagent("nutriment", 20) @@ -2152,6 +2424,7 @@ desc = "Just a slice of cake, it is enough for everyone." icon_state = "plaincake_slice" trash = /obj/item/trash/plate + filling_color = "#F7EDD5" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake @@ -2160,6 +2433,7 @@ icon_state = "orangecake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice slices_num = 5 + filling_color = "#FADA8E" New() ..() reagents.add_reagent("nutriment", 20) @@ -2169,6 +2443,7 @@ desc = "Just a slice of cake, it is enough for everyone." icon_state = "orangecake_slice" trash = /obj/item/trash/plate + filling_color = "#FADA8E" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake @@ -2177,6 +2452,7 @@ icon_state = "limecake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/limecakeslice slices_num = 5 + filling_color = "#CBFA8E" New() ..() reagents.add_reagent("nutriment", 20) @@ -2186,6 +2462,7 @@ desc = "Just a slice of cake, it is enough for everyone." icon_state = "limecake_slice" trash = /obj/item/trash/plate + filling_color = "#CBFA8E" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake @@ -2194,6 +2471,7 @@ icon_state = "lemoncake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice slices_num = 5 + filling_color = "#FAFA8E" New() ..() reagents.add_reagent("nutriment", 20) @@ -2203,6 +2481,7 @@ desc = "Just a slice of cake, it is enough for everyone." icon_state = "lemoncake_slice" trash = /obj/item/trash/plate + filling_color = "#FAFA8E" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake @@ -2211,6 +2490,7 @@ icon_state = "chocolatecake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice slices_num = 5 + filling_color = "#805930" New() ..() reagents.add_reagent("nutriment", 20) @@ -2220,6 +2500,7 @@ desc = "Just a slice of cake, it is enough for everyone." icon_state = "chocolatecake_slice" trash = /obj/item/trash/plate + filling_color = "#805930" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel @@ -2228,6 +2509,7 @@ icon_state = "cheesewheel" slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesewedge slices_num = 5 + filling_color = "#FFF700" New() ..() reagents.add_reagent("nutriment", 20) @@ -2237,6 +2519,7 @@ name = "Cheese wedge" desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far." icon_state = "cheesewedge" + filling_color = "#FFF700" bitesize = 2 @@ -2247,6 +2530,7 @@ icon_state = "birthdaycake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice slices_num = 5 + filling_color = "#FFD6D6" New() ..() reagents.add_reagent("nutriment", 20) @@ -2258,6 +2542,7 @@ desc = "A slice of your birthday" icon_state = "birthdaycakeslice" trash = /obj/item/trash/plate + filling_color = "#FFD6D6" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread @@ -2266,6 +2551,8 @@ icon_state = "bread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice slices_num = 5 + filling_color = "#FFE396" + New() ..() reagents.add_reagent("nutriment", 6) @@ -2276,6 +2563,7 @@ desc = "A slice of home." icon_state = "breadslice" trash = /obj/item/trash/plate + filling_color = "#FFE396" bitesize = 2 @@ -2285,6 +2573,7 @@ icon_state = "creamcheesebread" slice_path = /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice slices_num = 5 + filling_color = "#FFF896" New() ..() reagents.add_reagent("nutriment", 20) @@ -2295,6 +2584,7 @@ desc = "A slice of yum!" icon_state = "creamcheesebreadslice" trash = /obj/item/trash/plate + filling_color = "#FFF896" bitesize = 2 @@ -2302,6 +2592,7 @@ name = "Watermelon Slice" desc = "A slice of watery goodness." icon_state = "watermelonslice" + filling_color = "#FF3867" bitesize = 2 @@ -2311,6 +2602,7 @@ icon_state = "applecake" slice_path = /obj/item/weapon/reagent_containers/food/snacks/applecakeslice slices_num = 5 + filling_color = "#EBF5B8" New() ..() reagents.add_reagent("nutriment", 15) @@ -2320,6 +2612,7 @@ desc = "A slice of heavenly cake." icon_state = "applecakeslice" trash = /obj/item/trash/plate + filling_color = "#EBF5B8" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie @@ -2328,6 +2621,8 @@ icon_state = "pumpkinpie" slice_path = /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice slices_num = 5 + filling_color = "#F5B951" + New() ..() reagents.add_reagent("nutriment", 15) @@ -2337,12 +2632,14 @@ desc = "A slice of pumpkin pie, with whipped cream on top. Perfection." icon_state = "pumpkinpieslice" trash = /obj/item/trash/plate + filling_color = "#F5B951" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/cracker name = "Cracker" desc = "It's a salted cracker." icon_state = "cracker" + filling_color = "#F5DEB8" New() ..() @@ -2354,6 +2651,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza slices_num = 6 + filling_color = "#BAA14C" /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita name = "Margherita" @@ -2371,6 +2669,7 @@ name = "Margherita slice" desc = "A slice of the most cheezy pizza in galaxy" icon_state = "pizzamargheritaslice" + filling_color = "#BAA14C" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza @@ -2389,6 +2688,7 @@ name = "Meatpizza slice" desc = "A slice of " //TODO: icon_state = "meatpizzaslice" + filling_color = "#BAA14C" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza @@ -2406,6 +2706,7 @@ name = "Mushroompizza slice" desc = "Maybe it is the last slice of pizza in your life." icon_state = "mushroompizzaslice" + filling_color = "#BAA14C" bitesize = 2 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza @@ -2425,6 +2726,7 @@ name = "Vegetable pizza slice" desc = "A slice of the most green pizza of all pizzas not containing green ingredients " icon_state = "vegetablepizzaslice" + filling_color = "#BAA14C" bitesize = 2 /obj/item/pizzabox @@ -2714,6 +3016,8 @@ desc = "It's like an enormous, leathery carrot. With an eye." icon_state = "dionaroast" trash = /obj/item/trash/plate + filling_color = "#75754B" + New() ..() reagents.add_reagent("nutriment", 6) diff --git a/code/modules/reagents/reagent_containers/food/snacks/grown.dm b/code/modules/reagents/reagent_containers/food/snacks/grown.dm index 5144779ec09..debde5f7bc5 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/grown.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/grown.dm @@ -114,6 +114,7 @@ desc = "Needs some butter!" icon_state = "corn" potency = 40 + filling_color = "#FFEE00" trash = /obj/item/weapon/corncob New() @@ -127,6 +128,7 @@ name = "cherries" desc = "Great for toppings!" icon_state = "cherry" + filling_color = "#FF0000" gender = PLURAL New() ..() @@ -141,6 +143,7 @@ desc = "Long-used as a symbol of rest, peace, and death." icon_state = "poppy" potency = 30 + filling_color = "#CC6464" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -154,6 +157,7 @@ desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten’d not thy breath.\"" icon_state = "harebell" potency = 1 + filling_color = "#D4B2C9" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -166,6 +170,7 @@ desc = "Boil 'em! Mash 'em! Stick 'em in a stew!" icon_state = "potato" potency = 25 + filling_color = "#E6E8DA" New() ..() reagents.add_reagent("nutriment", 1+round((potency / 10), 1)) @@ -190,6 +195,7 @@ name = "bunch of grapes" desc = "Nutritious!" icon_state = "grapes" + filling_color = "#A332AD" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -203,6 +209,7 @@ desc = "Nutritious!" icon_state = "greengrapes" potency = 25 + filling_color = "#A6FFA3" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -216,6 +223,7 @@ desc = "Ewwwwwwwwww. Cabbage." icon_state = "cabbage" potency = 25 + filling_color = "#A2B5A1" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -227,6 +235,7 @@ name = "bunch of berries" desc = "Nutritious!" icon_state = "berrypile" + filling_color = "#C2C9FF" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -238,18 +247,66 @@ name = "clump of plastellium" desc = "Hmm, needs some processing" icon_state = "plastellium" + filling_color = "#C4C4C4" New() ..() spawn(5) //So potency can be set in the proc that creates these crops reagents.add_reagent("plasticide", 1+round((potency / 10), 1)) bitesize = 1+round(reagents.total_volume / 2, 1) + +/obj/item/weapon/reagent_containers/food/snacks/grown/shand + seed = "/obj/item/seeds/shandseed" + name = "S'rendarr's Hand leaf" + desc = "A leaf sample from a lowland thicket shrub, often hid in by prey and predator to staunch their wounds and conceal their scent, allowing the plant to spread far on its native Ahdomai. Smells strongly like wax." + icon_state = "shand" + filling_color = "#70C470" + New() + ..() + spawn(5) //So potency can be set in the proc that creates these crops + reagents.add_reagent("bicaridine", round((potency / 10), 1)) + bitesize = 1+round(reagents.total_volume / 2, 1) + +/obj/item/weapon/reagent_containers/food/snacks/grown/mtear + seed = "/obj/item/seeds/mtearseed" + name = "sprig of Messa's Tear" + desc = "A mountain climate herb with a soft, cold blue flower, known to contain an abundance of chemicals in it's flower useful to treating burns- Bad for the allergic to pollen." + icon_state = "mtear" + filling_color = "#70C470" + New() + ..() + spawn(5) //So potency can be set in the proc that creates these crops + reagents.add_reagent("honey", 1+round((potency / 10), 1)) + reagents.add_reagent("kelotane", 3+round((potency / 5), 1)) + bitesize = 1+round(reagents.total_volume / 2, 1) + +/obj/item/weapon/reagent_containers/food/snacks/grown/mtear/attack_self(mob/user as mob) + if(istype(user.loc,/turf/space)) + return + var/obj/item/stack/medical/ointment/tajaran/poultice = new /obj/item/stack/medical/ointment/tajaran(user.loc) + + poultice.heal_burn = potency + del(src) + + user << "You mash the petals into a poultice." + +/obj/item/weapon/reagent_containers/food/snacks/grown/shand/attack_self(mob/user as mob) + if(istype(user.loc,/turf/space)) + return + var/obj/item/stack/medical/bruise_pack/tajaran/poultice = new /obj/item/stack/medical/bruise_pack/tajaran(user.loc) + + poultice.heal_brute = potency + del(src) + + user << "You mash the leaves into a poultice." + /obj/item/weapon/reagent_containers/food/snacks/grown/glowberries seed = "/obj/item/seeds/glowberryseed" name = "bunch of glow-berries" desc = "Nutritious!" var/light_on = 1 var/brightness_on = 2 //luminosity when on + filling_color = "#D3FF9E" icon_state = "glowberrypile" New() ..() @@ -277,6 +334,7 @@ desc = "Fattening... Mmmmm... chucklate." icon_state = "cocoapod" potency = 50 + filling_color = "#9C8E54" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -290,6 +348,7 @@ desc = "Sickly sweet." icon_state = "sugarcane" potency = 50 + filling_color = "#C0C9AD" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -302,6 +361,7 @@ icon_state = "poisonberrypile" gender = PLURAL potency = 15 + filling_color = "#B422C7" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -316,6 +376,7 @@ icon_state = "deathberrypile" gender = PLURAL potency = 50 + filling_color = "#4E0957" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -331,6 +392,7 @@ icon_state = "ambrosiavulgaris" slot_flags = SLOT_HEAD potency = 10 + filling_color = "#125709" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -365,6 +427,7 @@ icon_state = "ambrosiadeus" slot_flags = SLOT_HEAD potency = 10 + filling_color = "#229E11" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -397,6 +460,7 @@ desc = "It's a little piece of Eden." icon_state = "apple" potency = 15 + filling_color = "#DFE88B" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -410,6 +474,7 @@ desc = "It's a little piece of Eden." icon_state = "apple" potency = 15 + filling_color = "#B3BD5E" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -423,6 +488,7 @@ desc = "Emblazoned upon the apple is the word 'Kallisti'." icon_state = "goldapple" potency = 15 + filling_color = "#F5CB42" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -442,6 +508,7 @@ desc = "It's full of watery goodness." icon_state = "watermelon" potency = 10 + filling_color = "#FA2863" slice_path = /obj/item/weapon/reagent_containers/food/snacks/watermelonslice slices_num = 5 New() @@ -456,6 +523,7 @@ desc = "It's large and scary." icon_state = "pumpkin" potency = 10 + filling_color = "#FAB728" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -477,6 +545,7 @@ desc = "It's so sour, your face will twist." icon_state = "lime" potency = 20 + filling_color = "#28FA59" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -489,6 +558,7 @@ desc = "When life gives you lemons, be grateful they aren't limes." icon_state = "lemon" potency = 20 + filling_color = "#FAF328" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -501,6 +571,7 @@ desc = "It's an tangy fruit." icon_state = "orange" potency = 20 + filling_color = "#FAAD28" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -513,6 +584,7 @@ desc = "You can't beat white-beet." icon_state = "whitebeet" potency = 15 + filling_color = "#FFFCCC" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -527,6 +599,7 @@ icon = 'icons/obj/items.dmi' icon_state = "banana" item_state = "banana" + filling_color = "#FCF695" trash = /obj/item/weapon/bananapeel New() @@ -542,6 +615,7 @@ name = "chili" desc = "It's spicy! Wait... IT'S BURNING ME!!" icon_state = "chilipepper" + filling_color = "#FF0000" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -559,6 +633,7 @@ name = "eggplant" desc = "Maybe there's a chicken inside?" icon_state = "eggplant" + filling_color = "#550F5C" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -570,6 +645,7 @@ name = "soybeans" desc = "It's pretty bland, but oh the possibilities..." gender = PLURAL + filling_color = "#E6E8B7" icon_state = "soybeans" New() ..() @@ -620,6 +696,7 @@ name = "tomato" desc = "I say to-mah-to, you say tom-mae-to." icon_state = "tomato" + filling_color = "#FF0000" potency = 10 New() ..() @@ -640,6 +717,7 @@ desc = "I say to-mah-to, you say tom-mae-to... OH GOD IT'S EATING MY LEGS!!" icon_state = "killertomato" potency = 10 + filling_color = "#FF0000" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -669,6 +747,7 @@ desc = "So bloody...so...very...bloody....AHHHH!!!!" icon_state = "bloodtomato" potency = 10 + filling_color = "#FF0000" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -692,6 +771,7 @@ desc = "I say blue-mah-to, you say blue-mae-to." icon_state = "bluetomato" potency = 10 + filling_color = "#586CFC" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -727,6 +807,7 @@ desc = "Sigh... wheat... a-grain?" gender = PLURAL icon_state = "wheat" + filling_color = "#F7E186" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -739,6 +820,7 @@ desc = "Rice to see you." gender = PLURAL icon_state = "rice" + filling_color = "#FFF8DB" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -750,6 +832,7 @@ name = "kudzu pod" desc = "Pueraria Virallis: An invasive species with vines that rapidly creep and wrap around whatever they contact." icon_state = "kudzupod" + filling_color = "#59691B" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -763,6 +846,7 @@ desc = "It's a mutant strain of chili" icon_state = "icepepper" potency = 20 + filling_color = "#66CEED" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -781,6 +865,7 @@ desc = "It's good for the eyes!" icon_state = "carrot" potency = 10 + filling_color = "#FFC400" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -794,6 +879,7 @@ desc = "Ganoderma lucidum: A special fungus believed to help relieve stress." icon_state = "reishi" potency = 10 + filling_color = "#FF4800" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -814,6 +900,7 @@ desc = "Amanita Muscaria: Learn poisonous mushrooms by heart. Only pick mushrooms you know." icon_state = "amanita" potency = 10 + filling_color = "#FF0000" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -834,6 +921,7 @@ desc = "Amanita Virosa: Deadly poisonous basidiomycete fungus filled with alpha amatoxins." icon_state = "angel" potency = 35 + filling_color = "#FFDEDE" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -854,6 +942,7 @@ desc = "Psilocybe Semilanceata: Liberate yourself!" icon_state = "libertycap" potency = 15 + filling_color = "#F714BE" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -871,6 +960,7 @@ name = "plump-helmet" desc = "Plumus Hellmus: Plump, soft and s-so inviting~" icon_state = "plumphelmet" + filling_color = "#F714BE" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -882,6 +972,7 @@ name = "walking mushroom" desc = "Plumus Locomotus: The beginning of the great walk." icon_state = "walkingmushroom" + filling_color = "#FFBFEF" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -910,6 +1001,7 @@ name = "chanterelle cluster" desc = "Cantharellus Cibarius: These jolly yellow little shrooms sure look tasty!" icon_state = "chanterelle" + filling_color = "#FFE991" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -921,6 +1013,7 @@ name = "glowshroom cluster" desc = "Mycena Bregprox: This species of mushroom glows in the dark. Or does it?" icon_state = "glowshroom" + filling_color = "#DAFF91" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -1018,6 +1111,7 @@ icon_state = "bluespacetomato" potency = 20 origin_tech = "bluespace=3" + filling_color = "#91F8FF" New() ..() spawn(5) //So potency can be set in the proc that creates these crops @@ -1170,4 +1264,4 @@ ..() spawn(5) //So potency can be set in the proc that creates these crops reagents.add_reagent("teapowder", 1+round((potency / 10), 2)) - reagents.add_reagent("kelotane", 1+round((potency / 20), 1)) \ No newline at end of file + reagents.add_reagent("kelotane", 1+round((potency / 20), 1)) diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index 3acaaffe9d1..ed66d024826 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -3,6 +3,7 @@ desc = "A slab of meat" icon_state = "meat" health = 180 + filling_color = "#FF1C1C" New() ..() reagents.add_reagent("nutriment", 3)