diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm index 3d4589469b..6e101a0cde 100644 --- a/code/modules/economy/price_list.dm +++ b/code/modules/economy/price_list.dm @@ -705,16 +705,16 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/margheritaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/margherita price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza price_tag = 1 -/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/ @@ -737,37 +737,37 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/bananabread price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/tofubread price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/breadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/bread price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread price_tag = 1 @@ -845,67 +845,67 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/braincakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/braincake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/cheesecake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/plaincake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/limecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/limecake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/lemoncake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/chocolatecake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/birthdaycake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/applecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/applecake price_tag = 1 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie price_tag = 5 -/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice +/obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie price_tag = 1 diff --git a/code/modules/reagents/reagent_containers/food/lunch.dm b/code/modules/reagents/reagent_containers/food/lunch.dm index 794d7f69dd..1ab8cf3a43 100644 --- a/code/modules/reagents/reagent_containers/food/lunch.dm +++ b/code/modules/reagents/reagent_containers/food/lunch.dm @@ -1,11 +1,11 @@ var/list/lunchables_lunches_ = list(/obj/item/weapon/reagent_containers/food/snacks/sandwich, - /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice, - /obj/item/weapon/reagent_containers/food/snacks/tofubreadslice, - /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice, - /obj/item/weapon/reagent_containers/food/snacks/margheritaslice, - /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice, - /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice, - /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice, + /obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/tofubread/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/margherita/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza/filled, /obj/item/weapon/reagent_containers/food/snacks/tastybread, /obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry, @@ -26,17 +26,17 @@ var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snac /obj/item/weapon/reagent_containers/food/snacks/cherrypie, /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit, /obj/item/weapon/reagent_containers/food/snacks/appletart, - /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice, - /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice, - /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice, - /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice, - /obj/item/weapon/reagent_containers/food/snacks/limecakeslice, - /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice, - /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice, - /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice, + /obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/cheesecake/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/plaincake/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/orangecake/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/limecake/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/lemoncake/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/chocolatecake/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/birthdaycake/filled, /obj/item/weapon/reagent_containers/food/snacks/watermelonslice, - /obj/item/weapon/reagent_containers/food/snacks/applecakeslice, - /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice, + /obj/item/weapon/reagent_containers/food/snacks/slice/applecake/filled, + /obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie/filled, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks) var/list/lunchables_drinks_ = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola, diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 2e0dd06132..49f0df13c9 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -179,24 +179,23 @@ if (W.w_class >= src.w_class || is_robot_module(W)) return - user << "\red You slip [W] inside [src]." - user.remove_from_mob(W) - W.dropped(user) + to_chat(user, "You slip \the [W] inside \the [src].") + user.drop_from_inventory(W, src) add_fingerprint(user) contents += W return if (has_edge(W)) if (!can_slice_here) - user << "\red You cannot slice [src] here! You need a table or at least a tray to do it." + to_chat(user, "You cannot slice \the [src] here! You need a table or at least a tray to do it.") return var/slices_lost = 0 if (W.w_class > 3) - user.visible_message("\blue [user] crudely slices \the [src] with [W]!", "\blue You crudely slice \the [src] with your [W]!") + user.visible_message("\The [user] crudely slices \the [src] with [W]!", "You crudely slice \the [src] with your [W]!") slices_lost = rand(1,min(1,round(slices_num/2))) else - user.visible_message("\blue [user] slices \the [src]!", "\blue You slice \the [src]!") + user.visible_message("\The [user] slices \the [src]!", "You slice \the [src]!") var/reagents_per_slice = reagents.total_volume/slices_num for(var/i=1 to (slices_num-slices_lost)) @@ -2313,54 +2312,81 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable w_class = ITEMSIZE_NORMAL //Whole pizzas and cakes shouldn't fit in a pocket, you can slice them if you want to do that. +/** + * A food item slice + * + * This path contains some extra code for spawning slices pre-filled with + * reagents. + */ +/obj/item/weapon/reagent_containers/food/snacks/slice + name = "slice of... something" + var/whole_path // path for the item from which this slice comes + var/filled = FALSE // should the slice spawn with any reagents + +/** + * Spawn a new slice of food + * + * If the slice's filled is TRUE, this will also fill the slice with the + * appropriate amount of reagents. Note that this is done by spawning a new + * whole item, transferring the reagents and deleting the whole item, which may + * have performance implications. + */ +/obj/item/weapon/reagent_containers/food/snacks/slice/New() + ..() + if(filled) + var/obj/item/weapon/reagent_containers/food/snacks/whole = new whole_path() + if(whole && whole.slices_num) + var/reagent_amount = whole.reagents.total_volume/whole.slices_num + whole.reagents.trans_to_obj(src, reagent_amount) + + qdel(whole) + /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread name = "meatbread loaf" desc = "The culinary base of every self-respecting eloquen/tg/entleman." icon_state = "meatbread" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled slices_num = 5 filling_color = "#FF7575" - center_of_mass = list("x"=16, "y"=9) - nutriment_amt = 10 + center_of_mass = list("x"=19, "y"=9) nutriment_desc = list("bread" = 10) + nutriment_amt = 10 /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread/New() ..() reagents.add_reagent("protein", 20) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled name = "meatbread slice" desc = "A slice of delicious meatbread." icon_state = "meatbreadslice" trash = /obj/item/trash/plate filling_color = "#FF7575" bitesize = 2 - center_of_mass = list("x"=16, "y"=13) + center_of_mass = list("x"=16, "y"=16) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread -/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("protein", 4) - reagents.add_reagent("nutriment", 2) +/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread name = "xenomeatbread loaf" desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical." icon_state = "xenomeatbread" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread/filled slices_num = 5 filling_color = "#8AFF75" center_of_mass = list("x"=16, "y"=9) - nutriment_amt = 10 nutriment_desc = list("bread" = 10) + nutriment_amt = 10 /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread/New() ..() reagents.add_reagent("protein", 20) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread/filled name = "xenomeatbread slice" desc = "A slice of delicious meatbread. Extra Heretical." icon_state = "xenobreadslice" @@ -2368,30 +2394,29 @@ filling_color = "#8AFF75" bitesize = 2 center_of_mass = list("x"=16, "y"=13) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread -/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("protein", 4) - reagents.add_reagent("nutriment", 2) + +/obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread/filled/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread name = "Banana-nut bread" desc = "A heavenly and filling treat." icon_state = "bananabread" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/bananabread slices_num = 5 filling_color = "#EDE5AD" center_of_mass = list("x"=16, "y"=9) - nutriment_amt = 10 nutriment_desc = list("bread" = 10) + nutriment_amt = 10 /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread/New() ..() reagents.add_reagent("banana", 20) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/bananabread name = "Banana-nut bread slice" desc = "A slice of delicious banana bread." icon_state = "bananabreadslice" @@ -2399,30 +2424,27 @@ filling_color = "#EDE5AD" bitesize = 2 center_of_mass = list("x"=16, "y"=8) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread -/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("banana", 4) - reagents.add_reagent("nutriment", 4) +/obj/item/weapon/reagent_containers/food/snacks/slice/bananabread/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread name = "Tofubread" icon_state = "Like meatbread but for vegetarians. Not guaranteed to give superpowers." icon_state = "tofubread" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/tofubreadslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/tofubread slices_num = 5 filling_color = "#F7FFE0" center_of_mass = list("x"=16, "y"=9) - nutriment_amt = 30 - nutriment_desc = list("bread" = 15, "tofu" = 15) + nutriment_desc = list("tofu" = 10) + nutriment_amt = 10 /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread/New() ..() - reagents.add_reagent("nutriment", 30) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/tofubread name = "Tofubread slice" desc = "A slice of delicious tofubread." icon_state = "tofubreadslice" @@ -2430,30 +2452,29 @@ filling_color = "#F7FFE0" bitesize = 2 center_of_mass = list("x"=16, "y"=13) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread -/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 6) +/obj/item/weapon/reagent_containers/food/snacks/slice/tofubread/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake name = "Carrot Cake" desc = "A favorite desert of a certain wascally wabbit. Not a lie." icon_state = "carrotcake" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake slices_num = 5 filling_color = "#FFD675" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 25 nutriment_desc = list("cake" = 10, "sweetness" = 10, "carrot" = 15) + nutriment_amt = 25 /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake/New() ..() reagents.add_reagent("imidazoline", 10) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake name = "Carrot Cake slice" desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie." icon_state = "carrotcake_slice" @@ -2461,23 +2482,21 @@ filling_color = "#FFD675" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake -/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("imidazoline", 2) - reagents.add_reagent("nutriment", 5) +/obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake name = "Brain Cake" desc = "A squishy cake-thing." icon_state = "braincake" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/braincakeslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/braincake slices_num = 5 filling_color = "#E6AEDB" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 5 nutriment_desc = list("cake" = 10, "sweetness" = 10, "slime" = 15) + nutriment_amt = 5 /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake/New() ..() @@ -2485,7 +2504,7 @@ reagents.add_reagent("alkysine", 10) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/braincakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/braincake name = "Brain Cake slice" desc = "Lemme tell you something about prions. THEY'RE DELICIOUS." icon_state = "braincakeslice" @@ -2493,60 +2512,52 @@ filling_color = "#E6AEDB" bitesize = 2 center_of_mass = list("x"=16, "y"=12) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake -/obj/item/weapon/reagent_containers/food/snacks/braincakeslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("protein", 5) - reagents.add_reagent("nutriment", 1) - reagents.add_reagent("alkysine", 2) +/obj/item/weapon/reagent_containers/food/snacks/slice/braincake/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake name = "Cheese Cake" desc = "DANGEROUSLY cheesy." icon_state = "cheesecake" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/cheesecake slices_num = 5 filling_color = "#FAF7AF" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 10 nutriment_desc = list("cake" = 10, "cream" = 10, "cheese" = 15) + nutriment_amt = 10 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake/New() ..() reagents.add_reagent("protein", 15) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/cheesecake name = "Cheese Cake slice" - desc = "Slice of pure cheestisfaction" + desc = "Slice of pure cheestisfaction." icon_state = "cheesecake_slice" trash = /obj/item/trash/plate filling_color = "#FAF7AF" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake -/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("protein", 3) - reagents.add_reagent("nutriment", 2) +/obj/item/weapon/reagent_containers/food/snacks/slice/cheesecake/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake name = "Vanilla Cake" desc = "A plain cake, not a lie." icon_state = "plaincake" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/plaincake slices_num = 5 filling_color = "#F7EDD5" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 20 nutriment_desc = list("cake" = 10, "sweetness" = 10, "vanilla" = 15) + nutriment_amt = 20 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake/New() - ..() - -/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/plaincake name = "Vanilla Cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "plaincake_slice" @@ -2554,27 +2565,23 @@ filling_color = "#F7EDD5" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake -/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 4) +/obj/item/weapon/reagent_containers/food/snacks/slice/plaincake/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake name = "Orange Cake" desc = "A cake with added orange." icon_state = "orangecake" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/orangecake slices_num = 5 filling_color = "#FADA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 20 nutriment_desc = list("cake" = 10, "sweetness" = 10, "orange" = 15) + nutriment_amt = 20 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake/New() - ..() - -/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake name = "Orange Cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "orangecake_slice" @@ -2582,28 +2589,25 @@ filling_color = "#FADA8E" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake + +/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake/filled + filled = TRUE -/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 4) /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake name = "Lime Cake" desc = "A cake with added lime." icon_state = "limecake" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/limecakeslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/limecake slices_num = 5 filling_color = "#CBFA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 20 nutriment_desc = list("cake" = 10, "sweetness" = 10, "lime" = 15) + nutriment_amt = 20 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake/New() - ..() - reagents.add_reagent("nutriment", 20) -/obj/item/weapon/reagent_containers/food/snacks/limecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/limecake name = "Lime Cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "limecake_slice" @@ -2611,27 +2615,24 @@ filling_color = "#CBFA8E" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake -/obj/item/weapon/reagent_containers/food/snacks/limecakeslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 4) +/obj/item/weapon/reagent_containers/food/snacks/slice/limecake/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake name = "Lemon Cake" desc = "A cake with added lemon." icon_state = "lemoncake" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/lemoncake slices_num = 5 filling_color = "#FAFA8E" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 20 nutriment_desc = list("cake" = 10, "sweetness" = 10, "lemon" = 15) + nutriment_amt = 20 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake/New() - ..() -/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/lemoncake name = "Lemon Cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "lemoncake_slice" @@ -2639,27 +2640,23 @@ filling_color = "#FAFA8E" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake -/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 4) +/obj/item/weapon/reagent_containers/food/snacks/slice/lemoncake/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake name = "Chocolate Cake" - desc = "A cake with added chocolate" + desc = "A cake with added chocolate." icon_state = "chocolatecake" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/chocolatecake slices_num = 5 filling_color = "#805930" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 20 nutriment_desc = list("cake" = 10, "sweetness" = 10, "chocolate" = 15) + nutriment_amt = 20 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake/New() - ..() - -/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/chocolatecake name = "Chocolate Cake slice" desc = "Just a slice of cake, it is enough for everyone." icon_state = "chocolatecake_slice" @@ -2667,11 +2664,10 @@ filling_color = "#805930" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake -/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 4) +/obj/item/weapon/reagent_containers/food/snacks/slice/chocolatecake/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel name = "Cheese wheel" @@ -2681,8 +2677,8 @@ slices_num = 5 filling_color = "#FFF700" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 10 nutriment_desc = list("cheese" = 10) + nutriment_amt = 10 /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel/New() ..() @@ -2701,19 +2697,19 @@ name = "Birthday Cake" desc = "Happy Birthday..." icon_state = "birthdaycake" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/birthdaycake slices_num = 5 filling_color = "#FFD6D6" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 20 nutriment_desc = list("cake" = 10, "sweetness" = 10) + nutriment_amt = 20 /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake/New() ..() reagents.add_reagent("sprinkles", 10) bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/birthdaycake name = "Birthday Cake slice" desc = "A slice of your birthday." icon_state = "birthdaycakeslice" @@ -2721,29 +2717,27 @@ filling_color = "#FFD6D6" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake -/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("sprinkles", 2) +/obj/item/weapon/reagent_containers/food/snacks/slice/birthdaycake/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread name = "Bread" icon_state = "Some plain old Earthen bread." icon_state = "bread" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/bread slices_num = 5 filling_color = "#FFE396" center_of_mass = list("x"=16, "y"=9) - nutriment_amt = 6 nutriment_desc = list("bread" = 6) + nutriment_amt = 6 /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread/New() ..() bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/breadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/bread name = "Bread slice" desc = "A slice of home." icon_state = "breadslice" @@ -2751,43 +2745,42 @@ filling_color = "#D27332" bitesize = 2 center_of_mass = list("x"=16, "y"=4) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread -/obj/item/weapon/reagent_containers/food/snacks/breadslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 1) +/obj/item/weapon/reagent_containers/food/snacks/slice/bread/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread name = "Cream Cheese Bread" desc = "Yum yum yum!" icon_state = "creamcheesebread" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread slices_num = 5 filling_color = "#FFF896" center_of_mass = list("x"=16, "y"=9) - nutriment_amt = 5 nutriment_desc = list("bread" = 6, "cream" = 3, "cheese" = 3) + nutriment_amt = 5 /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread/New() ..() reagents.add_reagent("protein", 15) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice +/obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread name = "Cream Cheese Bread slice" desc = "A slice of yum!" icon_state = "creamcheesebreadslice" trash = /obj/item/trash/plate filling_color = "#FFF896" bitesize = 2 - center_of_mass = list("x"=16, "y"=13) + center_of_mass = list("x"=16, "y"=14) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread + + +/obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread/filled + filled = TRUE -/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("protein", 3) - reagents.add_reagent("nutriment", 1) /obj/item/weapon/reagent_containers/food/snacks/watermelonslice name = "Watermelon Slice" @@ -2797,26 +2790,18 @@ bitesize = 2 center_of_mass = list("x"=16, "y"=10) -/obj/item/weapon/reagent_containers/food/snacks/watermelonslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("watermelonjuice", 1) - /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake name = "Apple Cake" - desc = "A cake centred with Apple" + desc = "A cake centred with apples." icon_state = "applecake" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/applecakeslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/applecake slices_num = 5 filling_color = "#EBF5B8" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 15 nutriment_desc = list("cake" = 10, "sweetness" = 10, "apple" = 15) + nutriment_amt = 15 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake/New() - ..() - -/obj/item/weapon/reagent_containers/food/snacks/applecakeslice +/obj/item/weapon/reagent_containers/food/snacks/slice/applecake name = "Apple Cake slice" desc = "A slice of heavenly cake." icon_state = "applecakeslice" @@ -2824,27 +2809,23 @@ filling_color = "#EBF5B8" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake -/obj/item/weapon/reagent_containers/food/snacks/applecakeslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 3) +/obj/item/weapon/reagent_containers/food/snacks/slice/applecake/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie name = "Pumpkin Pie" desc = "A delicious treat for the autumn months." icon_state = "pumpkinpie" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie slices_num = 5 filling_color = "#F5B951" center_of_mass = list("x"=16, "y"=10) - nutriment_amt = 15 nutriment_desc = list("pie" = 5, "cream" = 5, "pumpkin" = 5) + nutriment_amt = 15 -/obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie/New() - ..() - -/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice +/obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie name = "Pumpkin Pie slice" desc = "A slice of pumpkin pie, with whipped cream on top. Perfection." icon_state = "pumpkinpieslice" @@ -2852,23 +2833,21 @@ filling_color = "#F5B951" bitesize = 2 center_of_mass = list("x"=16, "y"=12) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie -/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 3) +/obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie/filled + filled = TRUE /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) - nutriment_amt = 1 + center_of_mass = list("x"=16, "y"=6) nutriment_desc = list("salt" = 1, "cracker" = 2) + nutriment_amt = 1 + -/obj/item/weapon/reagent_containers/food/snacks/cracker/New() - ..() /////////////////////////////////////////////////PIZZA//////////////////////////////////////// @@ -2880,11 +2859,11 @@ name = "Margherita" desc = "The golden standard of pizzas." icon_state = "pizzamargherita" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/margheritaslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/margherita slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 35 nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 15) + nutriment_amt = 35 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita/New() ..() @@ -2892,30 +2871,27 @@ reagents.add_reagent("tomatojuice", 6) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/margheritaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/margherita name = "Margherita slice" desc = "A slice of the classic pizza." icon_state = "pizzamargheritaslice" filling_color = "#BAA14C" bitesize = 2 - center_of_mass = list("x"=18, "y"=13) + center_of_mass = list("x"=16, "y"=13) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita -/obj/item/weapon/reagent_containers/food/snacks/margheritaslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("protein", 1) - reagents.add_reagent("tomatojuice", 1) +/obj/item/weapon/reagent_containers/food/snacks/slice/margherita/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza name = "Meatpizza" desc = "A pizza with meat topping." icon_state = "meatpizza" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 10 nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 15) + nutriment_amt = 10 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza/New() ..() @@ -2923,58 +2899,54 @@ reagents.add_reagent("tomatojuice", 6) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza name = "Meatpizza slice" desc = "A slice of a meaty pizza." icon_state = "meatpizzaslice" filling_color = "#BAA14C" bitesize = 2 - center_of_mass = list("x"=18, "y"=13) + center_of_mass = list("x"=16, "y"=13) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza -/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("protein", 7) - reagents.add_reagent("tomatojuice", 1) +/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza name = "Mushroompizza" - desc = "Very special pizza" + desc = "Very special pizza." icon_state = "mushroompizza" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 35 nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "mushroom" = 10) + nutriment_amt = 35 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/New() ..() reagents.add_reagent("protein", 5) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza name = "Mushroompizza slice" desc = "Maybe it is the last slice of pizza in your life." icon_state = "mushroompizzaslice" filling_color = "#BAA14C" bitesize = 2 - center_of_mass = list("x"=18, "y"=13) + center_of_mass = list("x"=16, "y"=13) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza -/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 5) - reagents.add_reagent("protein", 1) +/obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza/filled + filled = TRUE /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza name = "Vegetable pizza" - desc = "No one of Tomato Sapiens were harmed during making this pizza" + desc = "No one of Tomato Sapiens were harmed during making this pizza." icon_state = "vegetablepizza" - slice_path = /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice + slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza slices_num = 6 center_of_mass = list("x"=16, "y"=11) - nutriment_amt = 25 nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5) + nutriment_amt = 25 /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/New() ..() @@ -2983,21 +2955,17 @@ reagents.add_reagent("imidazoline", 12) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice +/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza name = "Vegetable pizza slice" - desc = "A slice of the most green pizza of all pizzas not containing green ingredients " + desc = "A slice of the most green pizza of all pizzas not containing green ingredients." icon_state = "vegetablepizzaslice" filling_color = "#BAA14C" bitesize = 2 - center_of_mass = list("x"=18, "y"=13) + center_of_mass = list("x"=16, "y"=13) + whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza -/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice/New() - ..() - if(!(reagents.total_volume)) - reagents.add_reagent("nutriment", 4) - reagents.add_reagent("protein", 1) - reagents.add_reagent("tomatojuice", 1) - reagents.add_reagent("imidazoline", 2) +/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza/filled + filled = TRUE /obj/item/pizzabox name = "pizza box" @@ -3011,46 +2979,34 @@ var/list/boxes = list() // If the boxes are stacked, they come here var/boxtag = "" -/obj/item/pizzabox/proc/closepizzabox() - - if(boxes.len > 0) - return - - open = !open - - if(open && pizza) - ismessy = 1 - - update_icon() - /obj/item/pizzabox/update_icon() overlays = list() // Set appropriate description - if(open && pizza) + if( open && pizza ) desc = "A box suited for pizzas. It appears to have a [pizza.name] inside." - else if(boxes.len > 0) + else if( boxes.len > 0 ) desc = "A pile of boxes suited for pizzas. There appears to be [boxes.len + 1] boxes in the pile." var/obj/item/pizzabox/topbox = boxes[boxes.len] var/toptag = topbox.boxtag - if(toptag != "") + if( toptag != "" ) desc = "[desc] The box on top has a tag, it reads: '[toptag]'." else desc = "A box suited for pizzas." - if(boxtag != "") + if( boxtag != "" ) desc = "[desc] The box has a tag, it reads: '[boxtag]'." // Icon states and overlays - if(open) - if(ismessy) + if( open ) + if( ismessy ) icon_state = "pizzabox_messy" else icon_state = "pizzabox_open" - if(pizza) + if( pizza ) var/image/pizzaimg = image("food.dmi", icon_state = pizza.icon_state) pizzaimg.pixel_y = -3 overlays += pizzaimg @@ -3059,33 +3015,33 @@ else // Stupid code because byondcode sucks var/doimgtag = 0 - if(boxes.len > 0) + if( boxes.len > 0 ) var/obj/item/pizzabox/topbox = boxes[boxes.len] - if(topbox.boxtag != "") + if( topbox.boxtag != "" ) doimgtag = 1 else - if(boxtag != "") + if( boxtag != "" ) doimgtag = 1 - if(doimgtag) + if( doimgtag ) var/image/tagimg = image("food.dmi", icon_state = "pizzabox_tag") tagimg.pixel_y = boxes.len * 3 overlays += tagimg icon_state = "pizzabox[boxes.len+1]" -/obj/item/pizzabox/attack_hand(mob/user as mob) +/obj/item/pizzabox/attack_hand( mob/user as mob ) if( open && pizza ) - user.put_in_hands(pizza) + user.put_in_hands( pizza ) - user << "You take \the [src.pizza] out of the [src]." + to_chat(user, "You take \the [src.pizza] out of \the [src].") src.pizza = null update_icon() return - if(boxes.len > 0) - if(user.get_inactive_hand() != src) + if( boxes.len > 0 ) + if( user.get_inactive_hand() != src ) ..() return @@ -3093,74 +3049,76 @@ boxes -= box user.put_in_hands( box ) - user << "You remove \the topmost [src] from your hand." + to_chat(user, "You remove the topmost [src] from your hand.") box.update_icon() update_icon() return ..() -/obj/item/pizzabox/attack_self(mob/user as mob) +/obj/item/pizzabox/attack_self( mob/user as mob ) - closepizzabox() + if( boxes.len > 0 ) + return -/obj/item/pizzabox/AltClick() + open = !open - if(Adjacent(usr)) - closepizzabox() + if( open && pizza ) + ismessy = 1 + + update_icon() /obj/item/pizzabox/attackby( obj/item/I as obj, mob/user as mob ) - if(istype(I, /obj/item/pizzabox/)) + if( istype(I, /obj/item/pizzabox/) ) var/obj/item/pizzabox/box = I - if(!box.open && !src.open) + if( !box.open && !src.open ) // Make a list of all boxes to be added var/list/boxestoadd = list() boxestoadd += box for(var/obj/item/pizzabox/i in box.boxes) boxestoadd += i - if((boxes.len+1) + boxestoadd.len <= 5) + if( (boxes.len+1) + boxestoadd.len <= 5 ) user.drop_item() box.loc = src box.boxes = list() // Clear the box boxes so we don't have boxes inside boxes. - Xzibit - src.boxes.Add(boxestoadd) + src.boxes.Add( boxestoadd ) box.update_icon() update_icon() - user << "You put \the [box] ontop of the [src]!" + to_chat(user, "You put \the [box] ontop of \the [src]!") else - user << "\The stack is too high!" + to_chat(user, "The stack is too high!") else - user << "Close \the [box] first!" + to_chat(user, "Close \the [box] first!") return - if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/)) // Long ass fucking object name + if( istype(I, /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/) ) // Long ass fucking object name - if(open) - if(!pizza) - user.drop_item() - I.loc = src - pizza = I - update_icon() - user << "You put \the [I] in \the [src]!" - else - user << "\The [src] is full! It already has a [pizza] inside." + if( src.open ) + user.drop_item() + I.loc = src + src.pizza = I + + update_icon() + + to_chat(user, "You put \the [I] in \the [src]!") else - user << "You try to push \the [I] through the lid but it doesn't work!" - + to_chat(user, "You try to push \the [I] through the lid but it doesn't work!") return - if(istype(I, /obj/item/weapon/pen/)) - if(open) + if( istype(I, /obj/item/weapon/pen/) ) + + if( src.open ) return var/t = sanitize(input("Enter what you want to add to the tag:", "Write", null, null) as text, 30) var/obj/item/pizzabox/boxtotagto = src - if(boxes.len > 0) + if( boxes.len > 0 ) boxtotagto = boxes[boxes.len] boxtotagto.boxtag = copytext("[boxtotagto.boxtag][t]", 1, 30) diff --git a/maps/northern_star/polaris-2.dmm b/maps/northern_star/polaris-2.dmm index 06ca008289..0187d78972 100644 --- a/maps/northern_star/polaris-2.dmm +++ b/maps/northern_star/polaris-2.dmm @@ -1931,7 +1931,7 @@ "aLg" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/amanita_pie,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLh" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLi" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 8},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) -"aLj" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) +"aLj" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake/filled,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLk" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/stew,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLl" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bathroom) "aLm" = (/obj/structure/window/shuttle,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/shuttle/escape/centcom) @@ -1975,7 +1975,7 @@ "aLY" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/bloodsoup,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLZ" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/tofukabob,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aMa" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) -"aMb" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) +"aMb" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake/filled,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aMc" = (/obj/machinery/atm{pixel_x = -30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "aMd" = (/obj/machinery/atm{pixel_x = 30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "aMe" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)