From dab56d472b2cd1b82ce08cc1eb89664199bbcf10 Mon Sep 17 00:00:00 2001 From: Datraen Date: Wed, 6 Apr 2016 23:50:14 -0400 Subject: [PATCH] Adds default reagent amounts to slices if they have no reagents. --- .../reagent_containers/food/snacks.dm | 128 +++++++++++++++++- html/changelogs/Datraen-SlicedFoods.yml | 39 ++++++ 2 files changed, 165 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Datraen-SlicedFoods.yml diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 5034c8aac0..5bde55f24d 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -2242,6 +2242,12 @@ filling_color = "#FF7575" bitesize = 2 center_of_mass = list("x"=16, "y"=13) + +/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/sliceable/xenomeatbread name = "xenomeatbread loaf" @@ -2266,6 +2272,12 @@ filling_color = "#8AFF75" bitesize = 2 center_of_mass = list("x"=16, "y"=13) + +/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/sliceable/bananabread name = "Banana-nut bread" @@ -2290,6 +2302,12 @@ filling_color = "#EDE5AD" bitesize = 2 center_of_mass = list("x"=16, "y"=8) + +/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/sliceable/tofubread name = "Tofubread" @@ -2313,6 +2331,11 @@ filling_color = "#F7FFE0" bitesize = 2 center_of_mass = list("x"=16, "y"=13) + +/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/sliceable/carrotcake @@ -2338,6 +2361,12 @@ filling_color = "#FFD675" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + +/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/sliceable/braincake name = "Brain Cake" @@ -2363,6 +2392,13 @@ filling_color = "#E6AEDB" bitesize = 2 center_of_mass = list("x"=16, "y"=12) + +/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/sliceable/cheesecake name = "Cheese Cake" @@ -2387,6 +2423,12 @@ filling_color = "#FAF7AF" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + +/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/sliceable/plaincake name = "Vanilla Cake" @@ -2409,6 +2451,11 @@ filling_color = "#F7EDD5" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + +/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/sliceable/orangecake name = "Orange Cake" @@ -2431,6 +2478,11 @@ filling_color = "#FADA8E" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + +/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" @@ -2453,6 +2505,11 @@ filling_color = "#CBFA8E" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + +/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/sliceable/lemoncake name = "Lemon Cake" @@ -2475,6 +2532,11 @@ filling_color = "#FAFA8E" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + +/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/sliceable/chocolatecake name = "Chocolate Cake" @@ -2497,6 +2559,11 @@ filling_color = "#805930" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + +/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/sliceable/cheesewheel name = "Cheese wheel" @@ -2543,6 +2610,12 @@ filling_color = "#FFD6D6" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + +/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/sliceable/bread name = "Bread" @@ -2566,6 +2639,11 @@ filling_color = "#D27332" bitesize = 2 center_of_mass = list("x"=16, "y"=4) + +/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/sliceable/creamcheesebread @@ -2591,7 +2669,12 @@ filling_color = "#FFF896" bitesize = 2 center_of_mass = list("x"=16, "y"=13) - + +/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" @@ -2600,7 +2683,11 @@ filling_color = "#FF3867" 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" @@ -2623,6 +2710,11 @@ filling_color = "#EBF5B8" bitesize = 2 center_of_mass = list("x"=16, "y"=14) + +/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/sliceable/pumpkinpie name = "Pumpkin Pie" @@ -2645,6 +2737,11 @@ filling_color = "#F5B951" bitesize = 2 center_of_mass = list("x"=16, "y"=12) + +/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/cracker name = "Cracker" @@ -2687,6 +2784,13 @@ filling_color = "#BAA14C" bitesize = 2 center_of_mass = list("x"=18, "y"=13) + +/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/sliceable/pizza/meatpizza name = "Meatpizza" @@ -2709,6 +2813,12 @@ filling_color = "#BAA14C" bitesize = 2 center_of_mass = list("x"=18, "y"=13) + +/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/sliceable/pizza/mushroompizza name = "Mushroompizza" @@ -2731,6 +2841,12 @@ filling_color = "#BAA14C" bitesize = 2 center_of_mass = list("x"=18, "y"=13) + +/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/sliceable/pizza/vegetablepizza name = "Vegetable pizza" @@ -2755,6 +2871,14 @@ filling_color = "#BAA14C" bitesize = 2 center_of_mass = list("x"=18, "y"=13) + +/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/pizzabox name = "pizza box" diff --git a/html/changelogs/Datraen-SlicedFoods.yml b/html/changelogs/Datraen-SlicedFoods.yml new file mode 100644 index 0000000000..df253073c1 --- /dev/null +++ b/html/changelogs/Datraen-SlicedFoods.yml @@ -0,0 +1,39 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Kelenius + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Changelings will now change appearance and species together when transforming." + - tweak: "Changelings no longer have gender honorifics in lingchat." + - rscadd: "Absorbing the DNA from any source will allow you to use its name, species, and languages." + - bugfix: "DNA extract sting won't produce a strange message if there's no target." \ No newline at end of file