diff --git a/code/modules/reagents/reagent_containers/food.dm b/code/modules/reagents/reagent_containers/food.dm index 1e797d6040..4caf08cc31 100644 --- a/code/modules/reagents/reagent_containers/food.dm +++ b/code/modules/reagents/reagent_containers/food.dm @@ -13,7 +13,7 @@ /obj/item/weapon/reagent_containers/food/New() ..() - if (!pixel_x && !pixel_y) + if (isnull(center_of_mass) && !pixel_x && !pixel_y) src.pixel_x = rand(-6.0, 6) //Randomizes postion src.pixel_y = rand(-6.0, 6) diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index a5c820d96b..b2bcb99f5a 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -11,7 +11,7 @@ var/slices_num var/dried_type = null var/dry = 0 - center_of_mass = list("x"=15, "y"=15) + center_of_mass = list("x"=16, "y"=16) w_class = 2 //Placeholder for effect that trigger on eating that aren't tied to reagents. @@ -250,6 +250,7 @@ icon_state = "aesirsalad" trash = /obj/item/trash/snack_bowl filling_color = "#468C00" + center_of_mass = list("x"=17, "y"=11) New() ..() @@ -264,6 +265,7 @@ icon_state = "candy" trash = /obj/item/trash/candy filling_color = "#7D5F46" + center_of_mass = list("x"=15, "y"=15) New() ..() @@ -275,6 +277,7 @@ name = "Donor Candy" desc = "A little treat for blood donors." trash = /obj/item/trash/candy + New() ..() reagents.add_reagent("nutriment", 10) @@ -286,6 +289,7 @@ desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas." icon_state = "candy_corn" filling_color = "#FFFCB0" + center_of_mass = list("x"=14, "y"=10) New() ..() @@ -299,6 +303,7 @@ icon_state = "chips" trash = /obj/item/trash/chips filling_color = "#E8C31E" + center_of_mass = list("x"=15, "y"=15) New() ..() @@ -310,6 +315,7 @@ desc = "COOKIE!!!" icon_state = "COOKIE!!!" filling_color = "#DBC94F" + center_of_mass = list("x"=17, "y"=18) New() ..() @@ -321,6 +327,7 @@ desc = "Such sweet, fattening food." icon_state = "chocolatebar" filling_color = "#7D5F46" + center_of_mass = list("x"=15, "y"=15) New() ..() @@ -334,6 +341,7 @@ desc = "Such sweet, fattening food." icon_state = "chocolateegg" filling_color = "#7D5F46" + center_of_mass = list("x"=16, "y"=13) New() ..() @@ -348,6 +356,7 @@ icon_state = "donut1" filling_color = "#D9C386" var/overlay_state = "box-donut1" + center_of_mass = list("x"=13, "y"=16) /obj/item/weapon/reagent_containers/food/snacks/donut/normal name = "donut" @@ -363,6 +372,7 @@ src.overlay_state = "box-donut2" src.name = "frosted donut" reagents.add_reagent("sprinkles", 2) + center_of_mass = list("x"=19, "y"=16) /obj/item/weapon/reagent_containers/food/snacks/donut/chaos name = "Chaos Donut" @@ -409,6 +419,7 @@ desc = "You jelly?" icon_state = "jdonut1" filling_color = "#ED1169" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -427,6 +438,7 @@ desc = "You jelly?" icon_state = "jdonut1" filling_color = "#ED1169" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -445,6 +457,7 @@ desc = "You jelly?" icon_state = "jdonut1" filling_color = "#ED1169" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -464,6 +477,7 @@ icon_state = "egg" filling_color = "#FDFFD1" volume = 10 + center_of_mass = list("x"=16, "y"=13) /obj/item/weapon/reagent_containers/food/snacks/egg/New() ..() @@ -529,6 +543,7 @@ desc = "A fried egg, with a touch of salt and pepper." icon_state = "friedegg" filling_color = "#FFDF78" + center_of_mass = list("x"=16, "y"=14) New() ..() @@ -553,6 +568,7 @@ icon = 'icons/obj/surgery.dmi' icon_state = "appendix" filling_color = "#E00D34" + center_of_mass = list("x"=16, "y"=16) New() ..() @@ -565,6 +581,7 @@ icon_state = "tofu" desc = "We all love tofu." filling_color = "#FFFEE0" + center_of_mass = list("x"=17, "y"=10) New() ..() @@ -576,6 +593,7 @@ desc = "A fake turkey made from tofu." icon_state = "tofurkey" filling_color = "#FFFEE0" + center_of_mass = list("x"=16, "y"=8) New() ..() @@ -588,6 +606,7 @@ desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!" icon_state = "stuffing" filling_color = "#C9AC83" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -599,6 +618,7 @@ desc = "A fillet of spess carp meat" icon_state = "fishfillet" filling_color = "#FFDEFE" + center_of_mass = list("x"=17, "y"=13) New() ..() @@ -611,6 +631,7 @@ desc = "A finger of fish." icon_state = "fishfingers" filling_color = "#FFDEFE" + center_of_mass = list("x"=16, "y"=13) New() ..() @@ -623,6 +644,7 @@ desc = "A slice from a huge mushroom." icon_state = "hugemushroomslice" filling_color = "#E0D7C5" + center_of_mass = list("x"=17, "y"=16) New() ..() @@ -635,6 +657,7 @@ desc = "A slice from a huge tomato" icon_state = "tomatomeat" filling_color = "#DB0000" + center_of_mass = list("x"=17, "y"=16) New() ..() @@ -646,6 +669,7 @@ desc = "A very manly slab of meat." icon_state = "bearmeat" filling_color = "#DB0000" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -658,6 +682,7 @@ desc = "A slab of green meat. Smells like acid." icon_state = "xenomeat" filling_color = "#43DE18" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -670,6 +695,7 @@ desc = "A great meal all round." icon_state = "meatball" filling_color = "#DB0000" + center_of_mass = list("x"=16, "y"=16) New() ..() @@ -681,6 +707,7 @@ desc = "A piece of mixed, long meat." icon_state = "sausage" filling_color = "#DB0000" + center_of_mass = list("x"=16, "y"=16) New() ..() @@ -709,6 +736,7 @@ desc = "The food of choice for the seasoned traitor." icon_state = "donkpocket" filling_color = "#DEDEAB" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -739,6 +767,7 @@ desc = "A strange looking burger. It looks almost sentient." icon_state = "brainburger" filling_color = "#F2B6EA" + center_of_mass = list("x"=15, "y"=11) New() ..() @@ -751,6 +780,7 @@ desc = "Spooky! It doesn't look very filling." icon_state = "ghostburger" filling_color = "#FFF2FF" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -767,6 +797,7 @@ name = "-burger" desc = "A bloody burger." icon_state = "hburger" + center_of_mass = list("x"=16, "y"=11) New() ..() reagents.add_reagent("protein", 6) @@ -776,6 +807,8 @@ name = "cheeseburger" desc = "The cheese adds a good flavor." icon_state = "cheeseburger" + center_of_mass = list("x"=16, "y"=11) + New() ..() reagents.add_reagent("protein", 2) @@ -786,6 +819,7 @@ desc = "The cornerstone of every nutritious breakfast." icon_state = "hburger" filling_color = "#D63C3C" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -798,6 +832,7 @@ 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" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -810,6 +845,7 @@ desc = "What.. is that meat?" icon_state = "tofuburger" filling_color = "#FFFEE0" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -821,6 +857,7 @@ desc = "The lettuce is the only organic component. Beep." icon_state = "roburger" filling_color = "#CCCCCC" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -835,6 +872,7 @@ icon_state = "roburger" filling_color = "#CCCCCC" volume = 100 + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -846,6 +884,7 @@ desc = "Smells caustic. Tastes like heresy." icon_state = "xburger" filling_color = "#43DE18" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -857,6 +896,7 @@ desc = "This tastes funny..." icon_state = "clownburger" filling_color = "#FF00FF" + center_of_mass = list("x"=17, "y"=12) New() ..() @@ -868,6 +908,7 @@ desc = "Its taste defies language." icon_state = "mimeburger" filling_color = "#FFFFFF" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -880,6 +921,7 @@ icon_state = "omelette" trash = /obj/item/trash/plate filling_color = "#FFF9A8" + center_of_mass = list("x"=16, "y"=13) //var/herp = 0 New() @@ -892,6 +934,7 @@ desc = "A delicious and spongy little cake" icon_state = "muffin" filling_color = "#E0CF9B" + center_of_mass = list("x"=17, "y"=4) New() ..() @@ -904,6 +947,7 @@ icon_state = "pie" trash = /obj/item/trash/plate filling_color = "#FBFFB8" + center_of_mass = list("x"=16, "y"=13) /obj/item/weapon/reagent_containers/food/snacks/pie/New() ..() @@ -922,6 +966,8 @@ desc = "No black birds, this is a good sign." icon_state = "berryclafoutis" trash = /obj/item/trash/plate + center_of_mass = list("x"=16, "y"=13) + New() ..() reagents.add_reagent("nutriment", 4) @@ -934,6 +980,7 @@ icon_state = "waffles" trash = /obj/item/trash/waffles filling_color = "#E6DEB5" + center_of_mass = list("x"=15, "y"=11) New() ..() @@ -946,6 +993,7 @@ icon_state = "eggplantparm" trash = /obj/item/trash/plate filling_color = "#4D2F5E" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -958,6 +1006,7 @@ icon_state = "soylent_green" trash = /obj/item/trash/waffles filling_color = "#B8E6B5" + center_of_mass = list("x"=15, "y"=11) New() ..() @@ -970,6 +1019,7 @@ icon_state = "soylent_yellow" trash = /obj/item/trash/waffles filling_color = "#E6FA61" + center_of_mass = list("x"=15, "y"=11) New() ..() @@ -983,6 +1033,7 @@ desc = "An old barber recipe, very delicious!" trash = /obj/item/trash/plate filling_color = "#948051" + center_of_mass = list("x"=16, "y"=13) New() ..() @@ -995,6 +1046,7 @@ desc = "A delicious tofu pie." trash = /obj/item/trash/plate filling_color = "#FFFEE0" + center_of_mass = list("x"=16, "y"=13) New() ..() @@ -1006,6 +1058,7 @@ desc = "Sweet and tasty poison pie." icon_state = "amanita_pie" filling_color = "#FFCCCC" + center_of_mass = list("x"=17, "y"=9) New() ..() @@ -1019,6 +1072,7 @@ desc = "I bet you love stuff made out of plump helmets!" icon_state = "plump_pie" filling_color = "#B8279B" + center_of_mass = list("x"=17, "y"=9) New() ..() @@ -1038,6 +1092,7 @@ desc = "A delicious meatpie. Probably heretical." trash = /obj/item/trash/plate filling_color = "#43DE18" + center_of_mass = list("x"=16, "y"=13) New() ..() @@ -1050,6 +1105,7 @@ icon_state = "wingfangchu" trash = /obj/item/trash/snack_bowl filling_color = "#43DE18" + center_of_mass = list("x"=17, "y"=9) New() ..() @@ -1063,6 +1119,7 @@ desc = "A human meat, on a stick." trash = /obj/item/stack/rods filling_color = "#A85340" + center_of_mass = list("x"=17, "y"=15) New() ..() @@ -1075,6 +1132,7 @@ desc = "Delicious meat, on a stick." trash = /obj/item/stack/rods filling_color = "#A85340" + center_of_mass = list("x"=17, "y"=15) New() ..() @@ -1087,6 +1145,7 @@ desc = "Vegan meat, on a stick." trash = /obj/item/stack/rods filling_color = "#FFFEE0" + center_of_mass = list("x"=17, "y"=15) New() ..() @@ -1099,6 +1158,7 @@ icon_state = "cubancarp" trash = /obj/item/trash/plate filling_color = "#E9ADFF" + center_of_mass = list("x"=12, "y"=5) New() ..() @@ -1115,6 +1175,7 @@ trash = /obj/item/trash/popcorn var/unpopped = 0 filling_color = "#FFFAD4" + center_of_mass = list("x"=16, "y"=8) New() ..() @@ -1134,6 +1195,7 @@ desc = "Beef jerky made from the finest space cows." trash = /obj/item/trash/sosjerky filling_color = "#631212" + center_of_mass = list("x"=15, "y"=9) New() ..() @@ -1146,6 +1208,7 @@ desc = "Best raisins in the universe. Not sure why." trash = /obj/item/trash/raisins filling_color = "#343834" + center_of_mass = list("x"=15, "y"=4) New() ..() @@ -1156,6 +1219,7 @@ icon_state = "space_twinkie" desc = "Guaranteed to survive longer then you will." filling_color = "#FFE591" + center_of_mass = list("x"=15, "y"=11) New() ..() @@ -1168,6 +1232,7 @@ desc = "Bite sized cheesie snacks that will honk all over your mouth" trash = /obj/item/trash/cheesie filling_color = "#FFA305" + center_of_mass = list("x"=15, "y"=9) New() ..() @@ -1179,6 +1244,7 @@ icon_state = "syndi_cakes" desc = "An extremely moist snack cake that tastes just as good after being nuked." filling_color = "#FF5D05" + center_of_mass = list("x"=16, "y"=10) trash = /obj/item/trash/syndi_cakes New() @@ -1192,6 +1258,7 @@ desc = "Totally baked." icon_state = "loadedbakedpotato" filling_color = "#9C7A68" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -1205,6 +1272,7 @@ icon_state = "fries" trash = /obj/item/trash/plate filling_color = "#EDDD00" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -1217,6 +1285,7 @@ icon_state = "soydope" trash = /obj/item/trash/plate filling_color = "#C4BF76" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -1228,6 +1297,7 @@ desc = "A bundle of raw spaghetti." icon_state = "spagetti" filling_color = "#EDDD00" + center_of_mass = list("x"=16, "y"=16) New() ..() @@ -1240,6 +1310,7 @@ icon_state = "cheesyfries" trash = /obj/item/trash/plate filling_color = "#EDDD00" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -1252,6 +1323,7 @@ desc = "A true prophecy in each cookie!" icon_state = "fortune_cookie" filling_color = "#E8E79E" + center_of_mass = list("x"=15, "y"=14) New() ..() @@ -1263,6 +1335,7 @@ desc = "Someone should be demoted from chef for this." icon_state = "badrecipe" filling_color = "#211F02" + center_of_mass = list("x"=16, "y"=12) New() ..() @@ -1276,6 +1349,7 @@ icon_state = "meatstake" trash = /obj/item/trash/plate filling_color = "#7A3D11" + center_of_mass = list("x"=16, "y"=13) New() ..() @@ -1290,6 +1364,7 @@ icon_state = "spacylibertyduff" trash = /obj/item/trash/snack_bowl filling_color = "#42B873" + center_of_mass = list("x"=16, "y"=8) New() ..() @@ -1303,6 +1378,7 @@ icon_state = "amanitajelly" trash = /obj/item/trash/snack_bowl filling_color = "#ED0758" + center_of_mass = list("x"=16, "y"=5) New() ..() @@ -1317,6 +1393,7 @@ icon_state = "poppypretzel" bitesize = 2 filling_color = "#916E36" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -1330,6 +1407,7 @@ icon_state = "meatballsoup" trash = /obj/item/trash/snack_bowl filling_color = "#785210" + center_of_mass = list("x"=16, "y"=8) New() ..() @@ -1340,7 +1418,7 @@ /obj/item/weapon/reagent_containers/food/snacks/slimesoup name = "slime soup" desc = "If no water is available, you may substitute tears." - icon_state = "slimesoup" + icon_state = "slimesoup" //nonexistant? filling_color = "#C4DBA0" New() @@ -1354,6 +1432,7 @@ desc = "Smells like copper." icon_state = "tomatosoup" filling_color = "#FF0000" + center_of_mass = list("x"=16, "y"=7) New() ..() @@ -1367,6 +1446,7 @@ desc = "Not very funny." icon_state = "clownstears" filling_color = "#C4FBFF" + center_of_mass = list("x"=16, "y"=7) New() ..() @@ -1381,6 +1461,7 @@ icon_state = "vegetablesoup" trash = /obj/item/trash/snack_bowl filling_color = "#AFC4B5" + center_of_mass = list("x"=16, "y"=8) New() ..() @@ -1394,6 +1475,7 @@ icon_state = "nettlesoup" trash = /obj/item/trash/snack_bowl filling_color = "#AFC4B5" + center_of_mass = list("x"=16, "y"=7) New() ..() @@ -1408,6 +1490,7 @@ icon_state = "mysterysoup" trash = /obj/item/trash/snack_bowl filling_color = "#F082FF" + center_of_mass = list("x"=16, "y"=6) New() ..() @@ -1455,6 +1538,7 @@ icon_state = "wishsoup" trash = /obj/item/trash/snack_bowl filling_color = "#D1F4FF" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -1470,6 +1554,7 @@ icon_state = "hotchili" trash = /obj/item/trash/snack_bowl filling_color = "#FF3C00" + center_of_mass = list("x"=15, "y"=9) New() ..() @@ -1485,6 +1570,7 @@ desc = "This slush is barely a liquid!" icon_state = "coldchili" filling_color = "#2B00FF" + center_of_mass = list("x"=15, "y"=9) trash = /obj/item/trash/snack_bowl New() @@ -1502,10 +1588,13 @@ icon_state = "bacon" var/obj/item/device/radio/beacon/bacon/baconbeacon bitesize = 2 + center_of_mass = list("x"=18, "y"=13) + New() ..() reagents.add_reagent("nutriment", 4) baconbeacon = new /obj/item/device/radio/beacon/bacon(src) + On_Consume() if(!reagents.total_volume) baconbeacon.loc = usr @@ -1518,6 +1607,7 @@ icon_state = "monkeycube" bitesize = 12 filling_color = "#ADAC7F" + center_of_mass = list("x"=16, "y"=14) var/wrapped = 0 var/monkey_type = "Monkey" @@ -1603,6 +1693,7 @@ desc = "Forget the Big Mac. THIS is the future!" icon_state = "bigbiteburger" filling_color = "#E3D681" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -1616,6 +1707,7 @@ icon_state = "enchiladas" trash = /obj/item/trash/tray filling_color = "#A36A1F" + center_of_mass = list("x"=16, "y"=13) New() ..() @@ -1630,6 +1722,7 @@ icon_state = "monkeysdelight" trash = /obj/item/trash/tray filling_color = "#5C3C11" + center_of_mass = list("x"=16, "y"=13) New() ..() @@ -1644,6 +1737,7 @@ desc = "Bon appetit!" icon_state = "baguette" filling_color = "#E3D796" + center_of_mass = list("x"=18, "y"=12) New() ..() @@ -1657,6 +1751,7 @@ desc = "I do say so myself chap." icon_state = "fishandchips" filling_color = "#E3D796" + center_of_mass = list("x"=16, "y"=16) New() ..() @@ -1671,6 +1766,7 @@ icon_state = "sandwich" trash = /obj/item/trash/plate filling_color = "#D9BE29" + center_of_mass = list("x"=16, "y"=4) New() ..() @@ -1684,6 +1780,7 @@ icon_state = "toastedsandwich" trash = /obj/item/trash/plate filling_color = "#D9BE29" + center_of_mass = list("x"=16, "y"=4) New() ..() @@ -1711,6 +1808,7 @@ icon_state = "tomatosoup" trash = /obj/item/trash/snack_bowl filling_color = "#D92929" + center_of_mass = list("x"=16, "y"=7) New() ..() @@ -1724,6 +1822,7 @@ icon_state = "rofflewaffles" trash = /obj/item/trash/waffles filling_color = "#FF00F7" + center_of_mass = list("x"=15, "y"=11) New() ..() @@ -1736,6 +1835,7 @@ desc = "A nice and warm stew. Healthy and strong." icon_state = "stew" filling_color = "#9E673A" + center_of_mass = list("x"=16, "y"=5) New() ..() @@ -1752,6 +1852,7 @@ icon_state = "jellytoast" trash = /obj/item/trash/plate filling_color = "#B572AB" + center_of_mass = list("x"=16, "y"=8) New() ..() @@ -1773,6 +1874,7 @@ desc = "Culinary delight..?" icon_state = "jellyburger" filling_color = "#B572AB" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -1794,6 +1896,8 @@ desc = "The universes best soup! Yum!!!" icon_state = "milosoup" trash = /obj/item/trash/snack_bowl + center_of_mass = list("x"=16, "y"=7) + New() ..() reagents.add_reagent("nutriment", 8) @@ -1805,6 +1909,8 @@ desc = "Even non-vegetarians will LOVE this!" icon_state = "stewedsoymeat" trash = /obj/item/trash/plate + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("nutriment", 8) @@ -1816,6 +1922,7 @@ icon_state = "spagettiboiled" trash = /obj/item/trash/plate filling_color = "#FCEE81" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -1828,6 +1935,7 @@ icon_state = "boiledrice" trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" + center_of_mass = list("x"=17, "y"=11) New() ..() @@ -1840,6 +1948,7 @@ icon_state = "rpudding" trash = /obj/item/trash/snack_bowl filling_color = "#FFFBDB" + center_of_mass = list("x"=17, "y"=11) New() ..() @@ -1852,6 +1961,7 @@ icon_state = "pastatomato" trash = /obj/item/trash/plate filling_color = "#DE4545" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -1865,6 +1975,7 @@ icon_state = "meatballspagetti" trash = /obj/item/trash/plate filling_color = "#DE4545" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -1877,6 +1988,7 @@ desc = "A lawyers favourite" icon_state = "spesslaw" filling_color = "#DE4545" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -1884,23 +1996,13 @@ reagents.add_reagent("nutriment", 4) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/poppypretzel - name = "Poppy Pretzel" - desc = "A large soft pretzel full of POP!" - icon_state = "poppypretzel" - filling_color = "#AB7D2E" - - New() - ..() - reagents.add_reagent("nutriment", 5) - bitesize = 2 - /obj/item/weapon/reagent_containers/food/snacks/carrotfries name = "Carrot Fries" desc = "Tasty fries from fresh Carrots." icon_state = "carrotfries" trash = /obj/item/trash/plate filling_color = "#FAA005" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -1913,6 +2015,7 @@ desc = "This is a mountain of a burger. FOOD!" icon_state = "superbiteburger" filling_color = "#CCA26A" + center_of_mass = list("x"=16, "y"=3) New() ..() @@ -1925,6 +2028,7 @@ desc = "An apple coated in sugary sweetness." icon_state = "candiedapple" filling_color = "#F21873" + center_of_mass = list("x"=15, "y"=13) New() ..() @@ -1936,6 +2040,7 @@ desc = "A pie containing sweet sweet love... or apple." icon_state = "applepie" filling_color = "#E0EDC5" + center_of_mass = list("x"=16, "y"=13) New() ..() @@ -1948,6 +2053,7 @@ desc = "Taste so good, make a grown man cry." icon_state = "cherrypie" filling_color = "#FF525A" + center_of_mass = list("x"=16, "y"=11) New() ..() @@ -1959,6 +2065,7 @@ desc = "It is very bitter and winy." icon_state = "twobread" filling_color = "#DBCC9A" + center_of_mass = list("x"=15, "y"=12) New() ..() @@ -1971,6 +2078,7 @@ icon_state = "jellysandwich" trash = /obj/item/trash/plate filling_color = "#9E3A78" + center_of_mass = list("x"=16, "y"=8) New() ..() @@ -1990,7 +2098,7 @@ /obj/item/weapon/reagent_containers/food/snacks/boiledslimecore name = "Boiled slime Core" desc = "A boiled red thing." - icon_state = "boiledslimecore" + icon_state = "boiledslimecore" //nonexistant? New() ..() reagents.add_reagent("slimejelly", 5) @@ -2001,6 +2109,7 @@ desc = "it is only wafer thin." icon_state = "mint" filling_color = "#F2F2F2" + center_of_mass = list("x"=16, "y"=14) New() ..() @@ -2013,6 +2122,7 @@ icon_state = "mushroomsoup" trash = /obj/item/trash/snack_bowl filling_color = "#E386BF" + center_of_mass = list("x"=17, "y"=10) New() ..() @@ -2024,6 +2134,7 @@ 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" + center_of_mass = list("x"=16, "y"=13) New() ..() @@ -2043,6 +2154,7 @@ icon_state = "chawanmushi" trash = /obj/item/trash/snack_bowl filling_color = "#F0F2E4" + center_of_mass = list("x"=17, "y"=10) New() ..() @@ -2055,6 +2167,7 @@ icon_state = "beetsoup" trash = /obj/item/trash/snack_bowl filling_color = "#FAC9FF" + center_of_mass = list("x"=15, "y"=8) New() ..() @@ -2068,7 +2181,7 @@ icon_state = "herbsalad" trash = /obj/item/trash/snack_bowl filling_color = "#76B87F" - + center_of_mass = list("x"=17, "y"=11) New() ..() reagents.add_reagent("nutriment", 8) @@ -2080,6 +2193,7 @@ icon_state = "validsalad" trash = /obj/item/trash/snack_bowl filling_color = "#76B87F" + center_of_mass = list("x"=17, "y"=11) New() ..() @@ -2093,6 +2207,7 @@ icon_state = "gappletart" trash = /obj/item/trash/plate filling_color = "#FFFF00" + center_of_mass = list("x"=16, "y"=18) New() ..() @@ -2115,6 +2230,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice slices_num = 5 filling_color = "#FF7575" + center_of_mass = list("x"=16, "y"=9) + New() ..() reagents.add_reagent("protein", 20) @@ -2128,6 +2245,7 @@ trash = /obj/item/trash/plate filling_color = "#FF7575" bitesize = 2 + center_of_mass = list("x"=16, "y"=13) /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread name = "xenomeatbread loaf" @@ -2136,6 +2254,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice slices_num = 5 filling_color = "#8AFF75" + center_of_mass = list("x"=16, "y"=9) + New() ..() reagents.add_reagent("protein", 20) @@ -2149,6 +2269,7 @@ trash = /obj/item/trash/plate filling_color = "#8AFF75" bitesize = 2 + center_of_mass = list("x"=16, "y"=13) /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread name = "Banana-nut bread" @@ -2157,6 +2278,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice slices_num = 5 filling_color = "#EDE5AD" + center_of_mass = list("x"=16, "y"=9) + New() ..() reagents.add_reagent("banana", 20) @@ -2170,6 +2293,7 @@ trash = /obj/item/trash/plate filling_color = "#EDE5AD" bitesize = 2 + center_of_mass = list("x"=16, "y"=8) /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread name = "Tofubread" @@ -2178,6 +2302,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/tofubreadslice slices_num = 5 filling_color = "#F7FFE0" + center_of_mass = list("x"=16, "y"=9) + New() ..() reagents.add_reagent("nutriment", 30) @@ -2190,6 +2316,7 @@ trash = /obj/item/trash/plate filling_color = "#F7FFE0" bitesize = 2 + center_of_mass = list("x"=16, "y"=13) /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake @@ -2199,6 +2326,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice slices_num = 5 filling_color = "#FFD675" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("nutriment", 25) @@ -2212,6 +2341,7 @@ trash = /obj/item/trash/plate filling_color = "#FFD675" bitesize = 2 + center_of_mass = list("x"=16, "y"=14) /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake name = "Brain Cake" @@ -2220,6 +2350,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/braincakeslice slices_num = 5 filling_color = "#E6AEDB" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("protein", 25) @@ -2234,6 +2366,7 @@ trash = /obj/item/trash/plate filling_color = "#E6AEDB" bitesize = 2 + center_of_mass = list("x"=16, "y"=12) /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake name = "Cheese Cake" @@ -2242,6 +2375,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice slices_num = 5 filling_color = "#FAF7AF" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("protein", 15) @@ -2255,6 +2390,7 @@ trash = /obj/item/trash/plate filling_color = "#FAF7AF" bitesize = 2 + center_of_mass = list("x"=16, "y"=14) /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake name = "Vanilla Cake" @@ -2263,6 +2399,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice slices_num = 5 filling_color = "#F7EDD5" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("nutriment", 20) @@ -2274,6 +2412,7 @@ trash = /obj/item/trash/plate filling_color = "#F7EDD5" bitesize = 2 + center_of_mass = list("x"=16, "y"=14) /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake name = "Orange Cake" @@ -2282,6 +2421,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice slices_num = 5 filling_color = "#FADA8E" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("nutriment", 20) @@ -2293,6 +2434,7 @@ trash = /obj/item/trash/plate filling_color = "#FADA8E" bitesize = 2 + center_of_mass = list("x"=16, "y"=14) /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake name = "Lime Cake" @@ -2301,6 +2443,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/limecakeslice slices_num = 5 filling_color = "#CBFA8E" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("nutriment", 20) @@ -2312,6 +2456,7 @@ trash = /obj/item/trash/plate filling_color = "#CBFA8E" bitesize = 2 + center_of_mass = list("x"=16, "y"=14) /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake name = "Lemon Cake" @@ -2320,6 +2465,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice slices_num = 5 filling_color = "#FAFA8E" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("nutriment", 20) @@ -2331,6 +2478,7 @@ trash = /obj/item/trash/plate filling_color = "#FAFA8E" bitesize = 2 + center_of_mass = list("x"=16, "y"=14) /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake name = "Chocolate Cake" @@ -2339,6 +2487,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice slices_num = 5 filling_color = "#805930" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("nutriment", 20) @@ -2350,6 +2500,7 @@ trash = /obj/item/trash/plate filling_color = "#805930" bitesize = 2 + center_of_mass = list("x"=16, "y"=14) /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel name = "Cheese wheel" @@ -2358,6 +2509,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesewedge slices_num = 5 filling_color = "#FFF700" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("protein", 20) @@ -2369,6 +2522,7 @@ icon_state = "cheesewedge" filling_color = "#FFF700" bitesize = 2 + center_of_mass = list("x"=16, "y"=10) /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake name = "Birthday Cake" @@ -2377,6 +2531,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice slices_num = 5 filling_color = "#FFD6D6" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("nutriment", 20) @@ -2390,6 +2546,7 @@ trash = /obj/item/trash/plate filling_color = "#FFD6D6" bitesize = 2 + center_of_mass = list("x"=16, "y"=14) /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread name = "Bread" @@ -2398,6 +2555,7 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice slices_num = 5 filling_color = "#FFE396" + center_of_mass = list("x"=16, "y"=9) New() ..() @@ -2411,6 +2569,7 @@ trash = /obj/item/trash/plate filling_color = "#D27332" bitesize = 2 + center_of_mass = list("x"=16, "y"=4) /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread @@ -2420,6 +2579,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice slices_num = 5 filling_color = "#FFF896" + center_of_mass = list("x"=16, "y"=9) + New() ..() reagents.add_reagent("protein", 15) @@ -2433,6 +2594,7 @@ trash = /obj/item/trash/plate filling_color = "#FFF896" bitesize = 2 + center_of_mass = list("x"=16, "y"=13) /obj/item/weapon/reagent_containers/food/snacks/watermelonslice @@ -2441,6 +2603,7 @@ icon_state = "watermelonslice" filling_color = "#FF3867" bitesize = 2 + center_of_mass = list("x"=16, "y"=10) /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake @@ -2450,6 +2613,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/applecakeslice slices_num = 5 filling_color = "#EBF5B8" + center_of_mass = list("x"=16, "y"=10) + New() ..() reagents.add_reagent("nutriment", 15) @@ -2461,6 +2626,7 @@ trash = /obj/item/trash/plate filling_color = "#EBF5B8" bitesize = 2 + center_of_mass = list("x"=16, "y"=14) /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie name = "Pumpkin Pie" @@ -2469,6 +2635,7 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice slices_num = 5 filling_color = "#F5B951" + center_of_mass = list("x"=16, "y"=10) New() ..() @@ -2481,12 +2648,14 @@ trash = /obj/item/trash/plate filling_color = "#F5B951" bitesize = 2 + center_of_mass = list("x"=16, "y"=12) /obj/item/weapon/reagent_containers/food/snacks/cracker name = "Cracker" desc = "It's a salted cracker." icon_state = "cracker" filling_color = "#F5DEB8" + center_of_mass = list("x"=17, "y"=6) New() ..() @@ -2506,6 +2675,8 @@ icon_state = "pizzamargherita" slice_path = /obj/item/weapon/reagent_containers/food/snacks/margheritaslice slices_num = 6 + center_of_mass = list("x"=16, "y"=11) + New() ..() reagents.add_reagent("nutriment", 35) @@ -2519,6 +2690,7 @@ icon_state = "pizzamargheritaslice" filling_color = "#BAA14C" bitesize = 2 + center_of_mass = list("x"=18, "y"=13) /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza name = "Meatpizza" @@ -2526,6 +2698,8 @@ icon_state = "meatpizza" slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice slices_num = 6 + center_of_mass = list("x"=16, "y"=11) + New() ..() reagents.add_reagent("protein", 44) @@ -2538,6 +2712,7 @@ icon_state = "meatpizzaslice" filling_color = "#BAA14C" bitesize = 2 + center_of_mass = list("x"=18, "y"=13) /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza name = "Mushroompizza" @@ -2545,6 +2720,8 @@ icon_state = "mushroompizza" slice_path = /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice slices_num = 6 + center_of_mass = list("x"=16, "y"=11) + New() ..() reagents.add_reagent("nutriment", 35) @@ -2557,6 +2734,7 @@ icon_state = "mushroompizzaslice" filling_color = "#BAA14C" bitesize = 2 + center_of_mass = list("x"=18, "y"=13) /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza name = "Vegetable pizza" @@ -2564,6 +2742,8 @@ icon_state = "vegetablepizza" slice_path = /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice slices_num = 6 + center_of_mass = list("x"=16, "y"=11) + New() ..() reagents.add_reagent("nutriment", 25) @@ -2578,6 +2758,7 @@ icon_state = "vegetablepizzaslice" filling_color = "#BAA14C" bitesize = 2 + center_of_mass = list("x"=18, "y"=13) /obj/item/pizzabox name = "pizza box" @@ -2761,6 +2942,7 @@ icon_state = "dionaroast" trash = /obj/item/trash/plate filling_color = "#75754B" + center_of_mass = list("x"=16, "y"=7) New() ..() @@ -2780,6 +2962,8 @@ icon = 'icons/obj/food_ingredients.dmi' icon_state = "dough" bitesize = 2 + center_of_mass = list("x"=16, "y"=13) + New() ..() reagents.add_reagent("protein", 1) @@ -2800,6 +2984,8 @@ icon_state = "flat dough" slice_path = /obj/item/weapon/reagent_containers/food/snacks/doughslice slices_num = 3 + center_of_mass = list("x"=16, "y"=16) + New() ..() reagents.add_reagent("protein", 1) @@ -2813,6 +2999,8 @@ slice_path = /obj/item/weapon/reagent_containers/food/snacks/spagetti slices_num = 1 bitesize = 2 + center_of_mass = list("x"=17, "y"=19) + New() ..() reagents.add_reagent("nutriment", 1) @@ -2823,6 +3011,8 @@ icon = 'icons/obj/food_ingredients.dmi' icon_state = "bun" bitesize = 2 + center_of_mass = list("x"=16, "y"=12) + New() ..() reagents.add_reagent("nutriment", 4) @@ -2876,6 +3066,8 @@ desc = "Take a bite!" icon_state = "taco" bitesize = 3 + center_of_mass = list("x"=21, "y"=12) + New() ..() reagents.add_reagent("protein", 3) @@ -2887,6 +3079,8 @@ icon = 'icons/obj/food_ingredients.dmi' icon_state = "rawcutlet" bitesize = 1 + center_of_mass = list("x"=17, "y"=20) + New() ..() reagents.add_reagent("protein", 1) @@ -2897,6 +3091,8 @@ icon = 'icons/obj/food_ingredients.dmi' icon_state = "cutlet" bitesize = 2 + center_of_mass = list("x"=17, "y"=20) + New() ..() reagents.add_reagent("protein", 2) @@ -2907,6 +3103,8 @@ icon = 'icons/obj/food_ingredients.dmi' icon_state = "rawmeatball" bitesize = 2 + center_of_mass = list("x"=16, "y"=15) + New() ..() reagents.add_reagent("protein", 2) @@ -2916,6 +3114,8 @@ desc = "Unrelated to dogs, maybe." icon_state = "hotdog" bitesize = 2 + center_of_mass = list("x"=16, "y"=17) + New() ..() reagents.add_reagent("protein", 6) @@ -2926,6 +3126,8 @@ icon = 'icons/obj/food_ingredients.dmi' icon_state = "flatbread" bitesize = 2 + center_of_mass = list("x"=16, "y"=16) + New() ..() reagents.add_reagent("nutriment", 3) @@ -2945,6 +3147,8 @@ icon = 'icons/obj/food_ingredients.dmi' icon_state = "rawsticks" bitesize = 2 + center_of_mass = list("x"=16, "y"=12) + New() ..() reagents.add_reagent("nutriment", 3) @@ -2955,6 +3159,7 @@ icon_state = "liquidfood" trash = /obj/item/trash/liquidfood filling_color = "#A8A8A8" + center_of_mass = list("x"=16, "y"=15) New() ..() @@ -2969,6 +3174,7 @@ icon_state = "tastybread" trash = /obj/item/trash/tastybread filling_color = "#A66829" + center_of_mass = list("x"=17, "y"=16) New() ..() @@ -2980,6 +3186,7 @@ desc = "Cured fungus shipped all the way from Jargon 4, almost like jerky! Almost." icon_state = "skrellsnacks" filling_color = "#A66829" + center_of_mass = list("x"=15, "y"=12) New() ..() diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index 46bf9e4baf..7ea52765fc 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -4,6 +4,7 @@ icon_state = "meat" health = 180 filling_color = "#FF1C1C" + center_of_mass = list("x"=16, "y"=14) New() ..() reagents.add_reagent("protein", 9) diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index 252ad88bde..d0364f237a 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ