From c00f797a4a0411ea31e7e14c4a621ad57e697fe7 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sun, 16 Feb 2020 01:26:33 -0600 Subject: [PATCH 01/57] extendies --- .../configuration/entries/general.dm | 10 +++++++ code/controllers/subsystem/autotransfer.dm | 17 ++++++++++++ code/controllers/subsystem/ticker.dm | 2 +- code/controllers/subsystem/vote.dm | 26 ++++++++++++++++++- config/config.txt | 6 +++++ 5 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 code/controllers/subsystem/autotransfer.dm diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index cb8c0fe966..b5e7137374 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -82,6 +82,16 @@ config_entry_value = 600 min_val = 0 +/datum/config_entry/number/vote_autotransfer_initial //length of time before the first autotransfer vote is called (deciseconds, default 2 hours) + config_entry_value = 72000 + integer = FALSE + min_val = 0 + +/datum/config_entry/number/vote_autotransfer_interval //length of time to wait before subsequent autotransfer votes (deciseconds, default 30 minutes) + config_entry_value = 18000 + integer = FALSE + min_val = 0 + /datum/config_entry/flag/default_no_vote // vote does not default to nochange/norestart /datum/config_entry/flag/no_dead_vote // dead people can't vote diff --git a/code/controllers/subsystem/autotransfer.dm b/code/controllers/subsystem/autotransfer.dm new file mode 100644 index 0000000000..05ef3127c1 --- /dev/null +++ b/code/controllers/subsystem/autotransfer.dm @@ -0,0 +1,17 @@ +SUBSYSTEM_DEF(autotransfer) + name = "Autotransfer Vote" + flags = SS_KEEP_TIMING | SS_BACKGROUND + wait = 1 MINUTES + + var/starttime + var/targettime + +/datum/controller/subsystem/autotransfer/Initialize(timeofday) + starttime = world.time + targettime = starttime + CONFIG_GET(number/vote_autotransfer_initial) + return ..() + +/datum/controller/subsystem/autotransfer/fire() + if (world.time > targettime) + SSvote.initiate_vote("transfer",null) //TODO figure out how to not use null as the user + targettime = targettime + CONFIG_GET(number/vote_autotransfer_interval) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index fe994facdc..3857fb0af5 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -213,7 +213,7 @@ SUBSYSTEM_DEF(ticker) check_queue() check_maprotate() scripture_states = scripture_unlock_alert(scripture_states) - SSshuttle.autoEnd() + //SSshuttle.autoEnd() if(!roundend_check_paused && mode.check_finished(force_ending) || force_ending) current_state = GAME_STATE_FINISHED diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 9924ed7917..10d1cbb3d0 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -89,6 +89,20 @@ SUBSYSTEM_DEF(vote) choices[GLOB.master_mode] += non_voters.len if(choices[GLOB.master_mode] >= greatest_votes) greatest_votes = choices[GLOB.master_mode] + else if(mode == "transfer") // austation begin -- Crew autotransfer vote + var/factor = 1 + switch(world.time / (1 MINUTES )) + if(0 to 60) + factor = 0.5 + if(61 to 120) + factor = 0.8 + if(121 to 240) + factor = 1 + if(241 to 300) + factor = 1.2 + else + factor = 1.4 + choices["Initiate Crew Transfer"] += round(non_voters.len * factor) // austation end //get all options with that many votes and return them in a list . = list() if(greatest_votes) @@ -365,6 +379,13 @@ SUBSYSTEM_DEF(vote) log_admin("The map has been voted for and will change to: [VM.map_name]") if(SSmapping.changemap(config.maplist[.])) to_chat(world, "The map vote has chosen [VM.map_name] for next round!") + if("transfer") // austation begin -- Crew autotransfer vote + if(. == "Initiate Crew Transfer") + //TODO find a cleaner way to do this + SSshuttle.requestEvac(null,"Crew transfer requested.") + var/obj/machinery/computer/communications/C = locate() in GLOB.machines + if(C) + C.post_status("shuttle") // austation end if(restart) var/active_admins = 0 for(var/client/C in GLOB.admins) @@ -444,6 +465,7 @@ SUBSYSTEM_DEF(vote) to_chat(usr, "A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!") return 0 + SEND_SOUND(world, sound('sound/misc/notice2.ogg')) reset() obfuscated = hideresults //CIT CHANGE - adds obfuscated votes switch(vote_type) @@ -465,6 +487,8 @@ SUBSYSTEM_DEF(vote) if(targetmap.max_round_search_span && count_occurences_of_value(lastmaps, M, targetmap.max_round_search_span) >= targetmap.max_rounds_played) continue choices |= M + if("transfer") // austation begin -- Crew autotranfer vote + choices.Add("Initiate Crew Transfer","Continue Playing") // austation end if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote choices.Add("secret", "extended") if("mode tiers") @@ -496,7 +520,7 @@ SUBSYSTEM_DEF(vote) else return 0 mode = vote_type - initiator = initiator_key + initiator = initiator_key ? initiator_key : "the Server" // austation -- Crew autotransfer vote started_time = world.time var/text = "[capitalize(mode)] vote started by [initiator]." if(mode == "custom") diff --git a/config/config.txt b/config/config.txt index 0ab0cc911e..cc9ede5ef2 100644 --- a/config/config.txt +++ b/config/config.txt @@ -184,6 +184,12 @@ VOTE_DELAY 6000 ## time period (deciseconds) which voting session will last (default 1 minute) VOTE_PERIOD 600 +## autovote initial delay (deciseconds) before first automatic transfer vote call (default 120 minutes) +VOTE_AUTOTRANSFER_INITIAL 72000 + +##autovote delay (deciseconds) before sequential automatic transfer votes are called (default 30 minutes) +VOTE_AUTOTRANSFER_INTERVAL 18000 + ## prevents dead players from voting or starting votes # NO_DEAD_VOTE From 35a070fc5736f4d8aee2770869093a87cb26cb30 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sun, 16 Feb 2020 01:29:06 -0600 Subject: [PATCH 02/57] oh shit oh jesus is this working --- tgstation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/tgstation.dme b/tgstation.dme index 28f469ac25..3591fa59b5 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -242,6 +242,7 @@ #include "code\controllers\subsystem\assets.dm" #include "code\controllers\subsystem\atoms.dm" #include "code\controllers\subsystem\augury.dm" +#include "code\controllers\subsystem\autotransfer.dm" #include "code\controllers\subsystem\blackbox.dm" #include "code\controllers\subsystem\chat.dm" #include "code\controllers\subsystem\communications.dm" From f05a88d36f661bc93cd3e2b0539211e19ad73cd6 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sun, 16 Feb 2020 02:24:41 -0600 Subject: [PATCH 03/57] it compiles now ghom --- code/controllers/subsystem/vote.dm | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 10d1cbb3d0..9ddd8d9123 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -90,19 +90,19 @@ SUBSYSTEM_DEF(vote) if(choices[GLOB.master_mode] >= greatest_votes) greatest_votes = choices[GLOB.master_mode] else if(mode == "transfer") // austation begin -- Crew autotransfer vote - var/factor = 1 - switch(world.time / (1 MINUTES )) - if(0 to 60) - factor = 0.5 - if(61 to 120) - factor = 0.8 - if(121 to 240) - factor = 1 - if(241 to 300) - factor = 1.2 - else - factor = 1.4 - choices["Initiate Crew Transfer"] += round(non_voters.len * factor) // austation end + var/factor = 1 + switch(world.time / (1 MINUTES)) + if(0 to 60) + factor = 0.5 + if(61 to 120) + factor = 0.8 + if(121 to 240) + factor = 1 + if(241 to 300) + factor = 1.2 + else + factor = 1.4 + choices["Initiate Crew Transfer"] += round(non_voters.len * factor) // austation end //get all options with that many votes and return them in a list . = list() if(greatest_votes) @@ -380,12 +380,12 @@ SUBSYSTEM_DEF(vote) if(SSmapping.changemap(config.maplist[.])) to_chat(world, "The map vote has chosen [VM.map_name] for next round!") if("transfer") // austation begin -- Crew autotransfer vote - if(. == "Initiate Crew Transfer") - //TODO find a cleaner way to do this - SSshuttle.requestEvac(null,"Crew transfer requested.") - var/obj/machinery/computer/communications/C = locate() in GLOB.machines - if(C) - C.post_status("shuttle") // austation end + if(. == "Initiate Crew Transfer") + //TODO find a cleaner way to do this + SSshuttle.requestEvac(null,"Crew transfer requested.") + var/obj/machinery/computer/communications/C = locate() in GLOB.machines + if(C) + C.post_status("shuttle") // austation end if(restart) var/active_admins = 0 for(var/client/C in GLOB.admins) From c97111bedaabdd8feddccc0985d0155c4a607ead Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Mon, 17 Feb 2020 05:32:03 -0500 Subject: [PATCH 04/57] Reorganise Food + Balance Tweaks -Reorganised -ALL- foods in the crafting menu. -Made a section for Eastern Dishes, Mexican Dishes, and Sweets -Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized. -Moved Easter Recipies to the food files, fixing it in the process. -Capitalised a few things. --- code/__DEFINES/construction.dm | 4 +- code/datums/components/crafting/craft.dm | 2 + .../food_and_drinks/food/customizables.dm | 2 +- .../food_and_drinks/food/snacks_egg.dm | 2 - .../food_and_drinks/food/snacks_other.dm | 46 +++ .../food_and_drinks/food/snacks_salad.dm | 2 +- .../food_and_drinks/food/snacks_soup.dm | 2 +- .../recipes/tablecraft/recipes_bread.dm | 130 ++++-- .../recipes/tablecraft/recipes_burger.dm | 390 +++++++++--------- .../recipes/tablecraft/recipes_cake.dm | 234 +++++------ .../recipes/tablecraft/recipes_frozen.dm | 2 +- .../recipes/tablecraft/recipes_meat.dm | 134 +++--- .../recipes/tablecraft/recipes_mexican.dm | 111 +++++ .../recipes/tablecraft/recipes_misc.dm | 261 ++---------- .../recipes/tablecraft/recipes_pastry.dm | 283 ++++++------- .../recipes/tablecraft/recipes_pie.dm | 220 +++++----- .../recipes/tablecraft/recipes_pizza.dm | 114 ++--- .../recipes/tablecraft/recipes_salad.dm | 80 ++-- .../recipes/tablecraft/recipes_sandwich.dm | 3 +- .../recipes/tablecraft/recipes_soup.dm | 243 ++++++----- .../recipes/tablecraft/recipes_spaghetti.dm | 20 +- .../recipes/tablecraft/recipes_sushi.dm | 70 +++- .../recipes/tablecraft/recipies_sweets.dm | 117 ++++++ code/modules/holiday/easter.dm | 98 +---- tgstation.dme | 2 + 25 files changed, 1303 insertions(+), 1269 deletions(-) create mode 100644 code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm create mode 100644 code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index c93f1b2435..c4d87de495 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -92,8 +92,10 @@ #define CAT_BREAD "Breads" #define CAT_BURGER "Burgers" #define CAT_CAKE "Cakes" +#define CAT_FISH "Eastern" #define CAT_EGG "Egg-Based Food" #define CAT_MEAT "Meats" +#define CAT_MEXICAN "Mexican" #define CAT_MISCFOOD "Misc. Food" #define CAT_PASTRY "Pastries" #define CAT_PIE "Pies" @@ -102,7 +104,7 @@ #define CAT_SANDWICH "Sandwiches" #define CAT_SOUP "Soups" #define CAT_SPAGHETTI "Spaghettis" -#define CAT_FISH "Fish" +#define CAT_SWEETS "Sweets" #define CAT_ICE "Frozen" #define RCD_FLOORWALL 1 diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index b5c7f34c27..674746479d 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -31,6 +31,7 @@ CAT_FISH, CAT_ICE, CAT_MEAT, + CAT_MEXICAN, CAT_MISCFOOD, CAT_PASTRY, CAT_PIE, @@ -39,6 +40,7 @@ CAT_SANDWICH, CAT_SOUP, CAT_SPAGHETTI, + CAT_SWEETS, ), CAT_DRINK = CAT_NONE, CAT_CLOTHING = CAT_NONE, diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 016e37a5c4..7cc1152962 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -294,7 +294,7 @@ icon_state = "bowl" reagent_flags = OPENCONTAINER materials = list(MAT_GLASS = 500) - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_SMALL /obj/item/reagent_containers/glass/bowl/attackby(obj/item/I,mob/user, params) if(istype(I, /obj/item/reagent_containers/food/snacks)) diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index c65e42c0e4..b2a474adac 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -124,7 +124,6 @@ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1) bitesize = 1 - w_class = WEIGHT_CLASS_NORMAL tastes = list("egg" = 1, "cheese" = 1) foodtype = MEAT | BREAKFAST @@ -152,7 +151,6 @@ icon_state = "benedict" bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4) trash = /obj/item/trash/plate - w_class = WEIGHT_CLASS_NORMAL list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("egg" = 1, "bacon" = 1, "bun" = 1) foodtype = MEAT | BREAKFAST diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index a7090a5274..1fff57395b 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -674,3 +674,49 @@ if (7000 to INFINITY) burn() ..() + +//Easter Stuff + +/obj/item/reagent_containers/food/snacks/chocolatebunny + name = "chocolate bunny" + desc = "Contains less than 10% real rabbit!" + icon_state = "chocolatebunny" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2) + filling_color = "#A0522D" + +/obj/item/reagent_containers/food/snacks/store/cake/brioche + name = "brioche cake" + desc = "A ring of sweet, glazed buns." + icon_state = "briochecake" + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche + slices_num = 6 + bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2) + +/obj/item/reagent_containers/food/snacks/cakeslice/brioche + name = "brioche cake slice" + desc = "Delicious sweet-bread. Who needs anything else?" + icon_state = "briochecake_slice" + filling_color = "#FFD700" + +/obj/item/reagent_containers/food/snacks/scotchegg + name = "scotch egg" + desc = "A boiled egg wrapped in a delicious, seasoned meatball." + icon_state = "scotchegg" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) + bitesize = 3 + filling_color = "#FFFFF0" + list_reagents = list(/datum/reagent/consumable/nutriment = 6) + +/obj/item/reagent_containers/food/snacks/soup/mammi + name = "Mammi" + desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement." + icon_state = "mammi" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) + list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1) + +/obj/item/reagent_containers/food/snacks/hotcrossbun + bitesize = 2 + name = "hot-cross bun" + desc = "The Cross represents the Assistants that died for your sins." + icon_state = "hotcrossbun" \ No newline at end of file diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm index e272733235..aa4cf44f4e 100644 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ b/code/modules/food_and_drinks/food/snacks_salad.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/food/soupsalad.dmi' trash = /obj/item/reagent_containers/glass/bowl bitesize = 3 - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_SMALL list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("leaves" = 1) foodtype = VEGETABLES diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm index a0e1ebcb39..796cff9b65 100644 --- a/code/modules/food_and_drinks/food/snacks_soup.dm +++ b/code/modules/food_and_drinks/food/snacks_soup.dm @@ -1,5 +1,5 @@ /obj/item/reagent_containers/food/snacks/soup - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_SMALL icon = 'icons/obj/food/soupsalad.dmi' trash = /obj/item/reagent_containers/glass/bowl bitesize = 5 diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm index e572cc76ff..c3890b28eb 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_bread.dm @@ -3,36 +3,6 @@ ////////////////////////////////////////////////BREAD//////////////////////////////////////////////// -/datum/crafting_recipe/food/meatbread - name = "Meat bread" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet/plain = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 3 - ) - result = /obj/item/reagent_containers/food/snacks/store/bread/meat - subcategory = CAT_BREAD - -/datum/crafting_recipe/food/xenomeatbread - name = "Xenomeat bread" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 3 - ) - result = /obj/item/reagent_containers/food/snacks/store/bread/xenomeat - subcategory = CAT_BREAD - -/datum/crafting_recipe/food/spidermeatbread - name = "Spidermeat bread" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 3 - ) - result = /obj/item/reagent_containers/food/snacks/store/bread/spidermeat - subcategory = CAT_BREAD - /datum/crafting_recipe/food/banananutbread name = "Banana nut bread" reqs = list( @@ -44,16 +14,6 @@ result = /obj/item/reagent_containers/food/snacks/store/bread/banana subcategory = CAT_BREAD -/datum/crafting_recipe/food/tofubread - name = "Tofu bread" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/tofu = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 3 - ) - result = /obj/item/reagent_containers/food/snacks/store/bread/tofu - subcategory = CAT_BREAD - /datum/crafting_recipe/food/creamcheesebread name = "Cream cheese bread" reqs = list( @@ -64,6 +24,16 @@ result = /obj/item/reagent_containers/food/snacks/store/bread/creamcheese subcategory = CAT_BREAD +/datum/crafting_recipe/food/meatbread + name = "Meat bread" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet/plain = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 3 + ) + result = /obj/item/reagent_containers/food/snacks/store/bread/meat + subcategory = CAT_BREAD + /datum/crafting_recipe/food/mimanabread name = "Mimana bread" reqs = list( @@ -75,6 +45,38 @@ result = /obj/item/reagent_containers/food/snacks/store/bread/mimana subcategory = CAT_BREAD +/datum/crafting_recipe/food/spidermeatbread + name = "Spidermeat bread" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 3 + ) + result = /obj/item/reagent_containers/food/snacks/store/bread/spidermeat + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/tofubread + name = "Tofu bread" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/tofu = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 3 + ) + result = /obj/item/reagent_containers/food/snacks/store/bread/tofu + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/xenomeatbread + name = "Xenomeat bread" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 3 + ) + result = /obj/item/reagent_containers/food/snacks/store/bread/xenomeat + subcategory = CAT_BREAD + +////////////////////////////////////////////////TOAST//////////////////////////////////////////////// + /datum/crafting_recipe/food/butteredtoast name = "Buttered Toast" reqs = list( @@ -84,6 +86,45 @@ result = /obj/item/reagent_containers/food/snacks/butteredtoast subcategory = CAT_BREAD +/datum/crafting_recipe/food/slimetoast + name = "Slime toast" + reqs = list( + /datum/reagent/toxin/slimejelly = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/jelliedtoast + name = "Jellied toast" + reqs = list( + /datum/reagent/consumable/cherryjelly = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/peanutbuttertoast + name = "Peanut butter toast" + reqs = list( + /datum/reagent/consumable/peanut_butter = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast + subcategory = CAT_BREAD + +////////////////////////////////////////////////MISC//////////////////////////////////////////////// + +/datum/crafting_recipe/food/baguette + name = "Baguette" + time = 40 + reqs = list(/datum/reagent/consumable/sodiumchloride = 1, + /datum/reagent/consumable/blackpepper = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 2 + ) + result = /obj/item/reagent_containers/food/snacks/baguette + subcategory = CAT_BREAD + /datum/crafting_recipe/food/butterbiscuit name = "Butter Biscuit" reqs = list( @@ -100,4 +141,13 @@ /obj/item/reagent_containers/food/snacks/butter = 3, ) result = /obj/item/reagent_containers/food/snacks/butterdog + subcategory = CAT_BREAD + +/datum/crafting_recipe/food/twobread + name = "Two bread" + reqs = list( + /datum/reagent/consumable/ethanol/wine = 5, + /obj/item/reagent_containers/food/snacks/breadslice/plain = 2 + ) + result = /obj/item/reagent_containers/food/snacks/twobread subcategory = CAT_BREAD \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm index ffa8709245..0fae6542e9 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -1,41 +1,9 @@ // see code/module/crafting/table.dm -////////////////////////////////////////////////BURGERS//////////////////////////////////////////////// +////////////////////////////////////////////////STANDARD BURGS//////////////////////////////////////////////// -/datum/crafting_recipe/food/humanburger - name = "Human burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1 - ) - parts = list( - /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/human - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/burger - name = "Burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - - result = /obj/item/reagent_containers/food/snacks/burger/plain - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/corgiburger - name = "Corgi burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/slab/corgi = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - - result = /obj/item/reagent_containers/food/snacks/burger/corgi - subcategory = CAT_BURGER - /datum/crafting_recipe/food/appendixburger name = "Appendix burger" reqs = list( @@ -54,15 +22,87 @@ result = /obj/item/reagent_containers/food/snacks/burger/brain subcategory = CAT_BURGER -/datum/crafting_recipe/food/xenoburger - name = "Xeno burger" +/datum/crafting_recipe/food/burger + name = "Burger" reqs = list( - /obj/item/reagent_containers/food/snacks/meat/steak/xeno = 1, + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + + result = /obj/item/reagent_containers/food/snacks/burger/plain + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/baconburger + name = "Bacon Burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/bacon = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + + result = /obj/item/reagent_containers/food/snacks/burger/baconburger + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/bigbiteburger + name = "Big bite burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 2, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/xeno + result = /obj/item/reagent_containers/food/snacks/burger/bigbite subcategory = CAT_BURGER +/datum/crafting_recipe/food/superbiteburger + name = "Super bite burger" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 5, + /datum/reagent/consumable/blackpepper = 5, + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 5, + /obj/item/reagent_containers/food/snacks/grown/tomato = 4, + /obj/item/reagent_containers/food/snacks/cheesewedge = 3, + /obj/item/reagent_containers/food/snacks/boiledegg = 1, + /obj/item/reagent_containers/food/snacks/meat/bacon = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + + ) + result = /obj/item/reagent_containers/food/snacks/burger/superbite + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/cheeseburger + name = "Cheese Burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/cheese + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/corgiburger + name = "Corgi burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/slab/corgi = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + + result = /obj/item/reagent_containers/food/snacks/burger/corgi + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/humanburger + name = "Human burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1 + ) + parts = list( + /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/human + subcategory = CAT_BURGER + +///////////////EXOTIC////////////////// + /datum/crafting_recipe/food/bearger name = "Bearger" reqs = list( @@ -72,6 +112,16 @@ result = /obj/item/reagent_containers/food/snacks/burger/bearger subcategory = CAT_BURGER +/datum/crafting_recipe/food/chickenburger + name = "Chicken Sandwich" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/steak/chicken = 1, + /datum/reagent/consumable/mayonnaise = 5, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/chicken + subcategory = CAT_BURGER + /datum/crafting_recipe/food/fishburger name = "Fish burger" reqs = list( @@ -82,6 +132,54 @@ result = /obj/item/reagent_containers/food/snacks/burger/fish subcategory = CAT_BURGER +/datum/crafting_recipe/food/fivealarmburger + name = "Five alarm burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2, + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/fivealarm + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/slimeburger + name = "Jelly burger" + reqs = list( + /datum/reagent/toxin/slimejelly = 5, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/jellyburger + name = "Jelly burger" + reqs = list( + /datum/reagent/consumable/cherryjelly = 5, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/ribburger + name = "McRib" + reqs = list( + /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs + /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome. + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/rib + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/mcguffin + name = "McGuffin" + reqs = list( + /obj/item/reagent_containers/food/snacks/friedegg = 1, + /obj/item/reagent_containers/food/snacks/meat/bacon = 2, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/mcguffin + subcategory = CAT_BURGER + /datum/crafting_recipe/food/tofuburger name = "Tofu burger" reqs = list( @@ -91,16 +189,45 @@ result = /obj/item/reagent_containers/food/snacks/burger/tofu subcategory = CAT_BURGER -/datum/crafting_recipe/food/ghostburger - name = "Ghost burger" +/datum/crafting_recipe/food/baseballburger + name = "Home run baseball burger" reqs = list( - /obj/item/ectoplasm = 1, - /datum/reagent/consumable/sodiumchloride = 2, + /obj/item/melee/baseball_bat = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/baseball + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/ratburger + name = "Rat burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/deadmouse = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/rat + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/soylentburger + name = "Soylent Burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/soylentgreen = 1, //two full meats worth. + /obj/item/reagent_containers/food/snacks/cheesewedge = 2, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/soylent + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/xenoburger + name = "Xeno burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/steak/xeno = 1, /obj/item/reagent_containers/food/snacks/bun = 1 ) - result = /obj/item/reagent_containers/food/snacks/burger/ghost + result = /obj/item/reagent_containers/food/snacks/burger/xeno subcategory = CAT_BURGER +////////////MYSTICAL//////////////// + /datum/crafting_recipe/food/clownburger name = "Clown burger" reqs = list( @@ -119,6 +246,35 @@ result = /obj/item/reagent_containers/food/snacks/burger/mime subcategory = CAT_BURGER +/datum/crafting_recipe/food/ghostburger + name = "Ghost burger" + reqs = list( + /obj/item/ectoplasm = 1, + /datum/reagent/consumable/sodiumchloride = 2, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/ghost + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/spellburger + name = "Spell burger" + reqs = list( + /obj/item/clothing/head/wizard/fake = 1, + ) + result = /obj/item/reagent_containers/food/snacks/burger/spell + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/spellburger2 + name = "Spell burger" + reqs = list( + /obj/item/clothing/head/wizard = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/spell + subcategory = CAT_BURGER + +////////////COLORED BURGERS////////////// + /datum/crafting_recipe/food/redburger name = "Red burger" reqs = list( @@ -197,154 +353,4 @@ /obj/item/reagent_containers/food/snacks/bun = 1 ) result = /obj/item/reagent_containers/food/snacks/burger/white - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/spellburger - name = "Spell burger" - reqs = list( - /obj/item/clothing/head/wizard/fake = 1, - ) - result = /obj/item/reagent_containers/food/snacks/burger/spell - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/spellburger2 - name = "Spell burger" - reqs = list( - /obj/item/clothing/head/wizard = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/spell - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/bigbiteburger - name = "Big bite burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 2, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/bigbite - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/superbiteburger - name = "Super bite burger" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 5, - /datum/reagent/consumable/blackpepper = 5, - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 5, - /obj/item/reagent_containers/food/snacks/grown/tomato = 4, - /obj/item/reagent_containers/food/snacks/cheesewedge = 3, - /obj/item/reagent_containers/food/snacks/boiledegg = 1, - /obj/item/reagent_containers/food/snacks/meat/bacon = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - - ) - result = /obj/item/reagent_containers/food/snacks/burger/superbite - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/slimeburger - name = "Jelly burger" - reqs = list( - /datum/reagent/toxin/slimejelly = 5, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/jelly/slime - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/jellyburger - name = "Jelly burger" - reqs = list( - /datum/reagent/consumable/cherryjelly = 5, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/fivealarmburger - name = "Five alarm burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2, - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/fivealarm - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/ratburger - name = "Rat burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/deadmouse = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/rat - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/baseballburger - name = "Home run baseball burger" - reqs = list( - /obj/item/melee/baseball_bat = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/baseball - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/baconburger - name = "Bacon Burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/bacon = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - - result = /obj/item/reagent_containers/food/snacks/burger/baconburger - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/cheeseburger - name = "Cheese Burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/cheese - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/soylentburger - name = "Soylent Burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/soylentgreen = 1, //two full meats worth. - /obj/item/reagent_containers/food/snacks/cheesewedge = 2, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/soylent - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/ribburger - name = "McRib" - reqs = list( - /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs - /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome. - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/rib - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/mcguffin - name = "McGuffin" - reqs = list( - /obj/item/reagent_containers/food/snacks/friedegg = 1, - /obj/item/reagent_containers/food/snacks/meat/bacon = 2, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/mcguffin - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/chickenburger - name = "Chicken Sandwich" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/steak/chicken = 1, - /datum/reagent/consumable/mayonnaise = 5, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/chicken subcategory = CAT_BURGER \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index f168896164..492d5c2db3 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -1,7 +1,84 @@ // see code/module/crafting/table.dm -////////////////////////////////////////////////CAKE//////////////////////////////////////////////// +////////////////////////////////////////////////FRUIT CAKE//////////////////////////////////////////////// + +/datum/crafting_recipe/food/applecake + name = "Apple cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/apple = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/apple + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/bscccake + name = "Blackberry and strawberry chocolate cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 2, + /obj/item/reagent_containers/food/snacks/grown/berries = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/bscc + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/bscvcake + name = "Blackberry and strawberry vanilla cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/berries = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/lemoncake + name = "Lemon cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/lemon + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/limecake + name = "Lime cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/lime + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/orangecake + name = "Orange cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/orange + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/peachcake + name = "Peach cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/peach = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/peach_cake + subcategory = CAT_CAKE + +///////////////////////////////////FANCY//////////////////////////////////////////// + +/datum/crafting_recipe/food/birthdaycake + name = "Birthday cake" + reqs = list( + /datum/reagent/consumable/sugar = 5, + /datum/reagent/consumable/caramel =2, + /obj/item/candle = 1, + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/birthday + subcategory = CAT_CAKE /datum/crafting_recipe/food/carrotcake name = "Carrot cake" @@ -21,42 +98,6 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/cheese subcategory = CAT_CAKE -/datum/crafting_recipe/food/applecake - name = "Apple cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/apple = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/apple - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/orangecake - name = "Orange cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/orange - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/limecake - name = "Lime cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/lime - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/lemoncake - name = "Lemon cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/lemon - subcategory = CAT_CAKE - /datum/crafting_recipe/food/chocolatecake name = "Chocolate cake" reqs = list( @@ -66,35 +107,6 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/chocolate subcategory = CAT_CAKE -/datum/crafting_recipe/food/birthdaycake - name = "Birthday cake" - reqs = list( - /datum/reagent/consumable/sugar = 5, - /datum/reagent/consumable/caramel =2, - /obj/item/candle = 1, - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/birthday - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/braincake - name = "Brain cake" - reqs = list( - /obj/item/organ/brain = 1, - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/brain - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/slimecake - name = "Slime cake" - reqs = list( - /obj/item/slime_extract = 1, - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/slimecake - subcategory = CAT_CAKE - /datum/crafting_recipe/food/pumpkinspicecake name = "Pumpkin spice cake" reqs = list( @@ -104,6 +116,26 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice subcategory = CAT_CAKE +/datum/crafting_recipe/food/poundcake + name = "Pound cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 4 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/vanillacake + name = "Vanilla cake" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake + subcategory = CAT_CAKE + +/////////////SPECIAL//////////// + /datum/crafting_recipe/food/holycake name = "Angel food cake" reqs = list( @@ -113,12 +145,24 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/holy_cake subcategory = CAT_CAKE -/datum/crafting_recipe/food/poundcake - name = "Pound cake" +/datum/crafting_recipe/food/braincake + name = "Brain cake" reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 4 + /obj/item/organ/brain = 1, + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake + result = /obj/item/reagent_containers/food/snacks/store/cake/brain + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/clowncake + name = "Clown cake" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/sundae = 2, + /obj/item/reagent_containers/food/snacks/grown/banana = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/clown_cake subcategory = CAT_CAKE /datum/crafting_recipe/food/hardwarecake @@ -131,53 +175,13 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/hardware_cake subcategory = CAT_CAKE -/datum/crafting_recipe/food/bscccake - name = "blackberry and strawberry chocolate cake" +/datum/crafting_recipe/food/slimecake + name = "Slime cake" reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 2, - /obj/item/reagent_containers/food/snacks/grown/berries = 5 + /obj/item/slime_extract = 1, + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/store/cake/bscc - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/bscvcake - name = "blackberry and strawberry vanilla cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/berries = 5 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/clowncake - name = "clown cake" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/sundae = 2, - /obj/item/reagent_containers/food/snacks/grown/banana = 5 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/clown_cake - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/vanillacake - name = "vanilla cake" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/vanillapod = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/vanilla_cake - subcategory = CAT_CAKE - -/datum/crafting_recipe/food/peachcake - name = "Peach cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/peach = 5 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/peach_cake + result = /obj/item/reagent_containers/food/snacks/store/cake/slimecake subcategory = CAT_CAKE /datum/crafting_recipe/food/trumpetcake diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index e204b0c72c..1b1801d982 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -14,7 +14,7 @@ subcategory = CAT_ICE /datum/crafting_recipe/food/spacefreezy - name ="Space freezy" + name ="Space Freezy" reqs = list( /datum/reagent/consumable/bluecherryjelly = 5, /datum/reagent/consumable/spacemountainwind = 15, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index d8145410cd..03020b8ba9 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -36,6 +36,18 @@ result = /obj/item/reagent_containers/food/snacks/kebab/tail subcategory = CAT_MEAT +/datum/crafting_recipe/food/fiestaskewer + name = "Fiesta Skewer" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, + /obj/item/reagent_containers/food/snacks/grown/corn = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/kebab/fiesta + subcategory = CAT_MEAT + // see code/module/crafting/table.dm ////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// @@ -50,8 +62,69 @@ result = /obj/item/reagent_containers/food/snacks/spidereggsham subcategory = CAT_MEAT +//////////////////////////////////////////////FISH/////////////////////////////////////////// + +/datum/crafting_recipe/food/fishfingers + name = "Fish fingers" + reqs = list( + /datum/reagent/consumable/flour = 5, + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fishfingers + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/cubancarp + name = "Cuban carp" + reqs = list( + /datum/reagent/consumable/flour = 5, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cubancarp + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/fishandchips + name = "Fish and chips" + reqs = list( + /obj/item/reagent_containers/food/snacks/fries = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fishandchips + subcategory = CAT_MEAT + ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// +/datum/crafting_recipe/food/ribs + name = "BBQ Ribs" + reqs = list( + /datum/reagent/consumable/bbqsauce = 5, + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 2, + /obj/item/stack/rods = 2 + ) + result = /obj/item/reagent_containers/food/snacks/bbqribs + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/nugget + name = "Chicken nugget" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1 + ) + result = /obj/item/reagent_containers/food/snacks/nugget + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/corndog + name = "Corndog meal" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, + /obj/item/reagent_containers/food/snacks/bun = 1, + /datum/reagent/consumable/mustard = 5, + /datum/reagent/consumable/ketchup = 5 + ) + result = /obj/item/reagent_containers/food/snacks/corndog + subcategory = CAT_MEAT + /datum/crafting_recipe/food/cornedbeef name = "Corned beef" reqs = list( @@ -72,16 +145,6 @@ result = /obj/item/reagent_containers/food/snacks/bearsteak subcategory = CAT_MEAT -/datum/crafting_recipe/food/enchiladas - name = "Enchiladas" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, - /obj/item/reagent_containers/food/snacks/grown/chili = 2, - /obj/item/reagent_containers/food/snacks/tortilla = 2 - ) - result = /obj/item/reagent_containers/food/snacks/enchiladas - subcategory = CAT_MEAT - /datum/crafting_recipe/food/stewedsoymeat name = "Stewed soymeat" reqs = list( @@ -101,23 +164,6 @@ result = /obj/item/reagent_containers/food/snacks/sausage subcategory = CAT_MEAT -/datum/crafting_recipe/food/nugget - name = "Chicken nugget" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1 - ) - result = /obj/item/reagent_containers/food/snacks/nugget - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/rawkhinkali - name = "Raw Khinkali" - reqs = list( - /obj/item/reagent_containers/food/snacks/doughslice = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 - ) - result = /obj/item/reagent_containers/food/snacks/rawkhinkali - subcategory = CAT_MEAT - /datum/crafting_recipe/food/pigblanket name = "Pig in a Blanket" reqs = list( @@ -128,18 +174,6 @@ result = /obj/item/reagent_containers/food/snacks/pigblanket subcategory = CAT_MEAT -/datum/crafting_recipe/food/corndog - name = "Corndog meal" - reqs = list( - /obj/item/stack/rods = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, - /obj/item/reagent_containers/food/snacks/bun = 1, - /datum/reagent/consumable/mustard = 5, - /datum/reagent/consumable/ketchup = 5 - ) - result = /obj/item/reagent_containers/food/snacks/corndog - subcategory = CAT_MEAT - /datum/crafting_recipe/food/ratkebab name = "Rat Kebab" reqs = list( @@ -166,25 +200,3 @@ ) result = /obj/item/reagent_containers/food/snacks/salad/ricepork subcategory = CAT_MEAT - -/datum/crafting_recipe/food/fiestaskewer - name = "Fiesta Skewer" - reqs = list( - /obj/item/stack/rods = 1, - /obj/item/reagent_containers/food/snacks/grown/chili = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, - /obj/item/reagent_containers/food/snacks/grown/corn = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/kebab/fiesta - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/ribs - name = "BBQ Ribs" - reqs = list( - /datum/reagent/consumable/bbqsauce = 5, - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 2, - /obj/item/stack/rods = 2 - ) - result = /obj/item/reagent_containers/food/snacks/bbqribs - subcategory = CAT_MEAT \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm new file mode 100644 index 0000000000..e155a1bd23 --- /dev/null +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm @@ -0,0 +1,111 @@ +// see code/module/crafting/table.dm + +////////////////////////////////////////////////"MEXICAN"//////////////////////////////////////////////// + +/datum/crafting_recipe/food/burrito + name ="Burrito" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 2 + ) + result = /obj/item/reagent_containers/food/snacks/burrito + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/cheesyburrito + name ="Cheesy burrito" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 2, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cheesyburrito + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/enchiladas + name = "Enchiladas" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /obj/item/reagent_containers/food/snacks/grown/chili = 2, + /obj/item/reagent_containers/food/snacks/tortilla = 2 + ) + result = /obj/item/reagent_containers/food/snacks/enchiladas + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/carneburrito + name ="Carne de asada burrito" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 + ) + result = /obj/item/reagent_containers/food/snacks/carneburrito + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/fuegoburrito + name ="Fuego plasma burrito" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fuegoburrito + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/taco + name ="Classic Taco" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + ) + result = /obj/item/reagent_containers/food/snacks/taco + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/tacoplain + name ="Plain Taco" + reqs = list( + /obj/item/reagent_containers/food/snacks/tortilla = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, + ) + result = /obj/item/reagent_containers/food/snacks/taco/plain + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/nachos + name ="Nachos" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 1, + /obj/item/reagent_containers/food/snacks/tortilla = 1 + ) + result = /obj/item/reagent_containers/food/snacks/nachos + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/cheesynachos + name ="Cheesy nachos" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/tortilla = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cheesynachos + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/cubannachos + name ="Cuban nachos" + reqs = list( + /datum/reagent/consumable/ketchup = 5, + /obj/item/reagent_containers/food/snacks/grown/chili = 2, + /obj/item/reagent_containers/food/snacks/tortilla = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cubannachos + subcategory = CAT_MEXICAN + +/datum/crafting_recipe/food/wrap + name = "Wrap" + reqs = list(/datum/reagent/consumable/soysauce = 10, + /obj/item/reagent_containers/food/snacks/friedegg = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + ) + result = /obj/item/reagent_containers/food/snacks/eggwrap + subcategory = CAT_MEXICAN \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 9cf5ea31a0..b2d79e10f9 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -3,60 +3,32 @@ // MISC -/datum/crafting_recipe/food/candiedapple - name = "Candied apple" - reqs = list(/datum/reagent/water = 5, - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/grown/apple = 1 - ) - result = /obj/item/reagent_containers/food/snacks/candiedapple - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/spiderlollipop - name = "Spider Lollipop" - reqs = list(/obj/item/stack/rods = 1, - /datum/reagent/consumable/sugar = 5, - /datum/reagent/water = 5, - /obj/item/reagent_containers/food/snacks/spiderling = 1 - ) - result = /obj/item/reagent_containers/food/snacks/spiderlollipop - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/chococoin - name = "Choco coin" - reqs = list( - /obj/item/coin = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - ) - result = /obj/item/reagent_containers/food/snacks/chococoin - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/fudgedice - name = "Fudge dice" - reqs = list( - /obj/item/dice = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - ) - result = /obj/item/reagent_containers/food/snacks/fudgedice - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/chocoorange - name = "Choco orange" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - ) - result = /obj/item/reagent_containers/food/snacks/chocoorange - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/loadedbakedpotato - name = "Loaded baked potato" +/datum/crafting_recipe/food/beans + name = "Beans" time = 40 - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/potato = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1 + reqs = list(/datum/reagent/consumable/ketchup = 5, + /obj/item/reagent_containers/food/snacks/grown/soybeans = 2 ) - result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato + result = /obj/item/reagent_containers/food/snacks/beans + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/branrequests + name = "Bran Requests Cereal" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/wheat = 1, + /obj/item/reagent_containers/food/snacks/no_raisin = 1, + ) + result = /obj/item/reagent_containers/food/snacks/branrequests + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/oatmeal + name = "Oatmeal" + reqs = list( + /datum/reagent/consumable/milk = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/oat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/salad/oatmeal subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/cheesyfries @@ -68,24 +40,6 @@ result = /obj/item/reagent_containers/food/snacks/cheesyfries subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/wrap - name = "Wrap" - reqs = list(/datum/reagent/consumable/soysauce = 10, - /obj/item/reagent_containers/food/snacks/friedegg = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, - ) - result = /obj/item/reagent_containers/food/snacks/eggwrap - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/beans - name = "Beans" - time = 40 - reqs = list(/datum/reagent/consumable/ketchup = 5, - /obj/item/reagent_containers/food/snacks/grown/soybeans = 2 - ) - result = /obj/item/reagent_containers/food/snacks/beans - subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/eggplantparm name ="Eggplant parmigiana" reqs = list( @@ -95,91 +49,14 @@ result = /obj/item/reagent_containers/food/snacks/eggplantparm subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/baguette - name = "Baguette" +/datum/crafting_recipe/food/loadedbakedpotato + name = "Loaded baked potato" time = 40 - reqs = list(/datum/reagent/consumable/sodiumchloride = 1, - /datum/reagent/consumable/blackpepper = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 2 - ) - result = /obj/item/reagent_containers/food/snacks/baguette - subcategory = CAT_MISCFOOD - -////////////////////////////////////////////////TOAST//////////////////////////////////////////////// - -/datum/crafting_recipe/food/slimetoast - name = "Slime toast" reqs = list( - /datum/reagent/toxin/slimejelly = 5, - /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 + /obj/item/reagent_containers/food/snacks/grown/potato = 1, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1 ) - result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/jelliedtoast - name = "Jellied toast" - reqs = list( - /datum/reagent/consumable/cherryjelly = 5, - /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/peanutbuttertoast - name = "Peanut butter toast" - reqs = list( - /datum/reagent/consumable/peanut_butter = 5, - /obj/item/reagent_containers/food/snacks/breadslice/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/twobread - name = "Two bread" - reqs = list( - /datum/reagent/consumable/ethanol/wine = 5, - /obj/item/reagent_containers/food/snacks/breadslice/plain = 2 - ) - result = /obj/item/reagent_containers/food/snacks/twobread - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/burrito - name ="Burrito" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/grown/soybeans = 2 - ) - result = /obj/item/reagent_containers/food/snacks/burrito - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/cheesyburrito - name ="Cheesy burrito" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 2, - /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cheesyburrito - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/carneburrito - name ="Carne de asada burrito" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, - /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 - ) - result = /obj/item/reagent_containers/food/snacks/carneburrito - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/fuegoburrito - name ="Fuego plasma burrito" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/grown/ghost_chili = 2, - /obj/item/reagent_containers/food/snacks/grown/soybeans = 1 - ) - result = /obj/item/reagent_containers/food/snacks/fuegoburrito + result = /obj/item/reagent_containers/food/snacks/loadedbakedpotato subcategory = CAT_MISCFOOD /datum/crafting_recipe/food/melonfruitbowl @@ -195,35 +72,6 @@ result = /obj/item/reagent_containers/food/snacks/melonfruitbowl subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/nachos - name ="Nachos" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/tortilla = 1 - ) - result = /obj/item/reagent_containers/food/snacks/nachos - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/cheesynachos - name ="Cheesy nachos" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/tortilla = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cheesynachos - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/cubannachos - name ="Cuban nachos" - reqs = list( - /datum/reagent/consumable/ketchup = 5, - /obj/item/reagent_containers/food/snacks/grown/chili = 2, - /obj/item/reagent_containers/food/snacks/tortilla = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cubannachos - subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/melonkeg name ="Melon keg" reqs = list( @@ -235,16 +83,6 @@ result = /obj/item/reagent_containers/food/snacks/melonkeg subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/honeybar - name = "Honey nut bar" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/oat = 1, - /datum/reagent/consumable/honey = 5 - ) - result = /obj/item/reagent_containers/food/snacks/honeybar - subcategory = CAT_MISCFOOD - - /datum/crafting_recipe/food/stuffedlegion name = "Stuffed legion" time = 40 @@ -257,7 +95,6 @@ result = /obj/item/reagent_containers/food/snacks/stuffedlegion subcategory = CAT_MISCFOOD - /datum/crafting_recipe/lizardwine //not a subtype of /datum/crafting_recipe/food due to a bug where the resulting bottle would contain 100u of lizardwine and 100u of ethanol. name = "Lizard wine" time = 40 @@ -269,7 +106,6 @@ category = CAT_FOOD subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/powercrepe name = "Powercrepe" time = 40 @@ -283,36 +119,6 @@ result = /obj/item/reagent_containers/food/snacks/powercrepe subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/taco - name ="Classic Taco" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, - ) - result = /obj/item/reagent_containers/food/snacks/taco - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/tacoplain - name ="Plain Taco" - reqs = list( - /obj/item/reagent_containers/food/snacks/tortilla = 1, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1, - ) - result = /obj/item/reagent_containers/food/snacks/taco/plain - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/branrequests - name = "Bran Requests Cereal" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/wheat = 1, - /obj/item/reagent_containers/food/snacks/no_raisin = 1, - ) - result = /obj/item/reagent_containers/food/snacks/branrequests - subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/ricepudding name = "Rice pudding" reqs = list( @@ -332,12 +138,3 @@ ) result = /obj/item/reagent_containers/food/snacks/riceball subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/chocolatestrawberry - name = "Chocolate Strawberry" - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry - subcategory = CAT_MISCFOOD \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 62b8509eb1..b19a2a8a67 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -123,23 +123,6 @@ datum/crafting_recipe/food/donut/meat ////////////////////////////////////////////////////JELLY DONUTS/////////////////////////////////////////////////////// -/datum/crafting_recipe/food/donut/jelly/berry - name = "Berry Jelly Donut" - reqs = list( - /datum/reagent/consumable/berryjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/berry - -/datum/crafting_recipe/food/donut/jelly/trumpet - name = "Spaceman's Jelly Donut" - reqs = list( - /datum/reagent/medicine/polypyr = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - - result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet - /datum/crafting_recipe/food/donut/jelly/apple name = "Apple Jelly Donut" reqs = list( @@ -148,21 +131,13 @@ datum/crafting_recipe/food/donut/meat ) result = /obj/item/reagent_containers/food/snacks/donut/jelly/apple -/datum/crafting_recipe/food/donut/jelly/caramel - name = "Caramel Jelly Donut" +/datum/crafting_recipe/food/donut/jelly/berry + name = "Berry Jelly Donut" reqs = list( - /datum/reagent/consumable/caramel = 3, + /datum/reagent/consumable/berryjuice = 3, /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/caramel - -/datum/crafting_recipe/food/donut/jelly/choco - name = "Chocolate Jelly Donut" - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/choco + result = /obj/item/reagent_containers/food/snacks/donut/jelly/berry /datum/crafting_recipe/food/donut/jelly/blumpkin name = "Blumpkin Jelly Donut" @@ -180,6 +155,22 @@ datum/crafting_recipe/food/donut/meat ) result = /obj/item/reagent_containers/food/snacks/donut/jelly/bungo +/datum/crafting_recipe/food/donut/jelly/caramel + name = "Caramel Jelly Donut" + reqs = list( + /datum/reagent/consumable/caramel = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/caramel + +/datum/crafting_recipe/food/donut/jelly/choco + name = "Chocolate Jelly Donut" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/choco + /datum/crafting_recipe/food/donut/jelly/matcha name = "Matcha Jelly Donut" reqs = list( @@ -188,8 +179,24 @@ datum/crafting_recipe/food/donut/meat ) result = /obj/item/reagent_containers/food/snacks/donut/jelly/matcha +/datum/crafting_recipe/food/donut/jelly/trumpet + name = "Spaceman's Jelly Donut" + reqs = list( + /datum/reagent/medicine/polypyr = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet + ////////////////////////////////////////////////////SLIME DONUTS/////////////////////////////////////////////////////// +/datum/crafting_recipe/food/donut/slimejelly/apple + name = "Apple Slime Donut" + reqs = list( + /datum/reagent/consumable/applejuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple + /datum/crafting_recipe/food/donut/slimejelly/berry name = "Berry Slime Donut" reqs = list( @@ -198,22 +205,21 @@ datum/crafting_recipe/food/donut/meat ) result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry -/datum/crafting_recipe/food/donut/slimejelly/trumpet - name = "Spaceman's Slime Donut" +/datum/crafting_recipe/food/donut/slimejelly/blumpkin + name = "Blumpkin Slime Donut" reqs = list( - /datum/reagent/medicine/polypyr = 3, + /datum/reagent/consumable/blumpkinjuice = 3, /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet - -/datum/crafting_recipe/food/donut/slimejelly/apple - name = "Apple Slime Donut" +/datum/crafting_recipe/food/donut/slimejelly/bungo + name = "Bungo Slime Donut" reqs = list( - /datum/reagent/consumable/applejuice = 3, + /datum/reagent/consumable/bungojuice = 3, /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo /datum/crafting_recipe/food/donut/slimejelly/caramel name = "Caramel Slime Donut" @@ -231,21 +237,14 @@ datum/crafting_recipe/food/donut/meat ) result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco -/datum/crafting_recipe/food/donut/slimejelly/blumpkin - name = "Blumpkin Slime Donut" +/datum/crafting_recipe/food/donut/slimejelly/trumpet + name = "Spaceman's Slime Donut" reqs = list( - /datum/reagent/consumable/blumpkinjuice = 3, + /datum/reagent/medicine/polypyr = 3, /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin -/datum/crafting_recipe/food/donut/slimejelly/bungo - name = "Bungo Slime Donut" - reqs = list( - /datum/reagent/consumable/bungojuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet /datum/crafting_recipe/food/donut/slimejelly/matcha name = "Matcha Slime Donut" @@ -388,123 +387,8 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/muffin/poppy subcategory = CAT_PASTRY -/datum/crafting_recipe/food/chawanmushi - name = "Chawanmushi" - reqs = list( - /datum/reagent/water = 5, - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/boiledegg = 2, - /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chawanmushi - subcategory = CAT_PASTRY - ////////////////////////////////////////////OTHER//////////////////////////////////////////// -/datum/crafting_recipe/food/meatbun - name = "Meat bun" - reqs = list( - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 - ) - result = /obj/item/reagent_containers/food/snacks/meatbun - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/khachapuri - name = "Khachapuri" - reqs = list( - /datum/reagent/consumable/eggyolk = 5, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/khachapuri - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/sugarcookie - time = 15 - name = "Sugar cookie" - reqs = list( - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/sugarcookie - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/fortunecookie - time = 15 - name = "Fortune cookie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/paper = 1 - ) - parts = list( - /obj/item/paper = 1 - ) - result = /obj/item/reagent_containers/food/snacks/fortunecookie - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/poppypretzel - time = 15 - name = "Poppy pretzel" - reqs = list( - /obj/item/seeds/poppy = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/poppypretzel - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/plumphelmetbiscuit - time = 15 - name = "Plumphelmet biscuit" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1 - ) - result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/cracker - time = 15 - name = "Cracker" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - ) - result = /obj/item/reagent_containers/food/snacks/cracker - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/chococornet - name = "Choco cornet" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chococornet - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/oatmealcookie - name = "Oatmeal cookie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/oat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/oatmealcookie - subcategory = CAT_PASTRY - - -/datum/crafting_recipe/food/raisincookie - name = "Raisin cookie" - reqs = list( - /obj/item/reagent_containers/food/snacks/no_raisin = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/oat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/raisincookie - subcategory = CAT_PASTRY - /datum/crafting_recipe/food/cherrycupcake name = "Cherry cupcake" reqs = list( @@ -532,6 +416,55 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/strawberrycupcake subcategory = CAT_PASTRY +/datum/crafting_recipe/food/raisincookie + name = "Raisin cookie" + reqs = list( + /obj/item/reagent_containers/food/snacks/no_raisin = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/oat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raisincookie + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/oatmealcookie + name = "Oatmeal cookie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/oat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/oatmealcookie + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/sugarcookie + time = 15 + name = "Sugar cookie" + reqs = list( + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/sugarcookie + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/chococornet + name = "Choco cornet" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chococornet + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/cracker + time = 15 + name = "Cracker" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + ) + result = /obj/item/reagent_containers/food/snacks/cracker + subcategory = CAT_PASTRY + /datum/crafting_recipe/food/honeybun name = "Honey bun" reqs = list( @@ -539,4 +472,24 @@ datum/crafting_recipe/food/donut/meat /datum/reagent/consumable/honey = 5 ) result = /obj/item/reagent_containers/food/snacks/honeybun - subcategory = CAT_PASTRY \ No newline at end of file + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/poppypretzel + time = 15 + name = "Poppy pretzel" + reqs = list( + /obj/item/seeds/poppy = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/poppypretzel + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/plumphelmetbiscuit + time = 15 + name = "Plumphelmet biscuit" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1 + ) + result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit + subcategory = CAT_PASTRY diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm index b5bed4d5fc..eabad73138 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm @@ -1,7 +1,16 @@ // see code/module/crafting/table.dm -////////////////////////////////////////////////PIES//////////////////////////////////////////////// +//////////////////////////////////FRUITS///////////////////////////////////////// + +/datum/crafting_recipe/food/applepie + name = "Apple pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/apple = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/applepie + subcategory = CAT_PIE /datum/crafting_recipe/food/bananacreampie name = "Banana cream pie" @@ -13,33 +22,13 @@ result = /obj/item/reagent_containers/food/snacks/pie/cream subcategory = CAT_PIE -/datum/crafting_recipe/food/meatpie - name = "Meat pie" - reqs = list( - /datum/reagent/consumable/blackpepper = 1, - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/meatpie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/tofupie - name = "Tofu pie" +/datum/crafting_recipe/food/berryclafoutis + name = "Berry clafoutis" reqs = list( /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/tofu = 1 + /obj/item/reagent_containers/food/snacks/grown/berries = 1 ) - result = /obj/item/reagent_containers/food/snacks/pie/tofupie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/xenopie - name = "Xeno pie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/xemeatpie + result = /obj/item/reagent_containers/food/snacks/pie/berryclafoutis subcategory = CAT_PIE /datum/crafting_recipe/food/cherrypie @@ -51,13 +40,53 @@ result = /obj/item/reagent_containers/food/snacks/pie/cherrypie subcategory = CAT_PIE -/datum/crafting_recipe/food/berryclafoutis - name = "Berry clafoutis" +/datum/crafting_recipe/food/frostypie + name = "Frosty pie" reqs = list( /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/berries = 1 + /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1 ) - result = /obj/item/reagent_containers/food/snacks/pie/berryclafoutis + result = /obj/item/reagent_containers/food/snacks/pie/frostypie + subcategory = CAT_PIE + +/datum/crafting_recipe/food/grapetart + name = "Grape tart" + reqs = list( + /datum/reagent/consumable/milk = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/grapes = 3 + ) + result = /obj/item/reagent_containers/food/snacks/pie/grapetart + subcategory = CAT_PIE + +/datum/crafting_recipe/food/peachpie + name = "Peach Pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/peach = 3 + ) + result = /obj/item/reagent_containers/food/snacks/pie/peachpie + subcategory = CAT_PIE + +/datum/crafting_recipe/food/strawberrypie + name = "Strawberry pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/strawberrypie + subcategory = CAT_PIE + +//////////OTHER PIES///////// + +/datum/crafting_recipe/food/amanitapie + name = "Amanita pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/amanita_pie subcategory = CAT_PIE /datum/crafting_recipe/food/bearypie @@ -70,64 +99,14 @@ result = /obj/item/reagent_containers/food/snacks/pie/bearypie subcategory = CAT_PIE -/datum/crafting_recipe/food/amanitapie - name = "Amanita pie" +/datum/crafting_recipe/food/baklava + name = "Baklava pie" reqs = list( - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 1 + /obj/item/reagent_containers/food/snacks/butter = 1, + /obj/item/reagent_containers/food/snacks/tortilla = 4, //Layers + /obj/item/seeds/wheat/oat = 3 ) - result = /obj/item/reagent_containers/food/snacks/pie/amanita_pie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/plumppie - name = "Plump pie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/plump_pie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/applepie - name = "Apple pie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/apple = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/applepie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/pumpkinpie - name = "Pumpkin pie" - reqs = list( - /datum/reagent/consumable/milk = 5, - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/pumpkin = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/pumpkinpie - subcategory = CAT_PIE - -/datum/crafting_recipe/food/goldenappletart - name = "Golden apple tart" - reqs = list( - /datum/reagent/consumable/milk = 5, - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/apple/gold = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pie/appletart - subcategory = CAT_PIE - -/datum/crafting_recipe/food/grapetart - name = "Grape tart" - reqs = list( - /datum/reagent/consumable/milk = 5, - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/grapes = 3 - ) - result = /obj/item/reagent_containers/food/snacks/pie/grapetart + result = /obj/item/reagent_containers/food/snacks/pie/baklava subcategory = CAT_PIE /datum/crafting_recipe/food/blumpkinpie @@ -151,32 +130,66 @@ result = /obj/item/reagent_containers/food/snacks/pie/dulcedebatata subcategory = CAT_PIE -/datum/crafting_recipe/food/frostypie - name = "Frosty pie" +/datum/crafting_recipe/food/meatpie + name = "Meat pie" reqs = list( + /datum/reagent/consumable/blackpepper = 1, + /datum/reagent/consumable/sodiumchloride = 1, /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1 + /obj/item/reagent_containers/food/snacks/meat/steak/plain = 1 ) - result = /obj/item/reagent_containers/food/snacks/pie/frostypie + result = /obj/item/reagent_containers/food/snacks/pie/meatpie subcategory = CAT_PIE -/datum/crafting_recipe/food/strawberrypie - name = "Strawberry pie" +/datum/crafting_recipe/food/plumppie + name = "Plump pie" reqs = list( /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 + /obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet = 1 ) - result = /obj/item/reagent_containers/food/snacks/pie/strawberrypie + result = /obj/item/reagent_containers/food/snacks/pie/plump_pie subcategory = CAT_PIE -/datum/crafting_recipe/food/baklava - name = "Baklava pie" +/datum/crafting_recipe/food/pumpkinpie + name = "Pumpkin pie" reqs = list( - /obj/item/reagent_containers/food/snacks/butter = 1, - /obj/item/reagent_containers/food/snacks/tortilla = 4, //Layers - /obj/item/seeds/wheat/oat = 3 + /datum/reagent/consumable/milk = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/pumpkin = 1 ) - result = /obj/item/reagent_containers/food/snacks/pie/baklava + result = /obj/item/reagent_containers/food/snacks/pie/pumpkinpie + subcategory = CAT_PIE + +/datum/crafting_recipe/food/tofupie + name = "Tofu pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/tofu = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/tofupie + subcategory = CAT_PIE + +/datum/crafting_recipe/food/xenopie + name = "Xeno pie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/xemeatpie + subcategory = CAT_PIE + +//////////////TARTS////////////// + +/datum/crafting_recipe/food/goldenappletart + name = "Golden apple tart" + reqs = list( + /datum/reagent/consumable/milk = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/pie/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/apple/gold = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pie/appletart subcategory = CAT_PIE /datum/crafting_recipe/food/mimetart @@ -215,12 +228,3 @@ ) result = /obj/item/reagent_containers/food/snacks/pie/cocolavatart subcategory = CAT_PIE - -/datum/crafting_recipe/food/peachpie - name = "Peach Pie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pie/plain = 1, - /obj/item/reagent_containers/food/snacks/grown/peach = 3 - ) - result = /obj/item/reagent_containers/food/snacks/pie/peachpie - subcategory = CAT_PIE \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm index 64447dd180..21112a4a4f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm @@ -3,6 +3,40 @@ ////////////////////////////////////////////////PIZZA!!!//////////////////////////////////////////////// +/datum/crafting_recipe/food/dankpizza + name = "Dank pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/dank + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/donkpocketpizza + name = "Donkpocket pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/donkpocket/warm = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/donkpocket + subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/pineapplepizza + name = "Hawaiian pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /obj/item/reagent_containers/food/snacks/pineappleslice = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/pineapple + subcategory = CAT_PIZZA + /datum/crafting_recipe/food/margheritapizza name = "Margherita pizza" reqs = list( @@ -24,18 +58,6 @@ result = /obj/item/reagent_containers/food/snacks/pizza/meat subcategory = CAT_PIZZA -/datum/crafting_recipe/food/arnold - name = "Arnold pizza" - reqs = list( - /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 3, - /obj/item/ammo_casing/c9mm = 8, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pizza/arnold - subcategory = CAT_PIZZA - /datum/crafting_recipe/food/mushroompizza name = "Mushroom pizza" reqs = list( @@ -45,6 +67,17 @@ result = /obj/item/reagent_containers/food/snacks/pizza/mushroom subcategory = CAT_PIZZA +/datum/crafting_recipe/food/sassysagepizza + name = "Sassysage pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/faggot = 3, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/sassysage + subcategory = CAT_PIZZA + /datum/crafting_recipe/food/vegetablepizza name = "Vegetable pizza" reqs = list( @@ -57,50 +90,7 @@ result = /obj/item/reagent_containers/food/snacks/pizza/vegetable subcategory = CAT_PIZZA -/datum/crafting_recipe/food/donkpocketpizza - name = "Donkpocket pizza" - reqs = list( - /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/donkpocket/warm = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pizza/donkpocket - subcategory = CAT_PIZZA - -/datum/crafting_recipe/food/dankpizza - name = "Dank pizza" - reqs = list( - /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pizza/dank - subcategory = CAT_PIZZA - -/datum/crafting_recipe/food/sassysagepizza - name = "Sassysage pizza" - reqs = list( - /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/faggot = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pizza/sassysage - subcategory = CAT_PIZZA - -/datum/crafting_recipe/food/pineapplepizza - name = "Hawaiian pizza" - reqs = list( - /obj/item/reagent_containers/food/snacks/pizzabread = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, - /obj/item/reagent_containers/food/snacks/pineappleslice = 3, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pizza/pineapple - subcategory = CAT_PIZZA +//////Special Pizzas///// /datum/crafting_recipe/food/pineapplepizza/anomaly name = "Anomaly Hawaiian pizza" @@ -120,3 +110,15 @@ tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER) result = /obj/item/pizzabox/infinite subcategory = CAT_PIZZA + +/datum/crafting_recipe/food/arnold + name = "Arnold pizza" + reqs = list( + /obj/item/reagent_containers/food/snacks/pizzabread = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 3, + /obj/item/ammo_casing/c9mm = 8, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pizza/arnold + subcategory = CAT_PIZZA diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index 39eeb7d936..0a44c4590e 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -3,16 +3,6 @@ ////////////////////////////////////////////////SALADS//////////////////////////////////////////////// -/datum/crafting_recipe/food/herbsalad - name = "Herb salad" - reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, - /obj/item/reagent_containers/food/snacks/grown/apple = 1 - ) - result = /obj/item/reagent_containers/food/snacks/salad/herbsalad - subcategory = CAT_SALAD - /datum/crafting_recipe/food/aesirsalad name = "Aesir salad" reqs = list( @@ -23,38 +13,16 @@ result = /obj/item/reagent_containers/food/snacks/salad/aesirsalad subcategory = CAT_SALAD -/datum/crafting_recipe/food/validsalad - name = "Valid salad" +/datum/crafting_recipe/food/citrusdelight + name = "Citrus delight" reqs = list( /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, - /obj/item/reagent_containers/food/snacks/grown/potato = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 - ) - result = /obj/item/reagent_containers/food/snacks/salad/validsalad - subcategory = CAT_SALAD + /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1 -/datum/crafting_recipe/food/monkeysdelight - name = "Monkeys delight" - reqs = list( - /datum/reagent/consumable/flour = 5, - /datum/reagent/consumable/sodiumchloride = 1, - /datum/reagent/consumable/blackpepper = 1, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/monkeycube = 1, - /obj/item/reagent_containers/food/snacks/grown/banana = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/monkeysdelight - subcategory = CAT_SALAD - -/datum/crafting_recipe/food/oatmeal - name = "Oatmeal" - reqs = list( - /datum/reagent/consumable/milk = 10, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/oat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/salad/oatmeal + result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight subcategory = CAT_SALAD /datum/crafting_recipe/food/fruitsalad @@ -70,6 +38,16 @@ result = /obj/item/reagent_containers/food/snacks/salad/fruit subcategory = CAT_SALAD +/datum/crafting_recipe/food/herbsalad + name = "Herb salad" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, + /obj/item/reagent_containers/food/snacks/grown/apple = 1 + ) + result = /obj/item/reagent_containers/food/snacks/salad/herbsalad + subcategory = CAT_SALAD + /datum/crafting_recipe/food/junglesalad name = "Jungle salad" reqs = list( @@ -83,14 +61,26 @@ result = /obj/item/reagent_containers/food/snacks/salad/jungle subcategory = CAT_SALAD -/datum/crafting_recipe/food/citrusdelight - name = "Citrus delight" +/datum/crafting_recipe/food/monkeysdelight + name = "Monkeys delight" + reqs = list( + /datum/reagent/consumable/flour = 5, + /datum/reagent/consumable/sodiumchloride = 1, + /datum/reagent/consumable/blackpepper = 1, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/monkeycube = 1, + /obj/item/reagent_containers/food/snacks/grown/banana = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/monkeysdelight + subcategory = CAT_SALAD + +/datum/crafting_recipe/food/validsalad + name = "Valid salad" reqs = list( /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/lime = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1 - + /obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3, + /obj/item/reagent_containers/food/snacks/grown/potato = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1 ) - result = /obj/item/reagent_containers/food/snacks/salad/citrusdelight + result = /obj/item/reagent_containers/food/snacks/salad/validsalad subcategory = CAT_SALAD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm index 127b2cc238..d2ea1da50a 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -84,7 +84,6 @@ result = /obj/item/reagent_containers/food/snacks/peanutbutter_sandwich subcategory = CAT_SANDWICH - /datum/crafting_recipe/food/notasandwich name = "Not a sandwich" reqs = list( @@ -113,4 +112,4 @@ /obj/item/reagent_containers/food/snacks/sausage = 1 ) result = /obj/item/reagent_containers/food/snacks/hotdog - subcategory = CAT_SANDWICH + subcategory = CAT_SANDWICH //I don't agree with this. diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm index 76a5a64096..0c966faf33 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm @@ -3,71 +3,46 @@ ////////////////////////////////////////////////SOUP//////////////////////////////////////////////// -/datum/crafting_recipe/food/meatballsoup - name = "Meatball soup" +/datum/crafting_recipe/food/amanitajelly + name = "Amanita jelly" + reqs = list( + /datum/reagent/consumable/ethanol/vodka = 5, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 3 + ) + result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/beetsoup + name = "Beet soup" reqs = list( /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, - /obj/item/reagent_containers/food/snacks/grown/carrot = 1, - /obj/item/reagent_containers/food/snacks/grown/potato = 1 + /obj/item/reagent_containers/food/snacks/grown/whitebeet = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, ) - result = /obj/item/reagent_containers/food/snacks/soup/meatball + result = /obj/item/reagent_containers/food/snacks/soup/beet subcategory = CAT_SOUP -/datum/crafting_recipe/food/vegetablesoup - name = "Vegetable soup" +/datum/crafting_recipe/food/bloodsoup + name = "Blood soup" + reqs = list( + /datum/reagent/blood = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato/blood = 2 + ) + result = /obj/item/reagent_containers/food/snacks/soup/blood + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/clownstears + name = "Clowns tears" reqs = list( /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/carrot = 1, - /obj/item/reagent_containers/food/snacks/grown/corn = 1, - /obj/item/reagent_containers/food/snacks/grown/eggplant = 1, - /obj/item/reagent_containers/food/snacks/grown/potato = 1 + /obj/item/reagent_containers/food/snacks/grown/banana = 1, + /obj/item/stack/ore/bananium = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/vegetable - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/nettlesoup - name = "Nettle soup" - reqs = list( - /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/nettle = 1, - /obj/item/reagent_containers/food/snacks/grown/potato = 1, - /obj/item/reagent_containers/food/snacks/boiledegg = 1 - ) - result = /obj/item/reagent_containers/food/snacks/soup/nettle - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/wingfangchu - name = "Wingfangchu" - reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 2 - ) - result = /obj/item/reagent_containers/food/snacks/soup/wingfangchu - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/wishsoup - name = "Wish soup" - reqs = list( - /datum/reagent/water = 20, - /obj/item/reagent_containers/glass/bowl = 1 - ) - result= /obj/item/reagent_containers/food/snacks/soup/wish - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/hotchili - name = "Hot chili" - reqs = list( - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, - /obj/item/reagent_containers/food/snacks/grown/chili = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/soup/hotchili + result = /obj/item/reagent_containers/food/snacks/soup/clownstears subcategory = CAT_SOUP /datum/crafting_recipe/food/coldchili @@ -81,16 +56,6 @@ result = /obj/item/reagent_containers/food/snacks/soup/coldchili subcategory = CAT_SOUP -/datum/crafting_recipe/food/tomatosoup - name = "Tomato soup" - reqs = list( - /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 2 - ) - result = /obj/item/reagent_containers/food/snacks/soup/tomato - subcategory = CAT_SOUP - /datum/crafting_recipe/food/eyeballsoup name = "Eyeball soup" reqs = list( @@ -102,6 +67,28 @@ result = /obj/item/reagent_containers/food/snacks/soup/tomato/eyeball subcategory = CAT_SOUP +/datum/crafting_recipe/food/hotchili + name = "Hot chili" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/hotchili + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/meatballsoup + name = "Meatball soup" + reqs = list( + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/meatball + subcategory = CAT_SOUP /datum/crafting_recipe/food/milosoup name = "Milo soup" @@ -114,35 +101,15 @@ result = /obj/item/reagent_containers/food/snacks/soup/milo subcategory = CAT_SOUP -/datum/crafting_recipe/food/bloodsoup - name = "Blood soup" +/datum/crafting_recipe/food/mushroomsoup + name = "Mushroom soup" reqs = list( - /datum/reagent/blood = 10, + /datum/reagent/consumable/milk = 5, + /datum/reagent/water = 5, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato/blood = 2 + /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/blood - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/slimesoup - name = "Slime soup" - reqs = list( - /datum/reagent/water = 10, - /datum/reagent/toxin/slimejelly = 5, - /obj/item/reagent_containers/glass/bowl = 1 - ) - result = /obj/item/reagent_containers/food/snacks/soup/slime - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/clownstears - name = "Clowns tears" - reqs = list( - /datum/reagent/water = 10, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/banana = 1, - /obj/item/stack/ore/bananium = 1 - ) - result = /obj/item/reagent_containers/food/snacks/soup/clownstears + result = /obj/item/reagent_containers/food/snacks/soup/mushroom subcategory = CAT_SOUP /datum/crafting_recipe/food/mysterysoup @@ -158,26 +125,37 @@ result = /obj/item/reagent_containers/food/snacks/soup/mystery subcategory = CAT_SOUP -/datum/crafting_recipe/food/mushroomsoup - name = "Mushroom soup" - reqs = list( - /datum/reagent/consumable/milk = 5, - /datum/reagent/water = 5, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 - ) - result = /obj/item/reagent_containers/food/snacks/soup/mushroom - subcategory = CAT_SOUP - -/datum/crafting_recipe/food/beetsoup - name = "Beet soup" +/datum/crafting_recipe/food/nettlesoup + name = "Nettle soup" reqs = list( /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/whitebeet = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1, + /obj/item/reagent_containers/food/snacks/grown/nettle = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 1, + /obj/item/reagent_containers/food/snacks/boiledegg = 1 ) - result = /obj/item/reagent_containers/food/snacks/soup/beet + result = /obj/item/reagent_containers/food/snacks/soup/nettle + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/redbeetsoup + name = "Red beet soup" + reqs = list( + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/redbeet = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/beet/red + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/slimesoup + name = "Slime soup" + reqs = list( + /datum/reagent/water = 10, + /datum/reagent/toxin/slimejelly = 5, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/slime subcategory = CAT_SOUP /datum/crafting_recipe/food/stew @@ -205,16 +183,6 @@ result = /obj/item/reagent_containers/food/snacks/soup/spacylibertyduff subcategory = CAT_SOUP -/datum/crafting_recipe/food/amanitajelly - name = "Amanita jelly" - reqs = list( - /datum/reagent/consumable/ethanol/vodka = 5, - /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/mushroom/amanita = 3 - ) - result = /obj/item/reagent_containers/food/snacks/soup/amanitajelly - subcategory = CAT_SOUP - /datum/crafting_recipe/food/sweetpotatosoup name = "Sweet potato soup" reqs = list( @@ -226,13 +194,44 @@ result = /obj/item/reagent_containers/food/snacks/soup/sweetpotato subcategory = CAT_SOUP -/datum/crafting_recipe/food/redbeetsoup - name = "Red beet soup" +/datum/crafting_recipe/food/tomatosoup + name = "Tomato soup" reqs = list( /datum/reagent/water = 10, /obj/item/reagent_containers/glass/bowl = 1, - /obj/item/reagent_containers/food/snacks/grown/redbeet = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 + /obj/item/reagent_containers/food/snacks/grown/tomato = 2 ) - result = /obj/item/reagent_containers/food/snacks/soup/beet/red + result = /obj/item/reagent_containers/food/snacks/soup/tomato subcategory = CAT_SOUP + +/datum/crafting_recipe/food/vegetablesoup + name = "Vegetable soup" + reqs = list( + /datum/reagent/water = 10, + /obj/item/reagent_containers/glass/bowl = 1, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/grown/corn = 1, + /obj/item/reagent_containers/food/snacks/grown/eggplant = 1, + /obj/item/reagent_containers/food/snacks/grown/potato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/soup/vegetable + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/wingfangchu + name = "Wingfangchu" + reqs = list( + /obj/item/reagent_containers/glass/bowl = 1, + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/meat/cutlet/xeno = 2 + ) + result = /obj/item/reagent_containers/food/snacks/soup/wingfangchu + subcategory = CAT_SOUP + +/datum/crafting_recipe/food/wishsoup + name = "Wish soup" + reqs = list( + /datum/reagent/water = 20, + /obj/item/reagent_containers/glass/bowl = 1 + ) + result= /obj/item/reagent_containers/food/snacks/soup/wish + subcategory = CAT_SOUP \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm index 355402111c..12020a6241 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm @@ -3,15 +3,6 @@ ////////////////////////////////////////////////SPAGHETTI//////////////////////////////////////////////// -/datum/crafting_recipe/food/tomatopasta - name = "Tomato pasta" - reqs = list( - /obj/item/reagent_containers/food/snacks/boiledspaghetti = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 2 - ) - result = /obj/item/reagent_containers/food/snacks/pastatomato - subcategory = CAT_SPAGHETTI - /datum/crafting_recipe/food/copypasta name = "Copypasta" reqs = list( @@ -38,6 +29,17 @@ result = /obj/item/reagent_containers/food/snacks/spesslaw subcategory = CAT_SPAGHETTI +/datum/crafting_recipe/food/tomatopasta + name = "Tomato pasta" + reqs = list( + /obj/item/reagent_containers/food/snacks/boiledspaghetti = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 2 + ) + result = /obj/item/reagent_containers/food/snacks/pastatomato + subcategory = CAT_SPAGHETTI + +////////////NOODLES/////////// + /datum/crafting_recipe/food/beefnoodle name = "Beef noodle" reqs = list( diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm index 9dbf1d684b..5a95ba9907 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm @@ -1,4 +1,5 @@ -//////////////////////////Sushi Components/////////////////////// +/////////////Recategorizing this as -Eastern- foods/////////////// +///////////////////////Sushi Components/////////////////////////// /datum/crafting_recipe/food/sushi_rice name = "Sushi Rice" @@ -93,33 +94,58 @@ result = /obj/item/reagent_containers/food/snacks/sushie_pro subcategory = CAT_FISH -///////////////Gaijin junk///////////////////////////////////// +//////////////////Not-Fish////////////////////// -/datum/crafting_recipe/food/fishfingers - name = "Fish fingers" +/datum/crafting_recipe/food/chawanmushi + name = "Chawanmushi" reqs = list( - /datum/reagent/consumable/flour = 5, + /datum/reagent/water = 5, + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/boiledegg = 2, + /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chawanmushi + subcategory = CAT_FISH + +/datum/crafting_recipe/food/khachapuri + name = "Khachapuri" + reqs = list( + /datum/reagent/consumable/eggyolk = 5, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/khachapuri + subcategory = CAT_FISH + +/datum/crafting_recipe/food/rawkhinkali + name = "Raw Khinkali" + reqs = list( + /obj/item/reagent_containers/food/snacks/doughslice = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1 + ) + result = /obj/item/reagent_containers/food/snacks/rawkhinkali + subcategory = CAT_FISH + +/datum/crafting_recipe/food/meatbun + name = "Meat bun" + reqs = list( + /datum/reagent/consumable/soysauce = 5, /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 + /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 ) - result = /obj/item/reagent_containers/food/snacks/fishfingers + result = /obj/item/reagent_containers/food/snacks/meatbun subcategory = CAT_FISH -/datum/crafting_recipe/food/cubancarp - name = "Cuban carp" +/datum/crafting_recipe/food/fortunecookie + time = 15 + name = "Fortune cookie" reqs = list( - /datum/reagent/consumable/flour = 5, - /obj/item/reagent_containers/food/snacks/grown/chili = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/paper = 1 ) - result = /obj/item/reagent_containers/food/snacks/cubancarp + parts = list( + /obj/item/paper = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fortunecookie subcategory = CAT_FISH - -/datum/crafting_recipe/food/fishandchips - name = "Fish and chips" - reqs = list( - /obj/item/reagent_containers/food/snacks/fries = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/fishandchips - subcategory = CAT_FISH \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm new file mode 100644 index 0000000000..a06bfb880b --- /dev/null +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm @@ -0,0 +1,117 @@ +// see code/module/crafting/table.dm + +// SWEETS + +/datum/crafting_recipe/food/candiedapple + name = "Candied apple" + reqs = list(/datum/reagent/water = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/grown/apple = 1 + ) + result = /obj/item/reagent_containers/food/snacks/candiedapple + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/chococoin + name = "Choco coin" + reqs = list( + /obj/item/coin = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/chococoin + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/chocoorange + name = "Choco orange" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/chocoorange + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/chocolatestrawberry + name = "Chocolate Strawberry" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/fudgedice + name = "Fudge dice" + reqs = list( + /obj/item/dice = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/fudgedice + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/honeybar + name = "Honey nut bar" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/oat = 1, + /datum/reagent/consumable/honey = 5 + ) + result = /obj/item/reagent_containers/food/snacks/honeybar + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/spiderlollipop + name = "Spider Lollipop" + reqs = list(/obj/item/stack/rods = 1, + /datum/reagent/consumable/sugar = 5, + /datum/reagent/water = 5, + /obj/item/reagent_containers/food/snacks/spiderling = 1 + ) + result = /obj/item/reagent_containers/food/snacks/spiderlollipop + subcategory = CAT_SWEETS + +//Easter Stuff + +/datum/crafting_recipe/food/chocolatebunny + name = "Chocolate bunny" + reqs = list( + /datum/reagent/consumable/sugar = 2, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chocolatebunny + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/hotcrossbun + name = "Hot-Cross Bun" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /datum/reagent/consumable/sugar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/hotcrossbun + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/briochecake + name = "Brioche cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /datum/reagent/consumable/sugar = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/brioche + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/scotchegg + name = "Scotch egg" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 1, + /datum/reagent/consumable/blackpepper = 1, + /obj/item/reagent_containers/food/snacks/boiledegg = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1 + ) + result = /obj/item/reagent_containers/food/snacks/scotchegg + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/mammi + name = "Mammi" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /datum/reagent/consumable/milk = 5 + ) + result = /obj/item/reagent_containers/food/snacks/soup/mammi + subcategory = CAT_SWEETS diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 1898fe4b01..5f2d92fc93 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -140,96 +140,8 @@ containsPrize = FALSE qdel(src) -//Easter Recipes + food -/obj/item/reagent_containers/food/snacks/hotcrossbun - bitesize = 2 - name = "hot-cross bun" - desc = "The Cross represents the Assistants that died for your sins." - icon_state = "hotcrossbun" - -/datum/crafting_recipe/food/hotcrossbun - name = "Hot-Cross Bun" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /datum/reagent/consumable/sugar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/hotcrossbun - category = CAT_MISCFOOD - - -/obj/item/reagent_containers/food/snacks/store/cake/brioche - name = "brioche cake" - desc = "A ring of sweet, glazed buns." - icon_state = "briochecake" - slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche - slices_num = 6 - bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2) - -/obj/item/reagent_containers/food/snacks/cakeslice/brioche - name = "brioche cake slice" - desc = "Delicious sweet-bread. Who needs anything else?" - icon_state = "briochecake_slice" - filling_color = "#FFD700" - -/datum/crafting_recipe/food/briochecake - name = "Brioche cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /datum/reagent/consumable/sugar = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/brioche - category = CAT_MISCFOOD - -/obj/item/reagent_containers/food/snacks/scotchegg - name = "scotch egg" - desc = "A boiled egg wrapped in a delicious, seasoned meatball." - icon_state = "scotchegg" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - bitesize = 3 - filling_color = "#FFFFF0" - list_reagents = list(/datum/reagent/consumable/nutriment = 6) - -/datum/crafting_recipe/food/scotchegg - name = "Scotch egg" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /datum/reagent/consumable/blackpepper = 1, - /obj/item/reagent_containers/food/snacks/boiledegg = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 - ) - result = /obj/item/reagent_containers/food/snacks/scotchegg - category = CAT_MISCFOOD - -/obj/item/reagent_containers/food/snacks/soup/mammi - name = "Mammi" - desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement." - icon_state = "mammi" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1) - -/datum/crafting_recipe/food/mammi - name = "Mammi" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /datum/reagent/consumable/milk = 5 - ) - result = /obj/item/reagent_containers/food/snacks/soup/mammi - category = CAT_MISCFOOD - -/obj/item/reagent_containers/food/snacks/chocolatebunny - name = "chocolate bunny" - desc = "Contains less than 10% real rabbit!" - icon_state = "chocolatebunny" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2) - filling_color = "#A0522D" - -/datum/crafting_recipe/food/chocolatebunny - name = "Chocolate bunny" - reqs = list( - /datum/reagent/consumable/sugar = 2, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chocolatebunny - category = CAT_MISCFOOD +/* +Easter Recipes + Food moved to appropriate files. +\code\modules\food_and_drinks\ +\code\modules\food_and_drinks\recipes\ +*/ \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 28f469ac25..de3bd872f3 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1837,6 +1837,7 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_egg.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_frozen.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_mexican.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_misc.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pastry.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pie.dm" @@ -1846,6 +1847,7 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sushi.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipies_sweets.dm" #include "code\modules\games\cas.dm" #include "code\modules\goonchat\browserOutput.dm" #include "code\modules\holiday\easter.dm" From dc6d1fb359244394672faba9e0dcdd58678ce2a4 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Mon, 17 Feb 2020 05:56:02 -0500 Subject: [PATCH 05/57] Sorted Frozen Foods --- .../recipes/tablecraft/recipes_frozen.dm | 288 +++++++++--------- 1 file changed, 145 insertions(+), 143 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index 1b1801d982..6d443c99f0 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -3,6 +3,64 @@ //Misc. Frozen.// ///////////////// +/datum/crafting_recipe/food/banana_split + name = "Banana Split" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/icecream = 3, + /obj/item/reagent_containers/food/snacks/grown/banana = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/banana_split + subcategory = CAT_ICE + + /datum/crafting_recipe/food/bluecharrie_float + name = "Blue Cherry Shake" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/icecream = 1, + /obj/item/reagent_containers/food/snacks/grown/bluecherries = 3, + /obj/item/reagent_containers/food/drinks/drinkingglass = 1 + ) + result = /obj/item/reagent_containers/food/snacks/bluecharrie_float + subcategory = CAT_ICE + +/datum/crafting_recipe/food/charrie_float + name = "Cherry Shake" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/icecream = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 3, + /obj/item/reagent_containers/food/drinks/drinkingglass = 1 + ) + result = /obj/item/reagent_containers/food/snacks/charrie_float + subcategory = CAT_ICE + +/datum/crafting_recipe/food/root_float + name = "Cola Float" + always_availible = FALSE + reqs = list( + /obj/item/reagent_containers/food/snacks/icecream = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 1, + /datum/reagent/consumable/space_cola = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cola_float + subcategory = CAT_ICE + +/datum/crafting_recipe/food/honkdae + name ="Honkdae" + reqs = list( + /datum/reagent/consumable/cream = 5, + /obj/item/clothing/mask/gas/clown_hat = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 1, + /obj/item/reagent_containers/food/snacks/grown/banana = 2, + /obj/item/reagent_containers/food/snacks/icecream = 1 + ) + result = /obj/item/reagent_containers/food/snacks/honkdae + subcategory = CAT_ICE + /datum/crafting_recipe/food/icecreamsandwich name = "Icecream sandwich" reqs = list( @@ -34,105 +92,8 @@ result = /obj/item/reagent_containers/food/snacks/sundae subcategory = CAT_ICE -/datum/crafting_recipe/food/honkdae - name ="Honkdae" - reqs = list( - /datum/reagent/consumable/cream = 5, - /obj/item/clothing/mask/gas/clown_hat = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 1, - /obj/item/reagent_containers/food/snacks/grown/banana = 2, - /obj/item/reagent_containers/food/snacks/icecream = 1 - ) - result = /obj/item/reagent_containers/food/snacks/honkdae - subcategory = CAT_ICE - -/datum/crafting_recipe/food/banana_split - name = "Banana Split" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/icecream = 3, - /obj/item/reagent_containers/food/snacks/grown/banana = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/banana_split - subcategory = CAT_ICE - -/datum/crafting_recipe/food/root_float - name = "Cola Float" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/icecream = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 1, - /datum/reagent/consumable/space_cola = 10, - /obj/item/reagent_containers/food/drinks/drinkingglass = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cola_float - subcategory = CAT_ICE - -/datum/crafting_recipe/food/charrie_float - name = "Cherry Shake" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/icecream = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 3, - /obj/item/reagent_containers/food/drinks/drinkingglass = 1 - ) - result = /obj/item/reagent_containers/food/snacks/charrie_float - subcategory = CAT_ICE - -/datum/crafting_recipe/food/bluecharrie_float - name = "Blue Cherry Shake" - always_availible = FALSE - reqs = list( - /obj/item/reagent_containers/food/snacks/icecream = 1, - /obj/item/reagent_containers/food/snacks/grown/bluecherries = 3, - /obj/item/reagent_containers/food/drinks/drinkingglass = 1 - ) - result = /obj/item/reagent_containers/food/snacks/bluecharrie_float - subcategory = CAT_ICE - //////////////////////////SNOW CONES/////////////////////// -/datum/crafting_recipe/food/flavorless_sc - name = "Flavorless snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15 - ) - result = /obj/item/reagent_containers/food/snacks/snowcones - subcategory = CAT_ICE - -/datum/crafting_recipe/food/pineapple_sc - name = "Pineapple snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /obj/item/reagent_containers/food/snacks/pineappleslice = 2 - ) - result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple - subcategory = CAT_ICE - -/datum/crafting_recipe/food/lime_sc - name = "Lime snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/limejuice = 5 - ) - result = /obj/item/reagent_containers/food/snacks/snowcones/lime - subcategory = CAT_ICE - -/datum/crafting_recipe/food/lemon_sc - name = "Lemon snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/lemonjuice = 5 - ) - result = /obj/item/reagent_containers/food/snacks/snowcones/lemon - subcategory = CAT_ICE - /datum/crafting_recipe/food/apple_sc name = "Apple snowcone" reqs = list( @@ -143,24 +104,14 @@ result = /obj/item/reagent_containers/food/snacks/snowcones/apple subcategory = CAT_ICE -/datum/crafting_recipe/food/grape_sc - name = "Grape snowcone" +/datum/crafting_recipe/food/berry_sc + name = "Berry snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/grapejuice = 5 + /datum/reagent/consumable/berryjuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/grape - subcategory = CAT_ICE - -/datum/crafting_recipe/food/orange_sc - name = "Orange snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/orangejuice = 5 - ) - result = /obj/item/reagent_containers/food/snacks/snowcones/orange + result = /obj/item/reagent_containers/food/snacks/snowcones/berry subcategory = CAT_ICE /datum/crafting_recipe/food/blue_sc @@ -183,14 +134,13 @@ result = /obj/item/reagent_containers/food/snacks/snowcones/red subcategory = CAT_ICE -/datum/crafting_recipe/food/berry_sc - name = "Berry snowcone" +/datum/crafting_recipe/food/flavorless_sc + name = "Flavorless snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/berryjuice = 5 + /datum/reagent/consumable/ice = 15 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/berry + result = /obj/item/reagent_containers/food/snacks/snowcones subcategory = CAT_ICE /datum/crafting_recipe/food/fruitsalad_sc @@ -206,24 +156,84 @@ result = /obj/item/reagent_containers/food/snacks/snowcones/fruitsalad subcategory = CAT_ICE -/datum/crafting_recipe/food/mime_sc - name = "Mime snowcone" +/datum/crafting_recipe/food/grape_sc + name = "Grape snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/nothing = 5 + /datum/reagent/consumable/grapejuice = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/mime + result = /obj/item/reagent_containers/food/snacks/snowcones/grape subcategory = CAT_ICE -/datum/crafting_recipe/food/clown_sc - name = "Clown snowcone" +/datum/crafting_recipe/food/honey_sc + name = "Honey snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/laughter = 5 + /datum/reagent/consumable/honey = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/clown + result = /obj/item/reagent_containers/food/snacks/snowcones/honey + subcategory = CAT_ICE + +/datum/crafting_recipe/food/lemon_sc + name = "Lemon snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/lemonjuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/lemon + subcategory = CAT_ICE + +/datum/crafting_recipe/food/lime_sc + name = "Lime snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/limejuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/lime + subcategory = CAT_ICE + +/datum/crafting_recipe/food/orange_sc + name = "Orange snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/orangejuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/orange + subcategory = CAT_ICE + +/datum/crafting_recipe/food/pineapple_sc + name = "Pineapple snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /obj/item/reagent_containers/food/snacks/pineappleslice = 2 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple + subcategory = CAT_ICE + +/datum/crafting_recipe/food/pwrgame_sc + name = "Pwrgame snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/pwr_game = 15 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame + subcategory = CAT_ICE + +/datum/crafting_recipe/food/rainbow_sc + name = "Rainbow snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /datum/reagent/consumable/ice = 15, + /datum/reagent/colorful_reagent = 1 //Harder to make + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow subcategory = CAT_ICE /datum/crafting_recipe/food/soda_sc @@ -246,32 +256,24 @@ result = /obj/item/reagent_containers/food/snacks/snowcones/spacemountainwind subcategory = CAT_ICE -/datum/crafting_recipe/food/pwrgame_sc - name = "Pwrgame snowcone" +/////I don't like seperating the clown and mime./// + +/datum/crafting_recipe/food/mime_sc + name = "Mime snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/pwr_game = 15 + /datum/reagent/consumable/nothing = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/pwrgame + result = /obj/item/reagent_containers/food/snacks/snowcones/mime subcategory = CAT_ICE -/datum/crafting_recipe/food/honey_sc - name = "Honey snowcone" +/datum/crafting_recipe/food/clown_sc + name = "Clown snowcone" reqs = list( /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/consumable/ice = 15, - /datum/reagent/consumable/honey = 5 + /datum/reagent/consumable/laughter = 5 ) - result = /obj/item/reagent_containers/food/snacks/snowcones/honey - subcategory = CAT_ICE - -/datum/crafting_recipe/food/rainbow_sc - name = "Rainbow snowcone" - reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1, - /datum/reagent/consumable/ice = 15, - /datum/reagent/colorful_reagent = 1 //Harder to make - ) - result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow - subcategory = CAT_ICE + result = /obj/item/reagent_containers/food/snacks/snowcones/clown + subcategory = CAT_ICE \ No newline at end of file From 79705d17162b4dbc7969b5725427be61b854a461 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Mon, 17 Feb 2020 08:24:21 -0500 Subject: [PATCH 06/57] Moving Burgers Around --- .../recipes/tablecraft/recipes_burger.dm | 95 +++++++++---------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm index 0fae6542e9..cf96c01e7b 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_burger.dm @@ -3,25 +3,6 @@ ////////////////////////////////////////////////STANDARD BURGS//////////////////////////////////////////////// - -/datum/crafting_recipe/food/appendixburger - name = "Appendix burger" - reqs = list( - /obj/item/organ/appendix = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/appendix - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/brainburger - name = "Brain burger" - reqs = list( - /obj/item/organ/brain = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/brain - subcategory = CAT_BURGER - /datum/crafting_recipe/food/burger name = "Burger" reqs = list( @@ -101,8 +82,55 @@ result = /obj/item/reagent_containers/food/snacks/burger/human subcategory = CAT_BURGER +/datum/crafting_recipe/food/ribburger + name = "McRib" + reqs = list( + /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs + /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome. + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/rib + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/mcguffin + name = "McGuffin" + reqs = list( + /obj/item/reagent_containers/food/snacks/friedegg = 1, + /obj/item/reagent_containers/food/snacks/meat/bacon = 2, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/mcguffin + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/tofuburger + name = "Tofu burger" + reqs = list( + /obj/item/reagent_containers/food/snacks/tofu = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/tofu + subcategory = CAT_BURGER + ///////////////EXOTIC////////////////// +/datum/crafting_recipe/food/appendixburger + name = "Appendix burger" + reqs = list( + /obj/item/organ/appendix = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/appendix + subcategory = CAT_BURGER + +/datum/crafting_recipe/food/brainburger + name = "Brain burger" + reqs = list( + /obj/item/organ/brain = 1, + /obj/item/reagent_containers/food/snacks/bun = 1 + ) + result = /obj/item/reagent_containers/food/snacks/burger/brain + subcategory = CAT_BURGER + /datum/crafting_recipe/food/bearger name = "Bearger" reqs = list( @@ -160,35 +188,6 @@ result = /obj/item/reagent_containers/food/snacks/burger/jelly/cherry subcategory = CAT_BURGER -/datum/crafting_recipe/food/ribburger - name = "McRib" - reqs = list( - /obj/item/reagent_containers/food/snacks/bbqribs = 1, //The sauce is already included in the ribs - /obj/item/reagent_containers/food/snacks/onion_slice = 1, //feel free to remove if too burdensome. - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/rib - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/mcguffin - name = "McGuffin" - reqs = list( - /obj/item/reagent_containers/food/snacks/friedegg = 1, - /obj/item/reagent_containers/food/snacks/meat/bacon = 2, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/mcguffin - subcategory = CAT_BURGER - -/datum/crafting_recipe/food/tofuburger - name = "Tofu burger" - reqs = list( - /obj/item/reagent_containers/food/snacks/tofu = 1, - /obj/item/reagent_containers/food/snacks/bun = 1 - ) - result = /obj/item/reagent_containers/food/snacks/burger/tofu - subcategory = CAT_BURGER - /datum/crafting_recipe/food/baseballburger name = "Home run baseball burger" reqs = list( From 00d66c9b91c6703d7a17d243130c1f2f6bebf6ba Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Tue, 18 Feb 2020 22:19:58 -0500 Subject: [PATCH 07/57] Renamed CAT_FISH to CAT_EASTERN --- code/__DEFINES/construction.dm | 2 +- code/datums/components/crafting/craft.dm | 2 +- .../recipes/tablecraft/recipes_sushi.dm | 28 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index c4d87de495..a46e2ed7b7 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -92,7 +92,7 @@ #define CAT_BREAD "Breads" #define CAT_BURGER "Burgers" #define CAT_CAKE "Cakes" -#define CAT_FISH "Eastern" +#define CAT_EASTERN "Eastern" #define CAT_EGG "Egg-Based Food" #define CAT_MEAT "Meats" #define CAT_MEXICAN "Mexican" diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 674746479d..1caf7d9489 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -28,7 +28,7 @@ CAT_BURGER, CAT_CAKE, CAT_EGG, - CAT_FISH, + CAT_EASTERN, CAT_ICE, CAT_MEAT, CAT_MEXICAN, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm index 5a95ba9907..3a77181d8f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm @@ -8,7 +8,7 @@ /datum/reagent/consumable/rice = 10 ) result = /obj/item/reagent_containers/food/snacks/sushi_rice - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/sea_weed name = "Sea Weed Sheet" @@ -18,7 +18,7 @@ /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, ) result = /obj/item/reagent_containers/food/snacks/sea_weed - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/tuna_can name = "Can of Tuna" @@ -28,7 +28,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1, ) result = /obj/item/reagent_containers/food/snacks/tuna - subcategory = CAT_FISH + subcategory = CAT_EASTERN //////////////////////////Sushi///////////////////////////////// @@ -40,7 +40,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sashimi - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/riceball name = "Onigiri" @@ -50,7 +50,7 @@ /obj/item/reagent_containers/food/snacks/sushi_rice = 1 ) result = /obj/item/reagent_containers/food/snacks/riceball - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/sushie_egg name = "Tobiko" @@ -60,7 +60,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 2, ) result = /obj/item/reagent_containers/food/snacks/tobiko - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/sushie_basic name = "Funa Hosomaki" @@ -71,7 +71,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 3, ) result = /obj/item/reagent_containers/food/snacks/sushie_basic - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/sushie_adv name = "Funa Nigiri" @@ -81,7 +81,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_adv - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/sushie_pro name = "Well made Funa Nigiri" @@ -92,7 +92,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_pro - subcategory = CAT_FISH + subcategory = CAT_EASTERN //////////////////Not-Fish////////////////////// @@ -105,7 +105,7 @@ /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 ) result = /obj/item/reagent_containers/food/snacks/chawanmushi - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/khachapuri name = "Khachapuri" @@ -115,7 +115,7 @@ /obj/item/reagent_containers/food/snacks/store/bread/plain = 1 ) result = /obj/item/reagent_containers/food/snacks/khachapuri - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/rawkhinkali name = "Raw Khinkali" @@ -124,7 +124,7 @@ /obj/item/reagent_containers/food/snacks/faggot = 1 ) result = /obj/item/reagent_containers/food/snacks/rawkhinkali - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/meatbun name = "Meat bun" @@ -135,7 +135,7 @@ /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 ) result = /obj/item/reagent_containers/food/snacks/meatbun - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/fortunecookie time = 15 @@ -148,4 +148,4 @@ /obj/item/paper = 1 ) result = /obj/item/reagent_containers/food/snacks/fortunecookie - subcategory = CAT_FISH + subcategory = CAT_EASTERN From 0ad49f9004d9537b2b3a39e51f516665182bb504 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 19 Feb 2020 17:18:51 -0600 Subject: [PATCH 08/57] shit dude i hope this works lmao --- code/controllers/configuration/entries/general.dm | 6 ++++-- code/controllers/subsystem/autotransfer.dm | 14 +++++++++++--- code/controllers/subsystem/vote.dm | 3 +-- config/config.txt | 5 ++++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index b5e7137374..2d9264adf5 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -84,12 +84,14 @@ /datum/config_entry/number/vote_autotransfer_initial //length of time before the first autotransfer vote is called (deciseconds, default 2 hours) config_entry_value = 72000 - integer = FALSE min_val = 0 /datum/config_entry/number/vote_autotransfer_interval //length of time to wait before subsequent autotransfer votes (deciseconds, default 30 minutes) config_entry_value = 18000 - integer = FALSE + min_val = 0 + +/datum/config_entry/number/vote_autotransfer_maximum // maximum extensions until the round autoends + config_entry_value = 4 min_val = 0 /datum/config_entry/flag/default_no_vote // vote does not default to nochange/norestart diff --git a/code/controllers/subsystem/autotransfer.dm b/code/controllers/subsystem/autotransfer.dm index 05ef3127c1..00c3f85543 100644 --- a/code/controllers/subsystem/autotransfer.dm +++ b/code/controllers/subsystem/autotransfer.dm @@ -5,13 +5,21 @@ SUBSYSTEM_DEF(autotransfer) var/starttime var/targettime + var/maxvotes + var/curvotes /datum/controller/subsystem/autotransfer/Initialize(timeofday) starttime = world.time targettime = starttime + CONFIG_GET(number/vote_autotransfer_initial) + maxvotes = CONFIG_GET(number/vote_autotransfer_maximum) + curvotes = 0 return ..() /datum/controller/subsystem/autotransfer/fire() - if (world.time > targettime) - SSvote.initiate_vote("transfer",null) //TODO figure out how to not use null as the user - targettime = targettime + CONFIG_GET(number/vote_autotransfer_interval) + if(maxvotes > votes) + if(world.time > targettime) + SSvote.initiate_vote("transfer",null) //TODO figure out how to not use null as the user + targettime = targettime + CONFIG_GET(number/vote_autotransfer_interval) + votes += 1 + else + SSshuttle.autoEnd() diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 9ddd8d9123..9f974595fd 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -381,8 +381,7 @@ SUBSYSTEM_DEF(vote) to_chat(world, "The map vote has chosen [VM.map_name] for next round!") if("transfer") // austation begin -- Crew autotransfer vote if(. == "Initiate Crew Transfer") - //TODO find a cleaner way to do this - SSshuttle.requestEvac(null,"Crew transfer requested.") + SSshuttle.autoEnd() var/obj/machinery/computer/communications/C = locate() in GLOB.machines if(C) C.post_status("shuttle") // austation end diff --git a/config/config.txt b/config/config.txt index cc9ede5ef2..1d987070dd 100644 --- a/config/config.txt +++ b/config/config.txt @@ -187,9 +187,12 @@ VOTE_PERIOD 600 ## autovote initial delay (deciseconds) before first automatic transfer vote call (default 120 minutes) VOTE_AUTOTRANSFER_INITIAL 72000 -##autovote delay (deciseconds) before sequential automatic transfer votes are called (default 30 minutes) +## autovote delay (deciseconds) before sequential automatic transfer votes are called (default 30 minutes) VOTE_AUTOTRANSFER_INTERVAL 18000 +## autovote maximum votes until automatic transfer call (default 4) +VOTE_AUTOTRANSFER_MAXIMUM 4 + ## prevents dead players from voting or starting votes # NO_DEAD_VOTE From 362ebbcf8fa89e4bf946e1c4595e7d59d7dd12e0 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 19 Feb 2020 21:14:13 -0600 Subject: [PATCH 09/57] shit --- code/controllers/subsystem/autotransfer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/autotransfer.dm b/code/controllers/subsystem/autotransfer.dm index 00c3f85543..b80211c354 100644 --- a/code/controllers/subsystem/autotransfer.dm +++ b/code/controllers/subsystem/autotransfer.dm @@ -16,10 +16,10 @@ SUBSYSTEM_DEF(autotransfer) return ..() /datum/controller/subsystem/autotransfer/fire() - if(maxvotes > votes) + if(maxvotes > curvotes) if(world.time > targettime) SSvote.initiate_vote("transfer",null) //TODO figure out how to not use null as the user targettime = targettime + CONFIG_GET(number/vote_autotransfer_interval) - votes += 1 + curvotes += 1 else SSshuttle.autoEnd() From 4373f116e0147318fd1e0339130a28ceec89bfc7 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 19 Feb 2020 22:07:03 -0700 Subject: [PATCH 10/57] Update teleportation.dm --- code/game/objects/items/teleportation.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 347717dd63..e95668e1f3 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -141,8 +141,8 @@ return TRUE return ..() -/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 30) - var/datum/beam/B = user.Beam(target) +/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 20) + var/datum/beam/B = user.Beam(target, beam_icon_state = "rped_upgrade", maxdistance = 50) if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target))) qdel(target) to_chat(user, "You dispel [target] with \the [src]!") From fd410963a90c5eab6ca23da52a0d890cc3e1a51d Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 19 Feb 2020 22:23:54 -0700 Subject: [PATCH 11/57] Update teleportation.dm --- code/game/objects/items/teleportation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index e95668e1f3..bb860101ac 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -142,7 +142,7 @@ return ..() /obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 20) - var/datum/beam/B = user.Beam(target, beam_icon_state = "rped_upgrade", maxdistance = 50) + var/datum/beam/B = user.Beam(target, icon_state = "rped_upgrade", maxdistance = 50) if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target))) qdel(target) to_chat(user, "You dispel [target] with \the [src]!") From a8f863f90183670f317b3498036c0b57264bb401 Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Thu, 20 Feb 2020 22:17:47 -0600 Subject: [PATCH 12/57] changes - sprites --- code/__DEFINES/jobs.dm | 22 +++++---- code/datums/traits/negative.dm | 2 + code/game/machinery/computer/crew.dm | 3 +- code/game/objects/effects/landmarks.dm | 6 ++- code/modules/clothing/under/jobs/medsci.dm | 17 +++++++ .../modules/events/wizard/departmentrevolt.dm | 2 +- code/modules/jobs/access.dm | 2 +- code/modules/jobs/job_types/paramedic.dm | 45 +++++++++++++++++++ code/modules/jobs/job_types/psychologist.dm | 36 +++++++++++++++ code/modules/jobs/jobs.dm | 2 + config/jobs.txt | 3 +- strings/ion_laws.json | 4 +- tgstation.dme | 2 + 13 files changed, 131 insertions(+), 15 deletions(-) create mode 100644 code/modules/jobs/job_types/paramedic.dm create mode 100644 code/modules/jobs/job_types/psychologist.dm diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 9bc8127c3d..52642ffe48 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -23,6 +23,8 @@ #define DOCTOR (1<<4) #define GENETICIST (1<<5) #define VIROLOGIST (1<<6) +#define PSYCH (1<<7) +#define PARAMEDIC (1<<8) #define CIVILIAN (1<<2) @@ -78,12 +80,14 @@ #define JOB_DISPLAY_ORDER_CHEMIST 21 #define JOB_DISPLAY_ORDER_GENETICIST 22 #define JOB_DISPLAY_ORDER_VIROLOGIST 23 -#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 24 -#define JOB_DISPLAY_ORDER_SCIENTIST 25 -#define JOB_DISPLAY_ORDER_ROBOTICIST 26 -#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 27 -#define JOB_DISPLAY_ORDER_WARDEN 28 -#define JOB_DISPLAY_ORDER_DETECTIVE 29 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 30 -#define JOB_DISPLAY_ORDER_AI 31 -#define JOB_DISPLAY_ORDER_CYBORG 32 +#define JOB_DISPLAY_ORDER_PSYCH 24 +#define JOB_DISPLAY_ORDER_PARAMEDIC 25 +#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 26 +#define JOB_DISPLAY_ORDER_SCIENTIST 27 +#define JOB_DISPLAY_ORDER_ROBOTICIST 28 +#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 29 +#define JOB_DISPLAY_ORDER_WARDEN 30 +#define JOB_DISPLAY_ORDER_DETECTIVE 31 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 32 +#define JOB_DISPLAY_ORDER_AI 33 +#define JOB_DISPLAY_ORDER_CYBORG 34 diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index b19c6a71f7..7868bad458 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -52,6 +52,8 @@ heirloom_type = pick(/obj/item/cultivator, /obj/item/reagent_containers/glass/bucket, /obj/item/storage/bag/plants, /obj/item/toy/plush/beeplushie) if("Medical Doctor") heirloom_type = /obj/item/healthanalyzer/advanced + if("Paramedic") + heirloom_type = pick(/obj/item/clothing/neck/stethoscope, /obj/item/bodybag) if("Station Engineer") heirloom_type = /obj/item/wirecutters/brass if("Atmospheric Technician") diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index f6d0fcfc0d..01a1d043a2 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -40,6 +40,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) jobs["Geneticist"] = 22 jobs["Virologist"] = 23 jobs["Medical Doctor"] = 24 + jobs["Paramedic"] = 25 jobs["Research Director"] = 30 jobs["Scientist"] = 31 jobs["Roboticist"] = 32 @@ -207,4 +208,4 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) if ("select_person") AI.ai_camera_track(params["name"]) -#undef SENSORS_UPDATE_PERIOD \ No newline at end of file +#undef SENSORS_UPDATE_PERIOD diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 8f09827bd2..621f67554e 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -151,6 +151,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) name = "Medical Doctor" icon_state = "Medical Doctor" +/obj/effect/landmark/start/paramedic + name = "Paramedic" + icon_state = "Paramedic" + /obj/effect/landmark/start/scientist name = "Scientist" icon_state = "Scientist" @@ -485,4 +489,4 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) // Landmark for the mining station /obj/effect/landmark/stationroom/lavaland/station templates = list("Public Mining Base" = 3) - icon = 'icons/rooms/Lavaland/Mining.dmi' \ No newline at end of file + icon = 'icons/rooms/Lavaland/Mining.dmi' diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index c27882aac7..666501282a 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -158,6 +158,23 @@ can_adjust = FALSE fitted = FEMALE_UNIFORM_TOP +/obj/item/clothing/under/rank/medical/paramedic + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic." + name = "paramedic jumpsuit" + icon_state = "paramedic" + item_state = "w_suit" + permeability_coefficient = 0.5 + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 0, "acid" = 0) + +/obj/item/clothing/under/rank/medical/paramedic/skirt + name = "paramedic jumpskirt" + desc = "It's made of a special fiber that provides minor protection against biohazards. It has a dark blue cross on the chest denoting that the wearer is a trained paramedic." + icon_state = "paramedic_skirt" + item_state = "w_suit" + body_parts_covered = CHEST|GROIN|ARMS + can_adjust = FALSE + fitted = FEMALE_UNIFORM_TOP + /obj/item/clothing/under/rank/nursesuit desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." name = "nurse's suit" diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index 67e96455f0..ce6b4802fa 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -19,7 +19,7 @@ jobs_to_revolt = list("Assistant") nation_name = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Grigio", "Ass", "Assi") if("white") - jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist") + jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Psychologist", "Virologist") nation_name = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych") if("yellow") jobs_to_revolt = list("Chief Engineer", "Station Engineer", "Atmospheric Technician") diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 81f47b9a1e..087cce2942 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -357,7 +357,7 @@ /proc/get_all_jobs() return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", - "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", + "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Psychologist", "Paramedic", "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer") /proc/get_all_job_icons() //For all existing HUD icons diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm new file mode 100644 index 0000000000..5c1b219824 --- /dev/null +++ b/code/modules/jobs/job_types/paramedic.dm @@ -0,0 +1,45 @@ +/datum/job/paramedic + title = "Paramedic" + flag = PARAMEDIC + department_head = list("Chief Medical Officer") + department_flag = MEDSCI + faction = "Station" + total_positions = 3 + spawn_positions = 2 + supervisors = "the chief medical officer" + selection_color = "#74b5e0" + + outfit = /datum/outfit/job/paramedic + + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) + + display_order = JOB_DISPLAY_ORDER_PARAMEDIC + +/datum/outfit/job/paramedic + name = "Paramedic" + jobtype = /datum/job/paramedic + + ears = /obj/item/radio/headset/headset_med + gloves = /obj/item/clothing/gloves/color/latex/nitrile + uniform = /obj/item/clothing/under/rank/medical/paramedic + mask = /obj/item/clothing/mask/surgical + shoes = /obj/item/clothing/shoes/jackboots + head = /obj/item/clothing/head/soft/emt + suit = /obj/item/clothing/suit/toggle/labcoat/emt + belt = /obj/item/storage/belt/medical + l_hand = /obj/item/storage/firstaid/regular + suit_store = /obj/item/flashlight/pen + id = /obj/item/card/id + r_pocket = /obj/item/pinpointer/crew + l_pocket = /obj/item/pda/medical + backpack_contents = list(/obj/item/roller=1) + pda_slot = ITEM_SLOT_LPOCKET + + backpack = /obj/item/storage/backpack/medic + satchel = /obj/item/storage/backpack/satchel/med + duffelbag = /obj/item/storage/backpack/duffelbag/med + + backpack_contents = list(/obj/item/storage/hypospraykit/regular) + + chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm new file mode 100644 index 0000000000..da1a290fbd --- /dev/null +++ b/code/modules/jobs/job_types/psychologist.dm @@ -0,0 +1,36 @@ +/datum/job/psych + title = "Psychologist" + flag = PSYCH + department_head = list("Chief Medical Officer") + department_flag = MEDSCI + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the chief medical officer" + selection_color = "#74b5e0" + + outfit = /datum/outfit/job/psych + + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM) + + display_order = JOB_DISPLAY_ORDER_PSYCH + +/datum/outfit/job/psych + name = "Psychologist" + jobtype = /datum/job/psych + + ears = /obj/item/radio/headset/headset_med + uniform = /obj/item/clothing/under/suit_jacket/green + shoes = /obj/item/clothing/shoes/laceup + l_hand = /obj/item/storage/briefcase/medical + r_hand = /obj/item/clipboard + l_pocket = /obj/item/laser_pointer + r_pocket = /obj/item/pda/medical + pda_slot = ITEM_SLOT_RPOCKET + + backpack = /obj/item/storage/backpack/medic + satchel = /obj/item/storage/backpack/satchel/med + duffelbag = /obj/item/storage/backpack/duffelbag/med + + chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 92fd25a811..2d95b4b3c6 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -18,6 +18,8 @@ GLOBAL_LIST_INIT(medical_positions, list( "Medical Doctor", "Geneticist", "Virologist", + "Psychologist", + "Paramedic", "Chemist")) diff --git a/config/jobs.txt b/config/jobs.txt index a0c1ffa970..1bf271763b 100644 --- a/config/jobs.txt +++ b/config/jobs.txt @@ -31,6 +31,7 @@ Station Engineer=5,5 Atmospheric Technician=3,2 Medical Doctor=5,3 +Paramedic=2,2 Chemist=2,2 Geneticist=2,2 Virologist=1,1 @@ -43,4 +44,4 @@ Detective=1,1 Security Officer=5,5 AI=0,1 -Cyborg=0,1 \ No newline at end of file +Cyborg=0,1 diff --git a/strings/ion_laws.json b/strings/ion_laws.json index 1c28d5d5e5..e85d20b7c0 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -331,7 +331,9 @@ "BOTANISTS", "RESEARCH DIRECTORS", "CHIEF MEDICAL OFFICERS", - "MEDICAL DOCTORS", + "MEDICAL DOCTORS", + "PARAMEDICS", + "PSYCHOLOGISTS", "CHEMISTS", "GENETICISTS", "VIROLOGISTS", diff --git a/tgstation.dme b/tgstation.dme index 456d1ad969..41b45e69cd 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1972,6 +1972,8 @@ #include "code\modules\jobs\job_types\lawyer.dm" #include "code\modules\jobs\job_types\medical_doctor.dm" #include "code\modules\jobs\job_types\mime.dm" +#include "code\modules\jobs\job_types\paramedic.dm" +#include "code\modules\jobs\job_types\psychologist.dm" #include "code\modules\jobs\job_types\quartermaster.dm" #include "code\modules\jobs\job_types\research_director.dm" #include "code\modules\jobs\job_types\roboticist.dm" From 07222cfd9af04b8600099b6cf4218a4fa3b6e0bd Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Thu, 20 Feb 2020 22:21:25 -0600 Subject: [PATCH 13/57] *snap --- code/controllers/subsystem/shuttle.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 7eff8b9e3c..5952c77298 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -55,7 +55,6 @@ SUBSYSTEM_DEF(shuttle) var/lockdown = FALSE //disallow transit after nuke goes off - var/auto_call = 72000 //CIT CHANGE - time before in deciseconds in which the shuttle is auto called. Default is 2ish hours plus 15 for the shuttle. So total is 3. var/realtimeofstart = 0 /datum/controller/subsystem/shuttle/Initialize(timeofday) @@ -78,7 +77,6 @@ SUBSYSTEM_DEF(shuttle) if(!supply) WARNING("No /obj/docking_port/mobile/supply placed on the map!") realtimeofstart = world.realtime - auto_call = CONFIG_GET(number/auto_transfer_delay) return ..() /datum/controller/subsystem/shuttle/proc/initial_load() @@ -643,10 +641,10 @@ SUBSYSTEM_DEF(shuttle) QDEL_LIST(remove_images) -/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 2 hours have passed. - if((world.realtime - SSshuttle.realtimeofstart) > auto_call && EMERGENCY_IDLE_OR_RECALLED) //2 hours +/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end without being a proper shuttle call? + if(EMERGENCY_IDLE_OR_RECALLED) SSshuttle.emergency.request(silent = TRUE) priority_announce("The shift has come to an end and the shuttle called. [seclevel2num(get_security_level()) == SEC_LEVEL_RED ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [emergency.timeLeft(600)] minutes.", null, "shuttlecalled", "Priority") - log_game("Round time limit reached. Shuttle has been auto-called.") - message_admins("Round time limit reached. Shuttle called.") + log_game("Round end vote passed. Shuttle has been auto-called.") + message_admins("Round end vote passed. Shuttle has been auto-called.") emergencyNoRecall = TRUE From b7baa6fad8ced44af6231c85d8d242d5649ee250 Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Thu, 20 Feb 2020 22:30:55 -0600 Subject: [PATCH 14/57] sprite changes --- icons/mob/hud.dmi | Bin 17871 -> 18046 bytes icons/mob/landmarks.dmi | Bin 25137 -> 27103 bytes icons/mob/uniform.dmi | Bin 387484 -> 389315 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 8ea155256cf1f0fe576c5ad6a0e01b8d93454871..58209a312ba88da1dd0ffeec7b84a1bbcbb5aaa3 100644 GIT binary patch literal 18046 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 aWQIQ>Zm)4~Ru(|OpNgX9^OC2Q@BTk~r~5tt literal 17871 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 X{k+uTtswBnO>nZ3iV{^~MuGna6L{(0 literal 25137 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
    $V&F`=JW?-QRTYg+v?2bqjpW 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 O2vSqlR;pL9iTED_BLJ@e diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 69d89663297c02a2a3f487ac473212829eba548d..bcde4d84f789c6c15010bf80e27eafe06ea2798c 100644 GIT binary patch delta 24116 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 z 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 yb-Z7a Date: Thu, 20 Feb 2020 22:46:37 -0600 Subject: [PATCH 15/57] man FUCK psychs --- code/__DEFINES/jobs.dm | 24 ++++++------ .../modules/events/wizard/departmentrevolt.dm | 2 +- code/modules/jobs/access.dm | 2 +- code/modules/jobs/job_types/paramedic.dm | 6 +-- code/modules/jobs/job_types/psychologist.dm | 36 ------------------ code/modules/jobs/jobs.dm | 1 - icons/mob/hud.dmi | Bin 18046 -> 17961 bytes icons/mob/landmarks.dmi | Bin 27103 -> 26300 bytes strings/ion_laws.json | 1 - 9 files changed, 16 insertions(+), 56 deletions(-) delete mode 100644 code/modules/jobs/job_types/psychologist.dm diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 52642ffe48..d45762ee34 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -23,8 +23,7 @@ #define DOCTOR (1<<4) #define GENETICIST (1<<5) #define VIROLOGIST (1<<6) -#define PSYCH (1<<7) -#define PARAMEDIC (1<<8) +#define PARAMEDIC (1<<7) #define CIVILIAN (1<<2) @@ -80,14 +79,13 @@ #define JOB_DISPLAY_ORDER_CHEMIST 21 #define JOB_DISPLAY_ORDER_GENETICIST 22 #define JOB_DISPLAY_ORDER_VIROLOGIST 23 -#define JOB_DISPLAY_ORDER_PSYCH 24 -#define JOB_DISPLAY_ORDER_PARAMEDIC 25 -#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 26 -#define JOB_DISPLAY_ORDER_SCIENTIST 27 -#define JOB_DISPLAY_ORDER_ROBOTICIST 28 -#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 29 -#define JOB_DISPLAY_ORDER_WARDEN 30 -#define JOB_DISPLAY_ORDER_DETECTIVE 31 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 32 -#define JOB_DISPLAY_ORDER_AI 33 -#define JOB_DISPLAY_ORDER_CYBORG 34 +#define JOB_DISPLAY_ORDER_PARAMEDIC 24 +#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27 +#define JOB_DISPLAY_ORDER_SCIENTIST 28 +#define JOB_DISPLAY_ORDER_ROBOTICIST 29 +#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30 +#define JOB_DISPLAY_ORDER_WARDEN 31 +#define JOB_DISPLAY_ORDER_DETECTIVE 32 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33 +#define JOB_DISPLAY_ORDER_AI 34 +#define JOB_DISPLAY_ORDER_CYBORG 35 diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index ce6b4802fa..b82cd91323 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -19,7 +19,7 @@ jobs_to_revolt = list("Assistant") nation_name = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Grigio", "Ass", "Assi") if("white") - jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Psychologist", "Virologist") + jobs_to_revolt = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Virologist") nation_name = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych") if("yellow") jobs_to_revolt = list("Chief Engineer", "Station Engineer", "Atmospheric Technician") diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index b0467b36ad..9bd5dc1684 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -357,7 +357,7 @@ /proc/get_all_jobs() return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", - "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Psychologist", "Paramedic", + "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Paramedic", "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer") /proc/get_all_job_icons() //For all existing HUD icons diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 5c1b219824..3dd6687b24 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -11,8 +11,8 @@ outfit = /datum/outfit/job/paramedic - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) display_order = JOB_DISPLAY_ORDER_PARAMEDIC @@ -34,7 +34,7 @@ r_pocket = /obj/item/pinpointer/crew l_pocket = /obj/item/pda/medical backpack_contents = list(/obj/item/roller=1) - pda_slot = ITEM_SLOT_LPOCKET + pda_slot = ITEM_SLOT_POCKET backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med diff --git a/code/modules/jobs/job_types/psychologist.dm b/code/modules/jobs/job_types/psychologist.dm deleted file mode 100644 index da1a290fbd..0000000000 --- a/code/modules/jobs/job_types/psychologist.dm +++ /dev/null @@ -1,36 +0,0 @@ -/datum/job/psych - title = "Psychologist" - flag = PSYCH - department_head = list("Chief Medical Officer") - department_flag = MEDSCI - faction = "Station" - total_positions = 1 - spawn_positions = 1 - supervisors = "the chief medical officer" - selection_color = "#74b5e0" - - outfit = /datum/outfit/job/psych - - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM) - minimal_access = list(ACCESS_MEDICAL, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM) - - display_order = JOB_DISPLAY_ORDER_PSYCH - -/datum/outfit/job/psych - name = "Psychologist" - jobtype = /datum/job/psych - - ears = /obj/item/radio/headset/headset_med - uniform = /obj/item/clothing/under/suit_jacket/green - shoes = /obj/item/clothing/shoes/laceup - l_hand = /obj/item/storage/briefcase/medical - r_hand = /obj/item/clipboard - l_pocket = /obj/item/laser_pointer - r_pocket = /obj/item/pda/medical - pda_slot = ITEM_SLOT_RPOCKET - - backpack = /obj/item/storage/backpack/medic - satchel = /obj/item/storage/backpack/satchel/med - duffelbag = /obj/item/storage/backpack/duffelbag/med - - chameleon_extras = /obj/item/gun/syringe diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 2d95b4b3c6..78b7dd3964 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -18,7 +18,6 @@ GLOBAL_LIST_INIT(medical_positions, list( "Medical Doctor", "Geneticist", "Virologist", - "Psychologist", "Paramedic", "Chemist")) diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 58209a312ba88da1dd0ffeec7b84a1bbcbb5aaa3..c21fa47b9c022ab9c2d8b14389f610058d53a494 100644 GIT binary patch literal 17961 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 Date: Fri, 21 Feb 2020 04:45:19 -0500 Subject: [PATCH 23/57] the chair now looks better --- icons/obj/chairs.dmi | Bin 34758 -> 35228 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index 9e8fb64aba811fa784ad44c8e0dfab010b103384..80a722e79d1510e8b58463bd24a37ee603115bd6 100644 GIT binary patch delta 11600 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 delta 11140 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

    Requested security record not found,

    " . += "
    \nBack
    " return . +// Encryption Keys +// Encryption kets +/mob/living/silicon/pai/proc/softwareEncryptionKeys() + var/dat = {"

    Encryption Key Firmware


    + When enabled, this device will be able to use up to two (2) encryption keys for departmental channel access.

    + The device is currently [encryptmod ? "en" : "dis" ]abled.
    [encryptmod ? "" : "Activate Encryption Key Ports
    "]"} + return dat + // Universal Translator /mob/living/silicon/pai/proc/softwareTranslator() @@ -630,3 +657,12 @@ dat += "

    " dat += "Messages:
    [pda.tnote]" return dat + +// Loudness Booster +/mob/living/silicon/pai/proc/softwareLoudness() + if(!internal_instrument) + internal_instrument = new(src) + var/dat = "

    Sound Synthetizer

    " + dat += "Open Synthesizer Interface
    " + dat += "Choose Instrument Type" + return dat From 0cd936e33e8ea791501ca308625da0fec52e5f70 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 22 Feb 2020 15:02:07 -0600 Subject: [PATCH 31/57] bowstrings --- icons/obj/guns/projectile.dmi | Bin 44010 -> 43982 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index 58e427a3fb543046f9c73bffe881988f1be8d48b..f859e8b1e7b40e89fd165856310535fe780789d3 100644 GIT binary patch delta 3226 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 delta 3254 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 Date: Sat, 22 Feb 2020 15:14:09 -0600 Subject: [PATCH 32/57] slab spawns and grammar shidd --- _maps/map_files/Mining/Lavaland.dmm | 17 +++++++++++++++-- code/game/objects/items/granters.dm | 6 +++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 13dd939ad7..dcfdc3408c 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -2034,6 +2034,13 @@ /obj/structure/stone_tile, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) +"DQ" = ( +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/item/book/granter/crafting_recipe/bone_bow, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "Ef" = ( /obj/structure/stone_tile/block/cracked, /turf/open/lava/smooth{ @@ -2401,6 +2408,7 @@ }, /obj/structure/table/wood, /obj/item/kitchen/knife/combat/bone, +/obj/item/book/granter/crafting_recipe/bone_bow, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) "TN" = ( @@ -2507,6 +2515,11 @@ /obj/structure/stone_tile/surrounding_tile/cracked, /turf/closed/mineral/volcanic/lava_land_surface, /area/ruin/unpowered/ash_walkers) +"WA" = ( +/obj/structure/stone_tile/block/cracked, +/obj/item/book/granter/crafting_recipe/bone_bow, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/ruin/unpowered/ash_walkers) "WL" = ( /obj/structure/stone_tile{ dir = 4 @@ -57415,7 +57428,7 @@ Ds Ds KV nI -Ad +DQ Si aa ab @@ -57915,7 +57928,7 @@ aa aa Rk Si -sR +WA rz qh pq diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 986090212e..8c21348b6e 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -491,12 +491,12 @@ remarks = list("Looks like these would sell much better in a plasma fire...", "Using glass bowls rather then cones?", "Mixing soda and ice-cream?", "Tall glasses with of liquids and solids...", "Just add a bit of icecream and cherry on top?") /obj/item/book/granter/crafting_recipe/bone_bow //Bow crafting for non-ashwalkers - name = "Sandstone manual on bows" - desc = "A standstone slab with everything you need to know for making bows and arrows just like an ashwalker would." + name = "bowyery sandstone slab" // this is an actual word + desc = "A sandstone slab with inscriptions describing the Ash Walkers of Lavaland's bowyery." crafting_recipe_types = list(/datum/crafting_recipe/bone_arrow, /datum/crafting_recipe/bone_bow, /datum/crafting_recipe/ashen_arrow, /datum/crafting_recipe/quiver, /datum/crafting_recipe/bow_tablet) icon_state = "stone_tablet" oneuse = FALSE - remarks = list("Sticking burning arrows into the sand makes them stronger?", "Breaking the bone apart to get shards, not sharpening the bone.", "Sinew is just like rope?") + remarks = list("Sticking burning arrows into the sand makes them stronger?", "Breaking the bone apart to get shards, not sharpening the bone...", "Sinew is just like rope?") /obj/item/book/granter/crafting_recipe/under_the_oven //Illegal cook book name = "Under The Oven" From 75a5a6cd4576369a688c90447817f02b9f3692a9 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 22 Feb 2020 15:21:12 -0600 Subject: [PATCH 33/57] ellipses. dot dot dot. --- code/game/objects/items/granters.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 8c21348b6e..24fc1043d8 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -496,7 +496,7 @@ crafting_recipe_types = list(/datum/crafting_recipe/bone_arrow, /datum/crafting_recipe/bone_bow, /datum/crafting_recipe/ashen_arrow, /datum/crafting_recipe/quiver, /datum/crafting_recipe/bow_tablet) icon_state = "stone_tablet" oneuse = FALSE - remarks = list("Sticking burning arrows into the sand makes them stronger?", "Breaking the bone apart to get shards, not sharpening the bone...", "Sinew is just like rope?") + remarks = list("Sticking burning arrows into the sand makes them stronger...", "Breaking the bone apart to get shards, not sharpening the bone...", "Sinew is just like rope...") /obj/item/book/granter/crafting_recipe/under_the_oven //Illegal cook book name = "Under The Oven" From accc4ce776941caa247fbfda9734e1279899d862 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 22 Feb 2020 15:33:07 -0600 Subject: [PATCH 34/57] grammar shit, silkstring buff, arrow costs, yikes --- code/datums/components/crafting/guncrafting.dm | 4 ++-- .../crafting/recipes/recipes_weapon_and_ammo.dm | 14 +++++++++----- .../objects/items/stacks/sheets/sheet_types.dm | 4 ++-- .../projectiles/ammunition/caseless/arrow.dm | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/code/datums/components/crafting/guncrafting.dm b/code/datums/components/crafting/guncrafting.dm index d421a6e42a..89868c2332 100644 --- a/code/datums/components/crafting/guncrafting.dm +++ b/code/datums/components/crafting/guncrafting.dm @@ -16,6 +16,6 @@ /obj/item/weaponcrafting/silkstring name = "silkstring" - desc = "A long pice of silk looks like cable coil." + desc = "A long piece of silk with some resemblance to cable coil." icon = 'icons/obj/improvised.dmi' - icon_state = "silkstring" \ No newline at end of file + icon_state = "silkstring" diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index 76f8f119e0..99487b53fd 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -204,7 +204,7 @@ result = /obj/item/gun/ballistic/bow/pipe reqs = list(/obj/item/pipe = 5, /obj/item/stack/sheet/plastic = 15, - /obj/item/weaponcrafting/silkstring = 10) + /obj/item/weaponcrafting/silkstring = 5) time = 450 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -291,9 +291,9 @@ /datum/crafting_recipe/arrow name = "Arrow" result = /obj/item/ammo_casing/caseless/arrow - time = 40 + time = 20 reqs = list(/obj/item/stack/sheet/mineral/wood = 1, - /obj/item/weaponcrafting/silkstring = 1, + /obj/item/stack/sheet/cloth = 1, /obj/item/stack/rods = 3) // 1 metal sheet is worth 1.5 arrows category = CAT_WEAPONRY subcategory = CAT_AMMO @@ -301,7 +301,7 @@ /datum/crafting_recipe/bone_arrow name = "Bone Arrow" result = /obj/item/ammo_casing/caseless/arrow/bone - time = 40 + time = 20 always_availible = FALSE reqs = list(/obj/item/stack/sheet/bone = 1, /obj/item/stack/sheet/sinew = 1, @@ -310,7 +310,7 @@ subcategory = CAT_AMMO /datum/crafting_recipe/ashen_arrow - name = "Harden Arrow" + name = "Bonfire-Hardened Arrow" result = /obj/item/ammo_casing/caseless/arrow/ashen tools = list(/obj/structure/bonfire) time = 20 @@ -319,6 +319,10 @@ category = CAT_WEAPONRY subcategory = CAT_AMMO +/datum/crafting_recipe/ashen_arrow/welder + name = "Welder-Hardened Arrow" + tools = list(TOOL_WELDER) + /datum/crafting_recipe/smartdart name = "Medical smartdart" result = /obj/item/reagent_containers/syringe/dart diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 0e50ef2fb9..0eefb88417 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -381,12 +381,12 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 4, time = 40), \ new/datum/stack_recipe("white gloves", /obj/item/clothing/gloves/color/white, 2, time = 40), \ null, \ - new/datum/stack_recipe("silk string", /obj/item/weaponcrafting/silkstring, 2, time = 40), \ + new/datum/stack_recipe("silk string", /obj/item/weaponcrafting/silkstring, 1, time = 40), \ )) /obj/item/stack/sheet/silk name = "silk" - desc = "A long soft material. This one is just made out of cotton rather then any spiders or wyrms" + desc = "A long, soft material. Made out of refined cotton, instead of relying on the habits of spiders or silkworms." singular_name = "silk sheet" icon_state = "sheet-silk" item_state = "sheet-cloth" diff --git a/code/modules/projectiles/ammunition/caseless/arrow.dm b/code/modules/projectiles/ammunition/caseless/arrow.dm index df4941aa6a..0543e48f96 100644 --- a/code/modules/projectiles/ammunition/caseless/arrow.dm +++ b/code/modules/projectiles/ammunition/caseless/arrow.dm @@ -9,18 +9,18 @@ /obj/item/ammo_casing/caseless/arrow/ashen name = "ashen arrow" - desc = "Fire harderned wooden arrow." + desc = "An arrow made of wood, hardened by fire." icon_state = "ashenarrow" projectile_type = /obj/item/projectile/bullet/reusable/arrow/ashen /obj/item/ammo_casing/caseless/arrow/bone name = "bone arrow" - desc = "Arrow made of bone and sinew. The tip is sharp enough to pierce into a goliath plate." + desc = "An arrow made of bone and sinew. The tip is sharp enough to pierce through a goliath plate." icon_state = "bonearrow" projectile_type = /obj/item/projectile/bullet/reusable/arrow/bone /obj/item/ammo_casing/caseless/arrow/bronze name = "bronze arrow" - desc = "Bronze tipped arrow." + desc = "An arrow made of wood, tipped with bronze. The tip is dense enough to provide some armor penetration." icon_state = "bronzearrow" projectile_type = /obj/item/projectile/bullet/reusable/arrow/bronze From b89a2314a2cc552e6a4261b58674464b2431c456 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 22 Feb 2020 16:17:51 -0600 Subject: [PATCH 35/57] mmm that's compiling i don't like that --- code/controllers/configuration/entries/game_options.dm | 4 ---- code/controllers/subsystem/autotransfer.dm | 4 +++- code/controllers/subsystem/shuttle.dm | 4 ++-- code/datums/elements/ghost_role_eligibility.dm | 3 ++- code/game/gamemodes/dynamic/dynamic.dm | 4 ++-- code/game/machinery/computer/communications.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 6 ++++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index a3bc47ac91..52d7c02177 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -403,10 +403,6 @@ lowercase = FALSE splitter = "," -/datum/config_entry/number/auto_transfer_delay - config_entry_value = 72000 - min_val = 0 - /datum/config_entry/flag/pai_custom_holoforms /datum/config_entry/number/marauder_delay_non_reebe diff --git a/code/controllers/subsystem/autotransfer.dm b/code/controllers/subsystem/autotransfer.dm index b80211c354..4f8fc3631d 100644 --- a/code/controllers/subsystem/autotransfer.dm +++ b/code/controllers/subsystem/autotransfer.dm @@ -5,12 +5,14 @@ SUBSYSTEM_DEF(autotransfer) var/starttime var/targettime + var/voteinterval var/maxvotes var/curvotes /datum/controller/subsystem/autotransfer/Initialize(timeofday) starttime = world.time targettime = starttime + CONFIG_GET(number/vote_autotransfer_initial) + voteinterval = CONFIG_GET(number/vote_autotransfer_interval) maxvotes = CONFIG_GET(number/vote_autotransfer_maximum) curvotes = 0 return ..() @@ -19,7 +21,7 @@ SUBSYSTEM_DEF(autotransfer) if(maxvotes > curvotes) if(world.time > targettime) SSvote.initiate_vote("transfer",null) //TODO figure out how to not use null as the user - targettime = targettime + CONFIG_GET(number/vote_autotransfer_interval) + targettime = targettime + voteinterval curvotes += 1 else SSshuttle.autoEnd() diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 5929e7e113..ff64732317 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -55,7 +55,7 @@ SUBSYSTEM_DEF(shuttle) var/lockdown = FALSE //disallow transit after nuke goes off - var/extendvote_passed = FALSE + var/endvote_passed = FALSE var/realtimeofstart = 0 @@ -650,4 +650,4 @@ SUBSYSTEM_DEF(shuttle) log_game("Round end vote passed. Shuttle has been auto-called.") message_admins("Round end vote passed. Shuttle has been auto-called.") emergencyNoRecall = TRUE - extendvote_passed = TRUE + endvote_passed = TRUE diff --git a/code/datums/elements/ghost_role_eligibility.dm b/code/datums/elements/ghost_role_eligibility.dm index e57aaddd5a..ab87d7f1d2 100644 --- a/code/datums/elements/ghost_role_eligibility.dm +++ b/code/datums/elements/ghost_role_eligibility.dm @@ -17,7 +17,8 @@ penalty += roundstart_quit_limit - world.time if(penalty) penalty += world.realtime - if(penalty - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime) + var/maximumRoundEnd = SSautotransfer.starttime + SSautotransfer.voteinterval * SSautotransfer.maxvotes + if(penalty - SSshuttle.realtimeofstart > maximumRoundEnd + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime) penalty = CANT_REENTER_ROUND if(!(M.ckey in timeouts)) timeouts += M.ckey diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index 6ea357163f..4c3ef824b9 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -672,7 +672,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) // Time to inject some threat into the round if(EMERGENCY_ESCAPED_OR_ENDGAMED) // Unless the shuttle is gone return - if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) // no rules after shuttle is auto-called + if(SSshuttle.endvote_passed) // no rules after shuttle call is voted return message_admins("DYNAMIC: Checking for midround injection.") log_game("DYNAMIC: Checking for midround injection.") @@ -748,7 +748,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic) return if(EMERGENCY_ESCAPED_OR_ENDGAMED) // No more rules after the shuttle has left return - if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) // no rules after shuttle is auto-called + if(SSshuttle.endvote_passed) // no rules after shuttle is auto-called return update_playercounts() diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 9d0053c9b2..5fe141d2cd 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -194,7 +194,7 @@ state = STATE_CANCELSHUTTLE if("cancelshuttle2") if(authenticated) - if((world.realtime - SSshuttle.realtimeofstart) > SSshuttle.auto_call) //Citadel Edit Removing auto_call caused recall. + if(SSshuttle.endvote_passed) //Citadel Edit - endvote passing = no recalls say("Warning: Emergency shuttle recalls have been blocked by Central Command due to ongoing crew transfer procedures.") else SSshuttle.cancelEvac(usr) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 325ea6e8ed..d2cf3608e6 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -289,7 +289,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES if(world.time < roundstart_quit_limit) penalty += roundstart_quit_limit - world.time - if(penalty + world.realtime - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime) + var/maximumRoundEnd = SSautotransfer.starttime + SSautotransfer.voteinterval * SSautotransfer.maxvotes + if(penalty - SSshuttle.realtimeofstart > maximumRoundEnd + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime) penalty = CANT_REENTER_ROUND if(SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, (stat == DEAD) ? TRUE : FALSE, FALSE, (stat == DEAD)? penalty : 0, (stat == DEAD)? TRUE : FALSE) & COMPONENT_BLOCK_GHOSTING) @@ -323,7 +324,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES if(world.time < roundstart_quit_limit) penalty += roundstart_quit_limit - world.time - if(penalty + world.realtime - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime) + var/maximumRoundEnd = SSautotransfer.starttime + SSautotransfer.voteinterval * SSautotransfer.maxvotes + if(penalty - SSshuttle.realtimeofstart > maximumRoundEnd + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime) penalty = CANT_REENTER_ROUND var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst alive you won't be able to re-enter this round [penalty ? "or play ghost roles [penalty == CANT_REENTER_ROUND ? "until the round is over" : "for the next [DisplayTimeText(penalty)]"]" : ""]! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body") From aeacb06dfcb3d9d404ea10523e74133cec35615e Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sat, 22 Feb 2020 18:21:47 -0500 Subject: [PATCH 36/57] charrrries --- icons/obj/chairs.dmi | Bin 35101 -> 35860 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi index afedc69ecad23e5894d9fc8aa76ceea3c8a8f3ab..1c09cf94dc382c3985970af0dc04022a1c917056 100644 GIT binary patch delta 12710 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 E0g_Ad4*&oF delta 11945 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 Date: Sat, 22 Feb 2020 19:02:43 -0500 Subject: [PATCH 37/57] Fish Category, Misc Moves --- code/__DEFINES/construction.dm | 2 +- code/datums/components/crafting/craft.dm | 2 +- .../food_and_drinks/food/snacks_egg.dm | 1 + ...ecipes_eastern_fish.dm => recipes_fish.dm} | 113 +++++------------- .../recipes/tablecraft/recipes_meat.dm | 2 + .../recipes/tablecraft/recipes_misc.dm | 45 ++++++- .../recipes/tablecraft/recipes_pastry.dm | 13 ++ tgstation.dme | 2 +- 8 files changed, 92 insertions(+), 88 deletions(-) rename code/modules/food_and_drinks/recipes/tablecraft/{recipes_eastern_fish.dm => recipes_fish.dm} (63%) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index d022fd932d..9c2ea526fa 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -93,8 +93,8 @@ #define CAT_BURGER "Burgers" #define CAT_CAKE "Cakes" #define CAT_DONUT "Donuts" -#define CAT_EASTERN "Eastern & Fish" #define CAT_EGG "Egg-Based Food" +#define CAT_FISH "Fish" #define CAT_MEAT "Meats" #define CAT_MEXICAN "Mexican" #define CAT_MISCFOOD "Misc. Food" diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 187c896938..c381f827c0 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -29,7 +29,7 @@ CAT_CAKE, CAT_DONUT, CAT_EGG, - CAT_EASTERN, + CAT_FISH, CAT_ICE, CAT_MEAT, CAT_MEXICAN, diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index c3d71093b5..0f2856c090 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -124,6 +124,7 @@ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1) bitesize = 1 + w_class = WEIGHT_CLASS_NORMAL tastes = list("egg" = 1, "cheese" = 1) foodtype = MEAT | BREAKFAST diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_eastern_fish.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm similarity index 63% rename from code/modules/food_and_drinks/recipes/tablecraft/recipes_eastern_fish.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm index e69b1dfd36..ad1278978a 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_eastern_fish.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm @@ -1,4 +1,5 @@ -/////////////Recategorizing this as -Eastern- foods/////////////// +// see code/module/crafting/table.dm + ///////////////////////Sushi Components/////////////////////////// /datum/crafting_recipe/food/sushi_rice @@ -8,7 +9,7 @@ /datum/reagent/consumable/rice = 10 ) result = /obj/item/reagent_containers/food/snacks/sushi_rice - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/sea_weed name = "Sea Weed Sheet" @@ -18,17 +19,7 @@ /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, ) result = /obj/item/reagent_containers/food/snacks/sea_weed - subcategory = CAT_EASTERN - -/datum/crafting_recipe/food/tuna_can - name = "Can of Tuna" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 15, - /datum/reagent/consumable/cooking_oil = 5, - /obj/item/reagent_containers/food/snacks/carpmeat = 1, - ) - result = /obj/item/reagent_containers/food/snacks/tuna - subcategory = CAT_EASTERN + subcategory = CAT_FISH //////////////////////////Sushi///////////////////////////////// @@ -40,7 +31,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sashimi - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/riceball name = "Onigiri" @@ -50,7 +41,7 @@ /obj/item/reagent_containers/food/snacks/sushi_rice = 1 ) result = /obj/item/reagent_containers/food/snacks/riceball - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/sushie_egg name = "Tobiko" @@ -60,7 +51,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 2, ) result = /obj/item/reagent_containers/food/snacks/tobiko - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/sushie_basic name = "Funa Hosomaki" @@ -71,7 +62,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 3, ) result = /obj/item/reagent_containers/food/snacks/sushie_basic - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/sushie_adv name = "Funa Nigiri" @@ -81,7 +72,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_adv - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/sushie_pro name = "Well made Funa Nigiri" @@ -92,75 +83,19 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_pro - subcategory = CAT_EASTERN - -//////////////////Eastern Not-Fish////////////////////// - -/datum/crafting_recipe/food/chawanmushi - name = "Chawanmushi" - reqs = list( - /datum/reagent/water = 5, - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/boiledegg = 2, - /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chawanmushi - subcategory = CAT_EASTERN - -/datum/crafting_recipe/food/khachapuri - name = "Khachapuri" - reqs = list( - /datum/reagent/consumable/eggyolk = 5, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/khachapuri - subcategory = CAT_EASTERN - -/datum/crafting_recipe/food/rawkhinkali - name = "Raw Khinkali" - reqs = list( - /obj/item/reagent_containers/food/snacks/doughslice = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 - ) - result = /obj/item/reagent_containers/food/snacks/rawkhinkali - subcategory = CAT_EASTERN - -/datum/crafting_recipe/food/meatbun - name = "Meat bun" - reqs = list( - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 - ) - result = /obj/item/reagent_containers/food/snacks/meatbun - subcategory = CAT_EASTERN - -/datum/crafting_recipe/food/fortunecookie - time = 15 - name = "Fortune cookie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/paper = 1 - ) - parts = list( - /obj/item/paper = 1 - ) - result = /obj/item/reagent_containers/food/snacks/fortunecookie - subcategory = CAT_EASTERN + subcategory = CAT_FISH //////////////////////////////////////////////FISH/////////////////////////////////////////// -/datum/crafting_recipe/food/fishfingers - name = "Fish fingers" +/datum/crafting_recipe/food/tuna_can + name = "Can of Tuna" reqs = list( - /datum/reagent/consumable/flour = 5, - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 + /datum/reagent/consumable/sodiumchloride = 15, + /datum/reagent/consumable/cooking_oil = 5, + /obj/item/reagent_containers/food/snacks/carpmeat = 1, ) - result = /obj/item/reagent_containers/food/snacks/fishfingers - subcategory = CAT_EASTERN + result = /obj/item/reagent_containers/food/snacks/tuna + subcategory = CAT_FISH /datum/crafting_recipe/food/cubancarp name = "Cuban carp" @@ -170,7 +105,17 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/cubancarp - subcategory = CAT_EASTERN + subcategory = CAT_FISH + +/datum/crafting_recipe/food/fishfingers + name = "Fish fingers" + reqs = list( + /datum/reagent/consumable/flour = 5, + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fishfingers + subcategory = CAT_FISH /datum/crafting_recipe/food/fishandchips name = "Fish and chips" @@ -179,4 +124,4 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/fishandchips - subcategory = CAT_EASTERN \ No newline at end of file + subcategory = CAT_FISH \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index d2b04b7f99..efb773159d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -1,3 +1,5 @@ +// see code/module/crafting/table.dm + ////////////////////////////////////////////////KEBABS//////////////////////////////////////////////// /datum/crafting_recipe/food/humankebab diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index d72363dcee..6a622d6719 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -1,7 +1,50 @@ // see code/module/crafting/table.dm -// MISC +//////////////////Eastern Foods////////////////////// + +/datum/crafting_recipe/food/chawanmushi + name = "Chawanmushi" + reqs = list( + /datum/reagent/water = 5, + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/boiledegg = 2, + /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chawanmushi + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/khachapuri + name = "Khachapuri" + reqs = list( + /datum/reagent/consumable/eggyolk = 5, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/khachapuri + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/rawkhinkali + name = "Raw Khinkali" + reqs = list( + /obj/item/reagent_containers/food/snacks/doughslice = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1 + ) + result = /obj/item/reagent_containers/food/snacks/rawkhinkali + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/meatbun + name = "Meat bun" + reqs = list( + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 + ) + result = /obj/item/reagent_containers/food/snacks/meatbun + subcategory = CAT_MISCFOOD + +/////////////////////////////////MISC///////////////////////////////////// /datum/crafting_recipe/food/beans name = "Beans" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 2458a0e085..8a393476a2 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -214,6 +214,19 @@ result = /obj/item/reagent_containers/food/snacks/cracker subcategory = CAT_PASTRY +/datum/crafting_recipe/food/fortunecookie + time = 15 + name = "Fortune cookie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/paper = 1 + ) + parts = list( + /obj/item/paper = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fortunecookie + subcategory = CAT_PASTRY + /datum/crafting_recipe/food/honeybun name = "Honey bun" reqs = list( diff --git a/tgstation.dme b/tgstation.dme index 850df585d9..b235b08375 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1835,8 +1835,8 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_burger.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_cake.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_donut.dm" -#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_eastern_fish.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_egg.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_fish.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_frozen.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_mexican.dm" From 094b92e58b1c5c3faaca90c3e2cf178d136b067c Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sun, 23 Feb 2020 13:12:25 -0600 Subject: [PATCH 38/57] silk, time, rods --- .../crafting/recipes/recipes_weapon_and_ammo.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm index 99487b53fd..c132d8106d 100644 --- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm +++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm @@ -291,17 +291,17 @@ /datum/crafting_recipe/arrow name = "Arrow" result = /obj/item/ammo_casing/caseless/arrow - time = 20 + time = 30 reqs = list(/obj/item/stack/sheet/mineral/wood = 1, - /obj/item/stack/sheet/cloth = 1, - /obj/item/stack/rods = 3) // 1 metal sheet is worth 1.5 arrows + /obj/item/stack/sheet/silk = 1, + /obj/item/stack/rods = 1) // 1 metal sheet = 2 rods = 2 arrows category = CAT_WEAPONRY subcategory = CAT_AMMO /datum/crafting_recipe/bone_arrow name = "Bone Arrow" result = /obj/item/ammo_casing/caseless/arrow/bone - time = 20 + time = 30 always_availible = FALSE reqs = list(/obj/item/stack/sheet/bone = 1, /obj/item/stack/sheet/sinew = 1, @@ -313,7 +313,7 @@ name = "Bonfire-Hardened Arrow" result = /obj/item/ammo_casing/caseless/arrow/ashen tools = list(/obj/structure/bonfire) - time = 20 + time = 30 always_availible = FALSE reqs = list(/obj/item/ammo_casing/caseless/arrow = 1) category = CAT_WEAPONRY From b3149d930f7ccf831ec0a062cb806b8c9274d37d Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 23 Feb 2020 21:31:53 +0100 Subject: [PATCH 39/57] Fixing pAI radios inability to be toggled on/off --- code/game/objects/items/devices/paicard.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index f28aacc46c..4f61d6f413 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -94,10 +94,8 @@ to_chat(pai, "Your mental faculties leave you.") to_chat(pai, "oblivion... ") qdel(pai) - if(href_list["wires"]) - var/wire = text2num(href_list["wires"]) - if(pai.radio) - pai.radio.wires.cut(wire) + if(href_list["wires"] && pai.radio) + pai.radio.wires.cut(wire) if(href_list["reset_radio_short"]) pai.unshort_radio() if(href_list["setlaws"]) From 4c03d552eedb609a2692f0d9e5574ed9ff73c647 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sun, 23 Feb 2020 16:22:19 -0500 Subject: [PATCH 40/57] Gettin Salty. Fish is now Seafood. --- code/__DEFINES/construction.dm | 2 +- code/datums/components/crafting/craft.dm | 2 +- .../{recipes_fish.dm => recipes_seafood.dm} | 24 +++++++++---------- tgstation.dme | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) rename code/modules/food_and_drinks/recipes/tablecraft/{recipes_fish.dm => recipes_seafood.dm} (92%) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 9c2ea526fa..1774121c80 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -94,7 +94,6 @@ #define CAT_CAKE "Cakes" #define CAT_DONUT "Donuts" #define CAT_EGG "Egg-Based Food" -#define CAT_FISH "Fish" #define CAT_MEAT "Meats" #define CAT_MEXICAN "Mexican" #define CAT_MISCFOOD "Misc. Food" @@ -102,6 +101,7 @@ #define CAT_PIE "Pies & Sweets" #define CAT_PIZZA "Pizzas" #define CAT_SALAD "Salads" +#define CAT_SEAFOOD "Seafood" #define CAT_SANDWICH "Sandwiches" #define CAT_SOUP "Soups" #define CAT_SPAGHETTI "Spaghettis" diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index c381f827c0..cd3f05b326 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -29,7 +29,6 @@ CAT_CAKE, CAT_DONUT, CAT_EGG, - CAT_FISH, CAT_ICE, CAT_MEAT, CAT_MEXICAN, @@ -37,6 +36,7 @@ CAT_PASTRY, CAT_PIE, CAT_PIZZA, + CAT_SEAFOOD, CAT_SALAD, CAT_SANDWICH, CAT_SOUP, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm similarity index 92% rename from code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm index ad1278978a..4fc12f0777 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm @@ -9,7 +9,7 @@ /datum/reagent/consumable/rice = 10 ) result = /obj/item/reagent_containers/food/snacks/sushi_rice - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sea_weed name = "Sea Weed Sheet" @@ -19,7 +19,7 @@ /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, ) result = /obj/item/reagent_containers/food/snacks/sea_weed - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD //////////////////////////Sushi///////////////////////////////// @@ -31,7 +31,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sashimi - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/riceball name = "Onigiri" @@ -41,7 +41,7 @@ /obj/item/reagent_containers/food/snacks/sushi_rice = 1 ) result = /obj/item/reagent_containers/food/snacks/riceball - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_egg name = "Tobiko" @@ -51,7 +51,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 2, ) result = /obj/item/reagent_containers/food/snacks/tobiko - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_basic name = "Funa Hosomaki" @@ -62,7 +62,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 3, ) result = /obj/item/reagent_containers/food/snacks/sushie_basic - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_adv name = "Funa Nigiri" @@ -72,7 +72,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_adv - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_pro name = "Well made Funa Nigiri" @@ -83,7 +83,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_pro - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD //////////////////////////////////////////////FISH/////////////////////////////////////////// @@ -95,7 +95,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1, ) result = /obj/item/reagent_containers/food/snacks/tuna - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/cubancarp name = "Cuban carp" @@ -105,7 +105,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/cubancarp - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/fishfingers name = "Fish fingers" @@ -115,7 +115,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/fishfingers - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/fishandchips name = "Fish and chips" @@ -124,4 +124,4 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/fishandchips - subcategory = CAT_FISH \ No newline at end of file + subcategory = CAT_SEAFOOD \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index b235b08375..d3dd12cf7b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1836,7 +1836,6 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_cake.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_donut.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_egg.dm" -#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_fish.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_frozen.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_mexican.dm" @@ -1846,6 +1845,7 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_salad.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sandwich.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm" #include "code\modules\games\cas.dm" From 825beb41c16b79ccb552448d33134fda3aa10cc0 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 23 Feb 2020 22:44:38 +0100 Subject: [PATCH 41/57] Update paicard.dm --- code/game/objects/items/devices/paicard.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 4f61d6f413..5b332cda46 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -95,7 +95,7 @@ to_chat(pai, "oblivion... ") qdel(pai) if(href_list["wires"] && pai.radio) - pai.radio.wires.cut(wire) + pai.radio.wires.cut(href_list["wires"]) if(href_list["reset_radio_short"]) pai.unshort_radio() if(href_list["setlaws"]) From 19ae30ea5b85f06dcdf64f2c3d1dad3e36a7b291 Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Sun, 23 Feb 2020 21:20:57 -0600 Subject: [PATCH 42/57] alright ghom i hope this works Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/controllers/subsystem/shuttle.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index ff64732317..bcbe2bb49b 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -649,5 +649,5 @@ SUBSYSTEM_DEF(shuttle) priority_announce("The shift has come to an end and the shuttle called. [seclevel2num(get_security_level()) == SEC_LEVEL_RED ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [emergency.timeLeft(600)] minutes.", null, "shuttlecalled", "Priority") log_game("Round end vote passed. Shuttle has been auto-called.") message_admins("Round end vote passed. Shuttle has been auto-called.") - emergencyNoRecall = TRUE - endvote_passed = TRUE + emergencyNoRecall = TRUE + endvote_passed = TRUE From f7e0eb43f8e243af1caf2ec43a5f6dc441d32c0b Mon Sep 17 00:00:00 2001 From: Putnam Date: Sun, 23 Feb 2020 22:53:20 -0800 Subject: [PATCH 43/57] Adds rename logging --- code/modules/paperwork/pen.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 2650da8c7a..987c24c72f 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -139,6 +139,7 @@ O.name = input to_chat(user, "\The [oldname] has been successfully been renamed to \the [input].") O.renamedByPlayer = TRUE + log_game("[user] [key_name(user)] has renamed [O] to [input]") if(penchoice == "Change description") var/input = stripped_input(user,"Describe \the [O.name] here", ,"", 100) @@ -146,6 +147,7 @@ return O.desc = input to_chat(user, "You have successfully changed \the [O.name]'s description.") + log_game("[user] [key_name(user)] has changed [O]'s description to to [input]") /* * Sleepypens From 76542208a612a9b523da79ea367d2fb9d536c914 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 03:23:20 -0600 Subject: [PATCH 44/57] Automatic changelog generation for PR #11199 [ci skip] --- html/changelogs/AutoChangeLog-pr-11199.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11199.yml diff --git a/html/changelogs/AutoChangeLog-pr-11199.yml b/html/changelogs/AutoChangeLog-pr-11199.yml new file mode 100644 index 0000000000..70aae404e1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11199.yml @@ -0,0 +1,5 @@ +author: "Detective-Google" +delete-after: True +changes: + - rscadd: "Loudness Booster pAI program" + - rscadd: "Encryption Key pAI program" From f7d8f8f59b18b1a61ccf55e3c637dfbe64426682 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 03:23:32 -0600 Subject: [PATCH 45/57] Automatic changelog generation for PR #11214 [ci skip] --- html/changelogs/AutoChangeLog-pr-11214.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11214.yml diff --git a/html/changelogs/AutoChangeLog-pr-11214.yml b/html/changelogs/AutoChangeLog-pr-11214.yml new file mode 100644 index 0000000000..1a602727a8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11214.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Fixed pAI radios inability to be toggled on/off." From 592c3fb84354d51bb35d7163c27e59b965980664 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 03:23:47 -0600 Subject: [PATCH 46/57] Automatic changelog generation for PR #11184 [ci skip] --- html/changelogs/AutoChangeLog-pr-11184.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11184.yml diff --git a/html/changelogs/AutoChangeLog-pr-11184.yml b/html/changelogs/AutoChangeLog-pr-11184.yml new file mode 100644 index 0000000000..cb8ba1da3e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11184.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - bugfix: "IPC hearts are now made of robomeat and roboblood thats emp proof. Heals and is all and all just like an normal heart" From 1c8afe1a5b493eccf3e22ce0770e9ac95b11ee86 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 03:24:08 -0600 Subject: [PATCH 47/57] Automatic changelog generation for PR #11185 [ci skip] --- html/changelogs/AutoChangeLog-pr-11185.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11185.yml diff --git a/html/changelogs/AutoChangeLog-pr-11185.yml b/html/changelogs/AutoChangeLog-pr-11185.yml new file mode 100644 index 0000000000..347dc9a3ad --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11185.yml @@ -0,0 +1,5 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - imageadd: "All robotic organs now have an animation." + - imageadd: "IPC's now organs now look like robotic ones, even tho thats not the case game wise" From 9a9558f95f4c400fc65c89695c1cc2ca6dae3411 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 03:24:22 -0600 Subject: [PATCH 48/57] Automatic changelog generation for PR #11188 [ci skip] --- html/changelogs/AutoChangeLog-pr-11188.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11188.yml diff --git a/html/changelogs/AutoChangeLog-pr-11188.yml b/html/changelogs/AutoChangeLog-pr-11188.yml new file mode 100644 index 0000000000..24aae51503 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11188.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - imageadd: "Makes plywood chair not look as bad." From 14565025faaf1c774d02d999d2e25438dee25312 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 03:27:08 -0600 Subject: [PATCH 49/57] Automatic changelog generation for PR #11183 [ci skip] --- html/changelogs/AutoChangeLog-pr-11183.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11183.yml diff --git a/html/changelogs/AutoChangeLog-pr-11183.yml b/html/changelogs/AutoChangeLog-pr-11183.yml new file mode 100644 index 0000000000..26a325cb08 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11183.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - balance: "Engi/Sec Trek suit no longer has 10% melee protection" From fc3ca40b06eec6c40cfe544d1ac2e6d580c0e85e Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 03:27:29 -0600 Subject: [PATCH 50/57] Automatic changelog generation for PR #11216 [ci skip] --- html/changelogs/AutoChangeLog-pr-11216.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11216.yml diff --git a/html/changelogs/AutoChangeLog-pr-11216.yml b/html/changelogs/AutoChangeLog-pr-11216.yml new file mode 100644 index 0000000000..40bb5067e3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11216.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - rscadd: "Logging for renaming" From 0caed52ca548091ff08e363d067eb0ffeab045ac Mon Sep 17 00:00:00 2001 From: Detective-Google <48196179+Detective-Google@users.noreply.github.com> Date: Mon, 24 Feb 2020 03:28:33 -0600 Subject: [PATCH 51/57] removes the epic and cool access and makes it less epic and more cool --- code/modules/jobs/job_types/paramedic.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index 3dd6687b24..7c617d3208 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -11,8 +11,8 @@ outfit = /datum/outfit/job/paramedic - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_HYDROPONICS, ACCESS_RESEARCH) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) display_order = JOB_DISPLAY_ORDER_PARAMEDIC From 0cfa6699b1063b872735f78f77de44b92a74e16c Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 24 Feb 2020 02:31:14 -0700 Subject: [PATCH 52/57] yeah ok fine --- code/game/objects/items/teleportation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index bb860101ac..7d59da0089 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -141,7 +141,7 @@ return TRUE return ..() -/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 20) +/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user, delay = 30) var/datum/beam/B = user.Beam(target, icon_state = "rped_upgrade", maxdistance = 50) if(is_parent_of_portal(target) && (!delay || do_after(user, delay, target = target))) qdel(target) From 6b43ca03da822d049597ee97b5213f361e96c75f Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 03:33:56 -0600 Subject: [PATCH 53/57] Automatic changelog generation for PR #11201 [ci skip] --- html/changelogs/AutoChangeLog-pr-11201.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11201.yml diff --git a/html/changelogs/AutoChangeLog-pr-11201.yml b/html/changelogs/AutoChangeLog-pr-11201.yml new file mode 100644 index 0000000000..4b7749eee2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11201.yml @@ -0,0 +1,8 @@ +author: "Hatterhat" +delete-after: True +changes: + - rscadd: "The Ash Walkers' nest on Lavaland now starts with three bowyery slabs." + - rscadd: "You can now welder-harden arrows. It might take longer." + - balance: "Silkstring's costs adjusted for bows and whatnot." + - spellcheck: "Grammar adjusted on a lot of things relating to bows." + - bugfix: "Pipe bows' bowstring doesn't look like it replicated itself upon draw." From 645da9010a270153ab825ae5269abaac4652f93d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 09:39:19 -0600 Subject: [PATCH 54/57] Automatic changelog generation for PR #11110 [ci skip] --- html/changelogs/AutoChangeLog-pr-11110.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11110.yml diff --git a/html/changelogs/AutoChangeLog-pr-11110.yml b/html/changelogs/AutoChangeLog-pr-11110.yml new file mode 100644 index 0000000000..5930a2bd30 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11110.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - rscadd: "Extend votes! Ported from Hyper, ported from AUstation." From 85150b651ef1d33469309bfea5d0ef1c541cb5f8 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 09:40:20 -0600 Subject: [PATCH 55/57] Automatic changelog generation for PR #11167 [ci skip] --- html/changelogs/AutoChangeLog-pr-11167.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11167.yml diff --git a/html/changelogs/AutoChangeLog-pr-11167.yml b/html/changelogs/AutoChangeLog-pr-11167.yml new file mode 100644 index 0000000000..51bbb12fb3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11167.yml @@ -0,0 +1,4 @@ +author: "kevinz000" +delete-after: True +changes: + - tweak: "hand teles use a less atrocious beam" From 4205233e455d6206e0c4c59cba8b1abff6fdc6c9 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 13:53:39 -0600 Subject: [PATCH 56/57] Automatic changelog generation for PR #11129 [ci skip] --- html/changelogs/AutoChangeLog-pr-11129.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11129.yml diff --git a/html/changelogs/AutoChangeLog-pr-11129.yml b/html/changelogs/AutoChangeLog-pr-11129.yml new file mode 100644 index 0000000000..18f8308bb1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11129.yml @@ -0,0 +1,10 @@ +author: "Owai-Seek" +delete-after: True +changes: + - tweak: "Reorganized all food recipes, (hopefully) making things easier to find." + - balance: "Trays now have a whitelist, allowing them to pick up normal sized foods, bowls, glassware, booze, ect." + - bugfix: "Easter foods are no longer their own Misc Food Category on the top of the menu." + - spellcheck: "fixed a few typos/capitalization consistency." + - tweak: "Mexican Foods are their own Subcategory." + - tweak: "Donuts are their own Subcategory" + - tweak: "Moved Sweets from Misc Food in with Pies. Renamed to Pies & Sweets" From 270c5f26b5d46d1cd117857ecc0bc07a9c16902c Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 24 Feb 2020 16:12:47 -0600 Subject: [PATCH 57/57] Automatic changelog generation for PR #11192 [ci skip] --- html/changelogs/AutoChangeLog-pr-11192.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-11192.yml diff --git a/html/changelogs/AutoChangeLog-pr-11192.yml b/html/changelogs/AutoChangeLog-pr-11192.yml new file mode 100644 index 0000000000..4fc73ee199 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11192.yml @@ -0,0 +1,4 @@ +author: "Putnam3145" +delete-after: True +changes: + - balance: "Shooting the supermatter now adds to the supermatter's power. CO2 setups beware!"

    PgjAA`*2d|U5- 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 Date: Fri, 21 Feb 2020 07:16:39 -0500 Subject: [PATCH 24/57] Resolving some convos. Rename Pastries to Pastry & Sweets Move all sweets to Pastry & Sweets Revert Weight Class Changes Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect. Move Brioche Cake item/recipe Move Scotch Egg item/recipe --- code/__DEFINES/construction.dm | 3 +- code/game/objects/items/storage/bags.dm | 2 + .../food_and_drinks/food/customizables.dm | 2 +- .../food_and_drinks/food/snacks_cake.dm | 14 + .../food_and_drinks/food/snacks_egg.dm | 12 +- .../food_and_drinks/food/snacks_other.dm | 23 -- .../food_and_drinks/food/snacks_salad.dm | 2 +- .../food_and_drinks/food/snacks_soup.dm | 2 +- .../recipes/tablecraft/recipes_cake.dm | 9 + .../recipes/tablecraft/recipes_egg.dm | 11 + .../recipes/tablecraft/recipes_pastry.dm | 299 ++++++++++++------ .../recipes/tablecraft/recipies_sweets.dm | 117 ------- tgstation.dme | 1 - 13 files changed, 249 insertions(+), 248 deletions(-) delete mode 100644 code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index a46e2ed7b7..27be53d8c9 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -97,14 +97,13 @@ #define CAT_MEAT "Meats" #define CAT_MEXICAN "Mexican" #define CAT_MISCFOOD "Misc. Food" -#define CAT_PASTRY "Pastries" +#define CAT_PASTRY "Pastries & Sweets" #define CAT_PIE "Pies" #define CAT_PIZZA "Pizzas" #define CAT_SALAD "Salads" #define CAT_SANDWICH "Sandwiches" #define CAT_SOUP "Soups" #define CAT_SPAGHETTI "Spaghettis" -#define CAT_SWEETS "Sweets" #define CAT_ICE "Frozen" #define RCD_FLOORWALL 1 diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 67e54128a4..c265bfb408 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -326,6 +326,8 @@ /obj/item/storage/bag/tray/ComponentInitialize() . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) + STR.max_w_class = WEIGHT_CLASS_NORMAL + STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food, /obj/item/reagent_containers/glass, /datum/reagent/consumable, /obj/item/kitchen/knife, /obj/item/kitchen/rollingpin, /obj/item/kitchen/fork, /obj/item/storage/box)) //Should cover: Bottles, Beakers, Bowls, Booze, Glasses, Food, Kitchen Tools, and ingredient boxes. STR.insert_preposition = "on" /obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user) diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 7cc1152962..016e37a5c4 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -294,7 +294,7 @@ icon_state = "bowl" reagent_flags = OPENCONTAINER materials = list(MAT_GLASS = 500) - w_class = WEIGHT_CLASS_SMALL + w_class = WEIGHT_CLASS_NORMAL /obj/item/reagent_containers/glass/bowl/attackby(obj/item/I,mob/user, params) if(istype(I, /obj/item/reagent_containers/food/snacks)) diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm index bb37ec9b5d..89c4637ed9 100644 --- a/code/modules/food_and_drinks/food/snacks_cake.dm +++ b/code/modules/food_and_drinks/food/snacks_cake.dm @@ -85,6 +85,20 @@ tastes = list("cake" = 4, "cream cheese" = 3) foodtype = GRAIN | DAIRY +/obj/item/reagent_containers/food/snacks/store/cake/brioche + name = "brioche cake" + desc = "A ring of sweet, glazed buns." + icon_state = "briochecake" + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche + slices_num = 6 + bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2) + +/obj/item/reagent_containers/food/snacks/cakeslice/brioche + name = "brioche cake slice" + desc = "Delicious sweet-bread. Who needs anything else?" + icon_state = "briochecake_slice" + filling_color = "#FFD700" + /obj/item/reagent_containers/food/snacks/cakeslice/cheese name = "cheese cake slice" desc = "Slice of pure cheestisfaction." diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index b2a474adac..c3d71093b5 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -101,7 +101,7 @@ desc = "A fried egg with a side of bacon. Delicious!" icon_state = "baconegg" bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) - bitesize = 1 + bitesize = 2 filling_color = "#FFFFF0" tastes = list("egg" = 2, "bacon" = 2, "salt" = 1, "pepper" = 1) foodtype = MEAT | FRIED | BREAKFAST @@ -150,7 +150,17 @@ desc = "There is only one egg on this, how rude." icon_state = "benedict" bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 4) + w_class = WEIGHT_CLASS_NORMAL trash = /obj/item/trash/plate list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("egg" = 1, "bacon" = 1, "bun" = 1) foodtype = MEAT | BREAKFAST + +/obj/item/reagent_containers/food/snacks/scotchegg + name = "scotch egg" + desc = "A boiled egg wrapped in a delicious, seasoned meatball." + icon_state = "scotchegg" + bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) + bitesize = 3 + filling_color = "#FFFFF0" + list_reagents = list(/datum/reagent/consumable/nutriment = 6) \ No newline at end of file diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 1fff57395b..7dc2188100 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -685,29 +685,6 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 2) filling_color = "#A0522D" -/obj/item/reagent_containers/food/snacks/store/cake/brioche - name = "brioche cake" - desc = "A ring of sweet, glazed buns." - icon_state = "briochecake" - slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/brioche - slices_num = 6 - bonus_reagents = list(/datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/nutriment/vitamin = 2) - -/obj/item/reagent_containers/food/snacks/cakeslice/brioche - name = "brioche cake slice" - desc = "Delicious sweet-bread. Who needs anything else?" - icon_state = "briochecake_slice" - filling_color = "#FFD700" - -/obj/item/reagent_containers/food/snacks/scotchegg - name = "scotch egg" - desc = "A boiled egg wrapped in a delicious, seasoned meatball." - icon_state = "scotchegg" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 2) - bitesize = 3 - filling_color = "#FFFFF0" - list_reagents = list(/datum/reagent/consumable/nutriment = 6) - /obj/item/reagent_containers/food/snacks/soup/mammi name = "Mammi" desc = "A bowl of mushy bread and milk. It reminds you, not too fondly, of a bowel movement." diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm index aa4cf44f4e..e272733235 100644 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ b/code/modules/food_and_drinks/food/snacks_salad.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/food/soupsalad.dmi' trash = /obj/item/reagent_containers/glass/bowl bitesize = 3 - w_class = WEIGHT_CLASS_SMALL + w_class = WEIGHT_CLASS_NORMAL list_reagents = list(/datum/reagent/consumable/nutriment = 7, /datum/reagent/consumable/nutriment/vitamin = 2) tastes = list("leaves" = 1) foodtype = VEGETABLES diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm index 796cff9b65..a0e1ebcb39 100644 --- a/code/modules/food_and_drinks/food/snacks_soup.dm +++ b/code/modules/food_and_drinks/food/snacks_soup.dm @@ -1,5 +1,5 @@ /obj/item/reagent_containers/food/snacks/soup - w_class = WEIGHT_CLASS_SMALL + w_class = WEIGHT_CLASS_NORMAL icon = 'icons/obj/food/soupsalad.dmi' trash = /obj/item/reagent_containers/glass/bowl bitesize = 5 diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index 492d5c2db3..f6441210f6 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -80,6 +80,15 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/birthday subcategory = CAT_CAKE +/datum/crafting_recipe/food/briochecake + name = "Brioche cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /datum/reagent/consumable/sugar = 2 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/brioche + subcategory = CAT_CAKE + /datum/crafting_recipe/food/carrotcake name = "Carrot cake" reqs = list( diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm index c049cd7563..108307119d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm @@ -59,4 +59,15 @@ /obj/item/reagent_containers/food/snacks/grown/corn = 1 ) result = /obj/item/reagent_containers/food/snacks/salad/eggbowl + subcategory = CAT_EGG + +/datum/crafting_recipe/food/scotchegg + name = "Scotch egg" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 1, + /datum/reagent/consumable/blackpepper = 1, + /obj/item/reagent_containers/food/snacks/boiledegg = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1 + ) + result = /obj/item/reagent_containers/food/snacks/scotchegg subcategory = CAT_EGG \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index b19a2a8a67..012fa65706 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -254,6 +254,110 @@ datum/crafting_recipe/food/donut/meat ) result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha +////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// + +/datum/crafting_recipe/food/muffin + time = 15 + name = "Muffin" + reqs = list( + /datum/reagent/consumable/milk = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/muffin + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/berrymuffin + name = "Berry muffin" + reqs = list( + /datum/reagent/consumable/milk = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/berries = 1 + ) + result = /obj/item/reagent_containers/food/snacks/muffin/berry + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/booberrymuffin + name = "Booberry muffin" + reqs = list( + /datum/reagent/consumable/milk = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/berries = 1, + /obj/item/ectoplasm = 1 + ) + result = /obj/item/reagent_containers/food/snacks/muffin/booberry + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/poppymuffin + name = "Poppy muffin" + reqs = list( + /datum/reagent/consumable/milk = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1, + /obj/item/seeds/poppy = 1 + ) + result = /obj/item/reagent_containers/food/snacks/muffin/poppy + subcategory = CAT_PASTRY + +////////////////////////////////////////////CUPCAKES//////////////////////////////////////////// + +/datum/crafting_recipe/food/cherrycupcake + name = "Cherry cupcake" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cherrycupcake + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/bluecherrycupcake + name = "Blue cherry cupcake" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1 + ) + result = /obj/item/reagent_containers/food/snacks/bluecherrycupcake + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/strawberrycupcake + name = "Strawberry cherry cupcake" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 + ) + result = /obj/item/reagent_containers/food/snacks/strawberrycupcake + subcategory = CAT_PASTRY + +////////////////////////////////////////////COOKIES//////////////////////////////////////////// + +/datum/crafting_recipe/food/raisincookie + name = "Raisin cookie" + reqs = list( + /obj/item/reagent_containers/food/snacks/no_raisin = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/oat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/raisincookie + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/oatmealcookie + name = "Oatmeal cookie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/reagent_containers/food/snacks/grown/oat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/oatmealcookie + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/sugarcookie + time = 15 + name = "Sugar cookie" + reqs = list( + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/sugarcookie + subcategory = CAT_PASTRY + ////////////////////////////////////////////////WAFFLES AND PANCAKES//////////////////////////////////////////////// /datum/crafting_recipe/food/waffles @@ -320,7 +424,6 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/pancakes/chocolatechip subcategory = CAT_PASTRY - ////////////////////////////////////////////////DONKPOCCKETS//////////////////////////////////////////////// /datum/crafting_recipe/food/donkpocket @@ -343,108 +446,8 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/dankpocket subcategory = CAT_PASTRY -////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// - -/datum/crafting_recipe/food/muffin - time = 15 - name = "Muffin" - reqs = list( - /datum/reagent/consumable/milk = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/muffin - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/berrymuffin - name = "Berry muffin" - reqs = list( - /datum/reagent/consumable/milk = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/berries = 1 - ) - result = /obj/item/reagent_containers/food/snacks/muffin/berry - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/booberrymuffin - name = "Booberry muffin" - reqs = list( - /datum/reagent/consumable/milk = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/berries = 1, - /obj/item/ectoplasm = 1 - ) - result = /obj/item/reagent_containers/food/snacks/muffin/booberry - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/poppymuffin - name = "Poppy muffin" - reqs = list( - /datum/reagent/consumable/milk = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/citrus/lemon = 1, - /obj/item/seeds/poppy = 1 - ) - result = /obj/item/reagent_containers/food/snacks/muffin/poppy - subcategory = CAT_PASTRY - ////////////////////////////////////////////OTHER//////////////////////////////////////////// -/datum/crafting_recipe/food/cherrycupcake - name = "Cherry cupcake" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cherrycupcake - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/bluecherrycupcake - name = "Blue cherry cupcake" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/bluecherries = 1 - ) - result = /obj/item/reagent_containers/food/snacks/bluecherrycupcake - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/strawberrycupcake - name = "Strawberry cherry cupcake" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 - ) - result = /obj/item/reagent_containers/food/snacks/strawberrycupcake - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/raisincookie - name = "Raisin cookie" - reqs = list( - /obj/item/reagent_containers/food/snacks/no_raisin = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/oat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/raisincookie - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/oatmealcookie - name = "Oatmeal cookie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/reagent_containers/food/snacks/grown/oat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/oatmealcookie - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/sugarcookie - time = 15 - name = "Sugar cookie" - reqs = list( - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/sugarcookie - subcategory = CAT_PASTRY - /datum/crafting_recipe/food/chococornet name = "Choco cornet" reqs = list( @@ -474,6 +477,25 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/honeybun subcategory = CAT_PASTRY +/datum/crafting_recipe/food/hotcrossbun + name = "Hot-Cross Bun" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /datum/reagent/consumable/sugar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/hotcrossbun + subcategory = CAT_PASTRY + +/datum/crafting_recipe/food/mammi + name = "Mammi" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /datum/reagent/consumable/milk = 5 + ) + result = /obj/item/reagent_containers/food/snacks/soup/mammi + subcategory = CAT_PASTRY + /datum/crafting_recipe/food/poppypretzel time = 15 name = "Poppy pretzel" @@ -493,3 +515,78 @@ datum/crafting_recipe/food/donut/meat ) result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit subcategory = CAT_PASTRY + +////////////////////////////////////////////SWEETS//////////////////////////////////////////// + +/datum/crafting_recipe/food/candiedapple + name = "Candied apple" + reqs = list(/datum/reagent/water = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/grown/apple = 1 + ) + result = /obj/item/reagent_containers/food/snacks/candiedapple + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/chococoin + name = "Choco coin" + reqs = list( + /obj/item/coin = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/chococoin + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/chocoorange + name = "Choco orange" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/chocoorange + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/chocolatebunny + name = "Chocolate bunny" + reqs = list( + /datum/reagent/consumable/sugar = 2, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chocolatebunny + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/chocolatestrawberry + name = "Chocolate Strawberry" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/fudgedice + name = "Fudge dice" + reqs = list( + /obj/item/dice = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/fudgedice + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/honeybar + name = "Honey nut bar" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/oat = 1, + /datum/reagent/consumable/honey = 5 + ) + result = /obj/item/reagent_containers/food/snacks/honeybar + subcategory = CAT_SWEETS + +/datum/crafting_recipe/food/spiderlollipop + name = "Spider Lollipop" + reqs = list(/obj/item/stack/rods = 1, + /datum/reagent/consumable/sugar = 5, + /datum/reagent/water = 5, + /obj/item/reagent_containers/food/snacks/spiderling = 1 + ) + result = /obj/item/reagent_containers/food/snacks/spiderlollipop + subcategory = CAT_SWEETS diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm deleted file mode 100644 index a06bfb880b..0000000000 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipies_sweets.dm +++ /dev/null @@ -1,117 +0,0 @@ -// see code/module/crafting/table.dm - -// SWEETS - -/datum/crafting_recipe/food/candiedapple - name = "Candied apple" - reqs = list(/datum/reagent/water = 5, - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/grown/apple = 1 - ) - result = /obj/item/reagent_containers/food/snacks/candiedapple - subcategory = CAT_SWEETS - -/datum/crafting_recipe/food/chococoin - name = "Choco coin" - reqs = list( - /obj/item/coin = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - ) - result = /obj/item/reagent_containers/food/snacks/chococoin - subcategory = CAT_SWEETS - -/datum/crafting_recipe/food/chocoorange - name = "Choco orange" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - ) - result = /obj/item/reagent_containers/food/snacks/chocoorange - subcategory = CAT_SWEETS - -/datum/crafting_recipe/food/chocolatestrawberry - name = "Chocolate Strawberry" - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry - subcategory = CAT_SWEETS - -/datum/crafting_recipe/food/fudgedice - name = "Fudge dice" - reqs = list( - /obj/item/dice = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - ) - result = /obj/item/reagent_containers/food/snacks/fudgedice - subcategory = CAT_SWEETS - -/datum/crafting_recipe/food/honeybar - name = "Honey nut bar" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/oat = 1, - /datum/reagent/consumable/honey = 5 - ) - result = /obj/item/reagent_containers/food/snacks/honeybar - subcategory = CAT_SWEETS - -/datum/crafting_recipe/food/spiderlollipop - name = "Spider Lollipop" - reqs = list(/obj/item/stack/rods = 1, - /datum/reagent/consumable/sugar = 5, - /datum/reagent/water = 5, - /obj/item/reagent_containers/food/snacks/spiderling = 1 - ) - result = /obj/item/reagent_containers/food/snacks/spiderlollipop - subcategory = CAT_SWEETS - -//Easter Stuff - -/datum/crafting_recipe/food/chocolatebunny - name = "Chocolate bunny" - reqs = list( - /datum/reagent/consumable/sugar = 2, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chocolatebunny - subcategory = CAT_SWEETS - -/datum/crafting_recipe/food/hotcrossbun - name = "Hot-Cross Bun" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /datum/reagent/consumable/sugar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/hotcrossbun - subcategory = CAT_SWEETS - -/datum/crafting_recipe/food/briochecake - name = "Brioche cake" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, - /datum/reagent/consumable/sugar = 2 - ) - result = /obj/item/reagent_containers/food/snacks/store/cake/brioche - subcategory = CAT_SWEETS - -/datum/crafting_recipe/food/scotchegg - name = "Scotch egg" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /datum/reagent/consumable/blackpepper = 1, - /obj/item/reagent_containers/food/snacks/boiledegg = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 - ) - result = /obj/item/reagent_containers/food/snacks/scotchegg - subcategory = CAT_SWEETS - -/datum/crafting_recipe/food/mammi - name = "Mammi" - reqs = list( - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /datum/reagent/consumable/milk = 5 - ) - result = /obj/item/reagent_containers/food/snacks/soup/mammi - subcategory = CAT_SWEETS diff --git a/tgstation.dme b/tgstation.dme index de3bd872f3..44ad72f766 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1847,7 +1847,6 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sushi.dm" -#include "code\modules\food_and_drinks\recipes\tablecraft\recipies_sweets.dm" #include "code\modules\games\cas.dm" #include "code\modules\goonchat\browserOutput.dm" #include "code\modules\holiday\easter.dm" From 34c8315c2fb647fe44a1f4d0c02d41430b5d4a69 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 21 Feb 2020 07:26:32 -0500 Subject: [PATCH 25/57] I forgot to hit save. --- .../recipes/tablecraft/recipes_pastry.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 012fa65706..191013281c 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -525,7 +525,7 @@ datum/crafting_recipe/food/donut/meat /obj/item/reagent_containers/food/snacks/grown/apple = 1 ) result = /obj/item/reagent_containers/food/snacks/candiedapple - subcategory = CAT_SWEETS + subcategory = CAT_PASTRY /datum/crafting_recipe/food/chococoin name = "Choco coin" @@ -534,7 +534,7 @@ datum/crafting_recipe/food/donut/meat /obj/item/reagent_containers/food/snacks/chocolatebar = 1, ) result = /obj/item/reagent_containers/food/snacks/chococoin - subcategory = CAT_SWEETS + subcategory = CAT_PASTRY /datum/crafting_recipe/food/chocoorange name = "Choco orange" @@ -543,7 +543,7 @@ datum/crafting_recipe/food/donut/meat /obj/item/reagent_containers/food/snacks/chocolatebar = 1, ) result = /obj/item/reagent_containers/food/snacks/chocoorange - subcategory = CAT_SWEETS + subcategory = CAT_PASTRY /datum/crafting_recipe/food/chocolatebunny name = "Chocolate bunny" @@ -552,7 +552,7 @@ datum/crafting_recipe/food/donut/meat /obj/item/reagent_containers/food/snacks/chocolatebar = 1 ) result = /obj/item/reagent_containers/food/snacks/chocolatebunny - subcategory = CAT_SWEETS + subcategory = CAT_PASTRY /datum/crafting_recipe/food/chocolatestrawberry name = "Chocolate Strawberry" @@ -561,7 +561,7 @@ datum/crafting_recipe/food/donut/meat /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 ) result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry - subcategory = CAT_SWEETS + subcategory = CAT_PASTRY /datum/crafting_recipe/food/fudgedice name = "Fudge dice" @@ -570,7 +570,7 @@ datum/crafting_recipe/food/donut/meat /obj/item/reagent_containers/food/snacks/chocolatebar = 1, ) result = /obj/item/reagent_containers/food/snacks/fudgedice - subcategory = CAT_SWEETS + subcategory = CAT_PASTRY /datum/crafting_recipe/food/honeybar name = "Honey nut bar" @@ -579,7 +579,7 @@ datum/crafting_recipe/food/donut/meat /datum/reagent/consumable/honey = 5 ) result = /obj/item/reagent_containers/food/snacks/honeybar - subcategory = CAT_SWEETS + subcategory = CAT_PASTRY /datum/crafting_recipe/food/spiderlollipop name = "Spider Lollipop" @@ -589,4 +589,4 @@ datum/crafting_recipe/food/donut/meat /obj/item/reagent_containers/food/snacks/spiderling = 1 ) result = /obj/item/reagent_containers/food/snacks/spiderlollipop - subcategory = CAT_SWEETS + subcategory = CAT_PASTRY From d112556ea3ac7deb03ff041232dd42a7f370bca5 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 21 Feb 2020 09:34:13 -0500 Subject: [PATCH 26/57] Fix, New Category, file renames. Remove Sweets Category Add Donut Category Rename recipies_sushi.dm to recipies_eastern_fish.dm (for sorting in the UI) Rename recipies_pie.dm to recipies_pie_sweets.dm Remove Onigiri from Misc (It's in Eastern) --- code/__DEFINES/construction.dm | 7 +- code/datums/components/crafting/craft.dm | 2 +- .../recipes/tablecraft/recipes_donut.dm | 255 ++++++++++++++ ...cipes_sushi.dm => recipes_eastern_fish.dm} | 33 +- .../recipes/tablecraft/recipes_meat.dm | 31 -- .../recipes/tablecraft/recipes_misc.dm | 10 - .../recipes/tablecraft/recipes_pastry.dm | 328 ------------------ ...{recipes_pie.dm => recipes_pies_sweets.dm} | 75 ++++ tgstation.dme | 5 +- 9 files changed, 370 insertions(+), 376 deletions(-) create mode 100644 code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm rename code/modules/food_and_drinks/recipes/tablecraft/{recipes_sushi.dm => recipes_eastern_fish.dm} (81%) rename code/modules/food_and_drinks/recipes/tablecraft/{recipes_pie.dm => recipes_pies_sweets.dm} (75%) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 27be53d8c9..d022fd932d 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -92,13 +92,14 @@ #define CAT_BREAD "Breads" #define CAT_BURGER "Burgers" #define CAT_CAKE "Cakes" -#define CAT_EASTERN "Eastern" +#define CAT_DONUT "Donuts" +#define CAT_EASTERN "Eastern & Fish" #define CAT_EGG "Egg-Based Food" #define CAT_MEAT "Meats" #define CAT_MEXICAN "Mexican" #define CAT_MISCFOOD "Misc. Food" -#define CAT_PASTRY "Pastries & Sweets" -#define CAT_PIE "Pies" +#define CAT_PASTRY "Pastries" +#define CAT_PIE "Pies & Sweets" #define CAT_PIZZA "Pizzas" #define CAT_SALAD "Salads" #define CAT_SANDWICH "Sandwiches" diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 1caf7d9489..187c896938 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -27,6 +27,7 @@ CAT_BREAD, CAT_BURGER, CAT_CAKE, + CAT_DONUT, CAT_EGG, CAT_EASTERN, CAT_ICE, @@ -40,7 +41,6 @@ CAT_SANDWICH, CAT_SOUP, CAT_SPAGHETTI, - CAT_SWEETS, ), CAT_DRINK = CAT_NONE, CAT_CLOTHING = CAT_NONE, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm new file mode 100644 index 0000000000..ac5576ac25 --- /dev/null +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm @@ -0,0 +1,255 @@ +// see code/module/crafting/table.dm + +////////////////////////////////////////////////DONUTS//////////////////////////////////////////////// + +/datum/crafting_recipe/food/donut + time = 15 + name = "Donut" + reqs = list( + /datum/reagent/consumable/sugar = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/plain + subcategory = CAT_DONUT + +/datum/crafting_recipe/food/donut/chaos + name = "Chaos donut" + reqs = list( + /datum/reagent/consumable/frostoil = 5, + /datum/reagent/consumable/capsaicin = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/chaos + +datum/crafting_recipe/food/donut/meat + time = 15 + name = "Meat donut" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/slab = 1, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/meat + +/datum/crafting_recipe/food/donut/jelly + name = "Jelly donut" + reqs = list( + /datum/reagent/consumable/berryjuice = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/plain + +/datum/crafting_recipe/food/donut/slimejelly + name = "Slime jelly donut" + reqs = list( + /datum/reagent/toxin/slimejelly = 5, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain + +/datum/crafting_recipe/food/donut/glaze + time = 15 + name = "glaze donut" + reqs = list( + /datum/reagent/consumable/sugar = 10, + /obj/item/reagent_containers/food/snacks/pastrybase = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/glaze + subcategory = CAT_DONUT + +/datum/crafting_recipe/food/donut/berry + name = "Berry Donut" + reqs = list( + /datum/reagent/consumable/berryjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/berry + +/datum/crafting_recipe/food/donut/trumpet + name = "Spaceman's Donut" + reqs = list( + /datum/reagent/medicine/polypyr = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + + result = /obj/item/reagent_containers/food/snacks/donut/trumpet + +/datum/crafting_recipe/food/donut/apple + name = "Apple Donut" + reqs = list( + /datum/reagent/consumable/applejuice = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/apple + +/datum/crafting_recipe/food/donut/caramel + name = "Caramel Donut" + reqs = list( + /datum/reagent/consumable/caramel = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/caramel + +/datum/crafting_recipe/food/donut/choco + name = "Chocolate Donut" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/choco + +/datum/crafting_recipe/food/donut/blumpkin + name = "Blumpkin Donut" + reqs = list( + /datum/reagent/consumable/blumpkinjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/blumpkin + +/datum/crafting_recipe/food/donut/bungo + name = "Bungo Donut" + reqs = list( + /datum/reagent/consumable/bungojuice = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/bungo + +/datum/crafting_recipe/food/donut/matcha + name = "Matcha Donut" + reqs = list( + /datum/reagent/toxin/teapowder = 3, + /obj/item/reagent_containers/food/snacks/donut/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/matcha + +////////////////////////////////////////////////////JELLY DONUTS/////////////////////////////////////////////////////// + +/datum/crafting_recipe/food/donut/jelly/apple + name = "Apple Jelly Donut" + reqs = list( + /datum/reagent/consumable/applejuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/apple + +/datum/crafting_recipe/food/donut/jelly/berry + name = "Berry Jelly Donut" + reqs = list( + /datum/reagent/consumable/berryjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/berry + +/datum/crafting_recipe/food/donut/jelly/blumpkin + name = "Blumpkin Jelly Donut" + reqs = list( + /datum/reagent/consumable/blumpkinjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin + +/datum/crafting_recipe/food/donut/jelly/bungo + name = "Bungo Jelly Donut" + reqs = list( + /datum/reagent/consumable/bungojuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/bungo + +/datum/crafting_recipe/food/donut/jelly/caramel + name = "Caramel Jelly Donut" + reqs = list( + /datum/reagent/consumable/caramel = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/caramel + +/datum/crafting_recipe/food/donut/jelly/choco + name = "Chocolate Jelly Donut" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/choco + +/datum/crafting_recipe/food/donut/jelly/matcha + name = "Matcha Jelly Donut" + reqs = list( + /datum/reagent/toxin/teapowder = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/matcha + +/datum/crafting_recipe/food/donut/jelly/trumpet + name = "Spaceman's Jelly Donut" + reqs = list( + /datum/reagent/medicine/polypyr = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet + +////////////////////////////////////////////////////SLIME DONUTS/////////////////////////////////////////////////////// + +/datum/crafting_recipe/food/donut/slimejelly/apple + name = "Apple Slime Donut" + reqs = list( + /datum/reagent/consumable/applejuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple + +/datum/crafting_recipe/food/donut/slimejelly/berry + name = "Berry Slime Donut" + reqs = list( + /datum/reagent/consumable/berryjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry + +/datum/crafting_recipe/food/donut/slimejelly/blumpkin + name = "Blumpkin Slime Donut" + reqs = list( + /datum/reagent/consumable/blumpkinjuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin + +/datum/crafting_recipe/food/donut/slimejelly/bungo + name = "Bungo Slime Donut" + reqs = list( + /datum/reagent/consumable/bungojuice = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo + +/datum/crafting_recipe/food/donut/slimejelly/caramel + name = "Caramel Slime Donut" + reqs = list( + /datum/reagent/consumable/caramel = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/caramel + +/datum/crafting_recipe/food/donut/slimejelly/choco + name = "Chocolate Slime Donut" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco + +/datum/crafting_recipe/food/donut/slimejelly/trumpet + name = "Spaceman's Slime Donut" + reqs = list( + /datum/reagent/medicine/polypyr = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet + +/datum/crafting_recipe/food/donut/slimejelly/matcha + name = "Matcha Slime Donut" + reqs = list( + /datum/reagent/toxin/teapowder = 3, + /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_eastern_fish.dm similarity index 81% rename from code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_eastern_fish.dm index 3a77181d8f..e69b1dfd36 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_eastern_fish.dm @@ -94,7 +94,7 @@ result = /obj/item/reagent_containers/food/snacks/sushie_pro subcategory = CAT_EASTERN -//////////////////Not-Fish////////////////////// +//////////////////Eastern Not-Fish////////////////////// /datum/crafting_recipe/food/chawanmushi name = "Chawanmushi" @@ -149,3 +149,34 @@ ) result = /obj/item/reagent_containers/food/snacks/fortunecookie subcategory = CAT_EASTERN + +//////////////////////////////////////////////FISH/////////////////////////////////////////// + +/datum/crafting_recipe/food/fishfingers + name = "Fish fingers" + reqs = list( + /datum/reagent/consumable/flour = 5, + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fishfingers + subcategory = CAT_EASTERN + +/datum/crafting_recipe/food/cubancarp + name = "Cuban carp" + reqs = list( + /datum/reagent/consumable/flour = 5, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cubancarp + subcategory = CAT_EASTERN + +/datum/crafting_recipe/food/fishandchips + name = "Fish and chips" + reqs = list( + /obj/item/reagent_containers/food/snacks/fries = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fishandchips + subcategory = CAT_EASTERN \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index 03020b8ba9..d2b04b7f99 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -62,37 +62,6 @@ result = /obj/item/reagent_containers/food/snacks/spidereggsham subcategory = CAT_MEAT -//////////////////////////////////////////////FISH/////////////////////////////////////////// - -/datum/crafting_recipe/food/fishfingers - name = "Fish fingers" - reqs = list( - /datum/reagent/consumable/flour = 5, - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/fishfingers - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/cubancarp - name = "Cuban carp" - reqs = list( - /datum/reagent/consumable/flour = 5, - /obj/item/reagent_containers/food/snacks/grown/chili = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cubancarp - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/fishandchips - name = "Fish and chips" - reqs = list( - /obj/item/reagent_containers/food/snacks/fries = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/fishandchips - subcategory = CAT_MEAT - ////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// /datum/crafting_recipe/food/ribs diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index b2d79e10f9..d72363dcee 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -128,13 +128,3 @@ ) result = /obj/item/reagent_containers/food/snacks/salad/ricepudding subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/riceball - name = "Onigiri" - reqs = list( - /datum/reagent/consumable/soysauce = 1, - /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, - /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 - ) - result = /obj/item/reagent_containers/food/snacks/riceball - subcategory = CAT_MISCFOOD diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 191013281c..2458a0e085 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -1,259 +1,5 @@ // see code/module/crafting/table.dm -////////////////////////////////////////////////DONUTS//////////////////////////////////////////////// - -/datum/crafting_recipe/food/donut - time = 15 - name = "Donut" - reqs = list( - /datum/reagent/consumable/sugar = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/plain - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/donut/chaos - name = "Chaos donut" - reqs = list( - /datum/reagent/consumable/frostoil = 5, - /datum/reagent/consumable/capsaicin = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/chaos - -datum/crafting_recipe/food/donut/meat - time = 15 - name = "Meat donut" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/slab = 1, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/meat - -/datum/crafting_recipe/food/donut/jelly - name = "Jelly donut" - reqs = list( - /datum/reagent/consumable/berryjuice = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/plain - -/datum/crafting_recipe/food/donut/slimejelly - name = "Slime jelly donut" - reqs = list( - /datum/reagent/toxin/slimejelly = 5, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain - -/datum/crafting_recipe/food/donut/glaze - time = 15 - name = "glaze donut" - reqs = list( - /datum/reagent/consumable/sugar = 10, - /obj/item/reagent_containers/food/snacks/pastrybase = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/glaze - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/donut/berry - name = "Berry Donut" - reqs = list( - /datum/reagent/consumable/berryjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/berry - -/datum/crafting_recipe/food/donut/trumpet - name = "Spaceman's Donut" - reqs = list( - /datum/reagent/medicine/polypyr = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 - ) - - result = /obj/item/reagent_containers/food/snacks/donut/trumpet - -/datum/crafting_recipe/food/donut/apple - name = "Apple Donut" - reqs = list( - /datum/reagent/consumable/applejuice = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/apple - -/datum/crafting_recipe/food/donut/caramel - name = "Caramel Donut" - reqs = list( - /datum/reagent/consumable/caramel = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/caramel - -/datum/crafting_recipe/food/donut/choco - name = "Chocolate Donut" - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/choco - -/datum/crafting_recipe/food/donut/blumpkin - name = "Blumpkin Donut" - reqs = list( - /datum/reagent/consumable/blumpkinjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/blumpkin - -/datum/crafting_recipe/food/donut/bungo - name = "Bungo Donut" - reqs = list( - /datum/reagent/consumable/bungojuice = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/bungo - -/datum/crafting_recipe/food/donut/matcha - name = "Matcha Donut" - reqs = list( - /datum/reagent/toxin/teapowder = 3, - /obj/item/reagent_containers/food/snacks/donut/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/matcha - -////////////////////////////////////////////////////JELLY DONUTS/////////////////////////////////////////////////////// - -/datum/crafting_recipe/food/donut/jelly/apple - name = "Apple Jelly Donut" - reqs = list( - /datum/reagent/consumable/applejuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/apple - -/datum/crafting_recipe/food/donut/jelly/berry - name = "Berry Jelly Donut" - reqs = list( - /datum/reagent/consumable/berryjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/berry - -/datum/crafting_recipe/food/donut/jelly/blumpkin - name = "Blumpkin Jelly Donut" - reqs = list( - /datum/reagent/consumable/blumpkinjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/blumpkin - -/datum/crafting_recipe/food/donut/jelly/bungo - name = "Bungo Jelly Donut" - reqs = list( - /datum/reagent/consumable/bungojuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/bungo - -/datum/crafting_recipe/food/donut/jelly/caramel - name = "Caramel Jelly Donut" - reqs = list( - /datum/reagent/consumable/caramel = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/caramel - -/datum/crafting_recipe/food/donut/jelly/choco - name = "Chocolate Jelly Donut" - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/choco - -/datum/crafting_recipe/food/donut/jelly/matcha - name = "Matcha Jelly Donut" - reqs = list( - /datum/reagent/toxin/teapowder = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/matcha - -/datum/crafting_recipe/food/donut/jelly/trumpet - name = "Spaceman's Jelly Donut" - reqs = list( - /datum/reagent/medicine/polypyr = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/trumpet - -////////////////////////////////////////////////////SLIME DONUTS/////////////////////////////////////////////////////// - -/datum/crafting_recipe/food/donut/slimejelly/apple - name = "Apple Slime Donut" - reqs = list( - /datum/reagent/consumable/applejuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/apple - -/datum/crafting_recipe/food/donut/slimejelly/berry - name = "Berry Slime Donut" - reqs = list( - /datum/reagent/consumable/berryjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/berry - -/datum/crafting_recipe/food/donut/slimejelly/blumpkin - name = "Blumpkin Slime Donut" - reqs = list( - /datum/reagent/consumable/blumpkinjuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/blumpkin - -/datum/crafting_recipe/food/donut/slimejelly/bungo - name = "Bungo Slime Donut" - reqs = list( - /datum/reagent/consumable/bungojuice = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/bungo - -/datum/crafting_recipe/food/donut/slimejelly/caramel - name = "Caramel Slime Donut" - reqs = list( - /datum/reagent/consumable/caramel = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/caramel - -/datum/crafting_recipe/food/donut/slimejelly/choco - name = "Chocolate Slime Donut" - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/choco - -/datum/crafting_recipe/food/donut/slimejelly/trumpet - name = "Spaceman's Slime Donut" - reqs = list( - /datum/reagent/medicine/polypyr = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/trumpet - -/datum/crafting_recipe/food/donut/slimejelly/matcha - name = "Matcha Slime Donut" - reqs = list( - /datum/reagent/toxin/teapowder = 3, - /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly/matcha - ////////////////////////////////////////////////MUFFINS//////////////////////////////////////////////// /datum/crafting_recipe/food/muffin @@ -516,77 +262,3 @@ datum/crafting_recipe/food/donut/meat result = /obj/item/reagent_containers/food/snacks/plumphelmetbiscuit subcategory = CAT_PASTRY -////////////////////////////////////////////SWEETS//////////////////////////////////////////// - -/datum/crafting_recipe/food/candiedapple - name = "Candied apple" - reqs = list(/datum/reagent/water = 5, - /datum/reagent/consumable/sugar = 5, - /obj/item/reagent_containers/food/snacks/grown/apple = 1 - ) - result = /obj/item/reagent_containers/food/snacks/candiedapple - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/chococoin - name = "Choco coin" - reqs = list( - /obj/item/coin = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - ) - result = /obj/item/reagent_containers/food/snacks/chococoin - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/chocoorange - name = "Choco orange" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - ) - result = /obj/item/reagent_containers/food/snacks/chocoorange - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/chocolatebunny - name = "Chocolate bunny" - reqs = list( - /datum/reagent/consumable/sugar = 2, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chocolatebunny - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/chocolatestrawberry - name = "Chocolate Strawberry" - reqs = list( - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/fudgedice - name = "Fudge dice" - reqs = list( - /obj/item/dice = 1, - /obj/item/reagent_containers/food/snacks/chocolatebar = 1, - ) - result = /obj/item/reagent_containers/food/snacks/fudgedice - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/honeybar - name = "Honey nut bar" - reqs = list( - /obj/item/reagent_containers/food/snacks/grown/oat = 1, - /datum/reagent/consumable/honey = 5 - ) - result = /obj/item/reagent_containers/food/snacks/honeybar - subcategory = CAT_PASTRY - -/datum/crafting_recipe/food/spiderlollipop - name = "Spider Lollipop" - reqs = list(/obj/item/stack/rods = 1, - /datum/reagent/consumable/sugar = 5, - /datum/reagent/water = 5, - /obj/item/reagent_containers/food/snacks/spiderling = 1 - ) - result = /obj/item/reagent_containers/food/snacks/spiderlollipop - subcategory = CAT_PASTRY diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pies_sweets.dm similarity index 75% rename from code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_pies_sweets.dm index eabad73138..52becf81df 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pies_sweets.dm @@ -228,3 +228,78 @@ ) result = /obj/item/reagent_containers/food/snacks/pie/cocolavatart subcategory = CAT_PIE + +////////////////////////////////////////////SWEETS//////////////////////////////////////////// + +/datum/crafting_recipe/food/candiedapple + name = "Candied apple" + reqs = list(/datum/reagent/water = 5, + /datum/reagent/consumable/sugar = 5, + /obj/item/reagent_containers/food/snacks/grown/apple = 1 + ) + result = /obj/item/reagent_containers/food/snacks/candiedapple + subcategory = CAT_PIE + +/datum/crafting_recipe/food/chococoin + name = "Choco coin" + reqs = list( + /obj/item/coin = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/chococoin + subcategory = CAT_PIE + +/datum/crafting_recipe/food/chocoorange + name = "Choco orange" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/chocoorange + subcategory = CAT_PIE + +/datum/crafting_recipe/food/chocolatebunny + name = "Chocolate bunny" + reqs = list( + /datum/reagent/consumable/sugar = 2, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chocolatebunny + subcategory = CAT_PIE + +/datum/crafting_recipe/food/chocolatestrawberry + name = "Chocolate Strawberry" + reqs = list( + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + /obj/item/reagent_containers/food/snacks/grown/strawberry = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chocolatestrawberry + subcategory = CAT_PIE + +/datum/crafting_recipe/food/fudgedice + name = "Fudge dice" + reqs = list( + /obj/item/dice = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 1, + ) + result = /obj/item/reagent_containers/food/snacks/fudgedice + subcategory = CAT_PIE + +/datum/crafting_recipe/food/honeybar + name = "Honey nut bar" + reqs = list( + /obj/item/reagent_containers/food/snacks/grown/oat = 1, + /datum/reagent/consumable/honey = 5 + ) + result = /obj/item/reagent_containers/food/snacks/honeybar + subcategory = CAT_PIE + +/datum/crafting_recipe/food/spiderlollipop + name = "Spider Lollipop" + reqs = list(/obj/item/stack/rods = 1, + /datum/reagent/consumable/sugar = 5, + /datum/reagent/water = 5, + /obj/item/reagent_containers/food/snacks/spiderling = 1 + ) + result = /obj/item/reagent_containers/food/snacks/spiderlollipop + subcategory = CAT_PIE \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 44ad72f766..850df585d9 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1834,19 +1834,20 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_bread.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_burger.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_cake.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_donut.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_eastern_fish.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_egg.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_frozen.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_mexican.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_misc.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pastry.dm" -#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pie.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pies_sweets.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_salad.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sandwich.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm" -#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sushi.dm" #include "code\modules\games\cas.dm" #include "code\modules\goonchat\browserOutput.dm" #include "code\modules\holiday\easter.dm" From 8e865a508180d5a3107e7c071368e29c8cc8c535 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 21 Feb 2020 11:37:17 -0800 Subject: [PATCH 27/57] Made power increase with raw damage. --- code/modules/power/supermatter/supermatter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 21003b5e86..52a836e717 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -345,7 +345,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) else // Pass all the gas related code an empty gas container removed = new() - + matter_power += damage - damage_archived damage = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage) // hardcap any direct damage taken before doing atmos damage damage_archived = damage if(!removed || !removed.total_moles() || isspaceturf(T)) //we're in space or there is no gas to process From 0f9bda8f909c1e99ec827bc798add26f4d1f3fc1 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 21 Feb 2020 11:53:16 -0800 Subject: [PATCH 28/57] wow okay make it do this instead --- code/modules/power/supermatter/supermatter.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 52a836e717..858adc0d66 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -345,9 +345,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) else // Pass all the gas related code an empty gas container removed = new() + damage_archived = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage) matter_power += damage - damage_archived - damage = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage) // hardcap any direct damage taken before doing atmos damage - damage_archived = damage + damage = damage_archived if(!removed || !removed.total_moles() || isspaceturf(T)) //we're in space or there is no gas to process if(takes_damage) damage += max((power / 1000) * DAMAGE_INCREASE_MULTIPLIER, 0.1) // always does at least some damage From 6dbd58b5df84aba1720a451b914c5330a211e3e0 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Fri, 21 Feb 2020 16:07:41 -0600 Subject: [PATCH 29/57] i really fucked this up please advise --- code/controllers/subsystem/shuttle.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 5952c77298..5929e7e113 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -55,6 +55,8 @@ SUBSYSTEM_DEF(shuttle) var/lockdown = FALSE //disallow transit after nuke goes off + var/extendvote_passed = FALSE + var/realtimeofstart = 0 /datum/controller/subsystem/shuttle/Initialize(timeofday) @@ -648,3 +650,4 @@ SUBSYSTEM_DEF(shuttle) log_game("Round end vote passed. Shuttle has been auto-called.") message_admins("Round end vote passed. Shuttle has been auto-called.") emergencyNoRecall = TRUE + extendvote_passed = TRUE From ca2924687804c3ab32f936e77f444243a3f3d91c Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Sat, 22 Feb 2020 00:02:49 -0600 Subject: [PATCH 30/57] adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) --- code/datums/action.dm | 7 ++-- code/game/machinery/announcement_system.dm | 2 +- .../game/objects/items/devices/instruments.dm | 6 ++++ .../objects/items/devices/radio/headset.dm | 9 +++-- code/modules/mob/living/silicon/ai/ai.dm | 2 +- code/modules/mob/living/silicon/pai/pai.dm | 17 ++++++++- .../mob/living/silicon/pai/software.dm | 36 +++++++++++++++++++ 7 files changed, 69 insertions(+), 10 deletions(-) diff --git a/code/datums/action.dm b/code/datums/action.dm index 04d9c706ed..602dd2c37a 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -301,10 +301,7 @@ /datum/action/item_action/synthswitch/Trigger() if(istype(target, /obj/item/instrument/piano_synth)) var/obj/item/instrument/piano_synth/synth = target - var/chosen = input("Choose the type of instrument you want to use", "Instrument Selection", "piano") as null|anything in synth.insTypes - if(!synth.insTypes[chosen]) - return - return synth.changeInstrument(chosen) + return synth.selectInstrument() return ..() /datum/action/item_action/vortex_recall @@ -827,4 +824,4 @@ for(var/datum/action/A in M.actions) if(istype(A, action_type)) return A - return \ No newline at end of file + return diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 5a597f7280..84e5910731 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) /obj/machinery/announcement_system/Initialize() . = ..() GLOB.announcement_systems += src - radio = new /obj/item/radio/headset/ai(src) + radio = new /obj/item/radio/headset/silicon/ai(src) update_icon() /obj/machinery/announcement_system/update_icon() diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm index dd7c5b15d9..4c46d064c4 100644 --- a/code/game/objects/items/devices/instruments.dm +++ b/code/game/objects/items/devices/instruments.dm @@ -108,6 +108,12 @@ song.instrumentDir = name song.instrumentExt = insTypes[name] +/obj/item/instrument/piano_synth/proc/selectInstrument() // Moved here so it can be used by the action and PAI software panel without copypasta + var/chosen = input("Choose the type of instrument you want to use", "Instrument Selection", song.instrumentDir) as null|anything in insTypes + if(!insTypes[chosen]) + return + return changeInstrument(chosen) + /obj/item/instrument/banjo name = "banjo" desc = "A 'Mura' brand banjo. It's pretty much just a drum with a neck and strings." diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index e04501144e..1b9cea37f3 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -254,12 +254,17 @@ GLOBAL_LIST_INIT(channel_tokens, list( keyslot = null bowman = TRUE -/obj/item/radio/headset/ai +/obj/item/radio/headset/silicon/pai + name = "\proper mini Integrated Subspace Transceiver " + subspace_transmission = FALSE + + +/obj/item/radio/headset/silicon/ai name = "\proper Integrated Subspace Transceiver " keyslot2 = new /obj/item/encryptionkey/ai command = TRUE -/obj/item/radio/headset/ai/can_receive(freq, level) +/obj/item/radio/headset/silicon/can_receive(freq, level) return ..(freq, level, TRUE) /obj/item/radio/headset/attackby(obj/item/W, mob/user, params) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index ed0d0d02e8..3b15c47bcb 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -146,7 +146,7 @@ aiPDA.name = name + " (" + aiPDA.ownjob + ")" aiMulti = new(src) - radio = new /obj/item/radio/headset/ai(src) + radio = new /obj/item/radio/headset/silicon/ai(src) aicamera = new/obj/item/camera/siliconcam/ai_camera(src) deploy_action.Grant(src) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index daaf9afbe2..074e637120 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -10,6 +10,7 @@ health = 500 maxHealth = 500 layer = BELOW_MOB_LAYER + var/obj/item/instrument/piano_synth/internal_instrument silicon_privileges = PRIVILEDGES_PAI var/datum/element/mob_holder/current_mob_holder //because only a few of their chassis can be actually held. @@ -27,6 +28,7 @@ var/speakDoubleExclamation = "alarms" var/speakQuery = "queries" + var/obj/item/radio/headset // The pAI's headset var/obj/item/pai_cable/cable // The cable we produce and use when door or camera jacking var/master // Name of the one who commands us @@ -54,6 +56,7 @@ var/obj/item/integrated_signaler/signaler // AI's signaller + var/encryptmod = FALSE var/holoform = FALSE var/canholo = TRUE var/obj/item/card/id/access_card = null @@ -84,6 +87,7 @@ var/icon/custom_holoform_icon /mob/living/silicon/pai/Destroy() + QDEL_NULL(internal_instrument) if (loc != card) card.forceMove(drop_location()) card.pai = null @@ -106,7 +110,7 @@ card = P signaler = new(src) if(!radio) - radio = new /obj/item/radio(src) + radio = new /obj/item/radio/headset/silicon/pai(src) //PDA pda = new(src) @@ -296,6 +300,17 @@ /mob/living/silicon/pai/process() emitterhealth = CLAMP((emitterhealth + emitterregen), -50, emittermaxhealth) +/obj/item/paicard/attackby(obj/item/W, mob/user, params) + ..() + user.set_machine(src) + if(pai.encryptmod == TRUE) + if(W.tool_behaviour == TOOL_SCREWDRIVER) + pai.radio.attackby(W, user, params) + else if(istype(W, /obj/item/encryptionkey)) + pai.radio.attackby(W, user, params) + else + to_chat(user, "Encryption Key ports not configured.") + /mob/living/silicon/pai/proc/short_radio() if(radio_short_timerid) deltimer(radio_short_timerid) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 55f4bdd65d..7751632813 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -20,6 +20,8 @@ "universal translator" = 35, //"projection array" = 15 "remote signaller" = 5, + "loudness booster" = 25, + "encryption keys" = 20 ) /mob/living/silicon/pai/proc/paiInterface() @@ -50,6 +52,8 @@ left_part = softwareMedicalRecord() if("securityrecord") left_part = softwareSecurityRecord() + if("encryptionkeys") + left_part = softwareEncryptionKeys() if("translator") left_part = softwareTranslator() if("atmosensor") @@ -64,6 +68,8 @@ left_part = softwareCamera() if("signaller") left_part = softwareSignal() + if("loudness") + left_part = softwareLoudness() //usr << browse_rsc('windowbak.png') // This has been moved to the mob's Login() proc @@ -256,6 +262,9 @@ else var/datum/atom_hud/med = GLOB.huds[med_hud] med.remove_hud_from(src) + if("encryptionkeys") + if(href_list["toggle"]) + encryptmod = TRUE if("translator") if(href_list["toggle"]) grant_all_languages(TRUE) @@ -271,6 +280,12 @@ var/turf/T = get_turf(loc) cable = new /obj/item/pai_cable(T) T.visible_message("A port on [src] opens to reveal [cable], which promptly falls to the floor.", "You hear the soft click of something light and hard falling to the ground.") + if("loudness") + if(subscreen == 1) // Open Instrument + internal_instrument.interact(src) + if(subscreen == 2) // Change Instrument type + internal_instrument.selectInstrument() + //updateUsrDialog() We only need to account for the single mob this is intended for, and he will *always* be able to call this window paiInterface() // So we'll just call the update directly rather than doing some default checks return @@ -306,6 +321,8 @@ dat += "Camera Jack
    " if(s == "remote signaller") dat += "Remote Signaller
    " + if(s == "loudness booster") + dat += "Loudness Booster
    " dat += "
    " // Advanced @@ -319,6 +336,8 @@ dat += "Facial Recognition Suite[(secHUD) ? " On" : " Off"]
    " if(s == "medical HUD") dat += "Medical Analysis Suite[(medHUD) ? " On" : " Off"]
    " + if(s == "encryption keys") + dat += "Channel Encryption Firmware[(encryptmod) ? " On" : " Off"]
    " if(s == "universal translator") var/datum/language_holder/H = get_language_holder() dat += "Universal Translator[H.omnitongue ? " On" : " Off"]
    " @@ -469,6 +488,14 @@ . += "

    Kte~M2aA(zli?h>M-I`+khUfbWG%k5>+L$A)>_#UTntZ_)i`iSr= z1#H|mGB(cn_U)S^`VR(E)Y__2&6+8-@cg6~V;w5CKzMVO#UwmD+?jt>0dNVNs<*{p zPnB*wKi{>OdheIT9b5F1N;eIq8&0RA#l?;2CW5LCw=HjK7B(~zjdJVmiu0-cnDdNc zeaAUkmGw~g+~K)I@EUjM+WARqNLhwrfOFvEH=UUwuW!H#5#VAZhFwW z$jC@z2!!YPR;g7}bueMM7>zoZbX7Q-eN(c8MuH*myWaCpM2KSMK8XA;`@=Q6DGB7d z(IA;?B#!AmBV+G5J1MVXXgwlQq^FZ&DeCZXUBHY7Ot3BRJ>+Z*@_Xyp`sXczUQj zBfnpf(}xj0HTUT~4zxeKGmlsZ*^^C%u3u=WbBMBwD;}&2oH3qY9F|{6FMWKxHAQGcy@wXp=sYDvbs8qB zL%P_eiR({rObWp{z08VQZ}e^mX*LotbuRm{VkUK6%jfQ!z7T$Hy0jh%X>IsOuV!6t zrGi`fB0BxG8qWMCs=x^;xX^-aX;L8{*~@AuEY@fLxrzH32Oc9$H}zHdu@!>xd!9s- z_EK(d>-kp4mb(Yn&l1(S;=9WVhRmY6!lzyft%}bBa#B243D3}_L*aRYdv}FaH{ZQm zBjWN;wmJPD)VVmrN%KKKvtr(Adm1b(Y0P=3ja7YZ@~`p{4O(YyN@txS(UF#kbPuXsR@6A5G@K^8_0 z(@noGH5!J6S1I9&^H`x|0Zn|d?qgKTqF77r$?T_B}k&}Q{S&n3(wJ=4o}bMj*zsfV#o&;C__)W!Sy-<6KIy`;#bG zr5FpI4n!1Oy0){gP2!J|GZOkBwt#f={k)BGxCsK;Y6c@4ZEyg_C%w+?I(G#$n3T&_ z{$`lzLM+s^6mdb^r%@iDqXoP#-dB&5o3gjK_UaVKZ5JS-eX_xNFl=wyGpDA%U4JwMV$KYkoga6*Lj97HH&T^*iIhk86|P3pqgWlQ*?Hb_xj?5 z9mTN5_t1yEn@fsVn%R3w++?3;Kfqb1xnlutZhT6miv|W&$GxLJ(BWh4Inq(uN;T20 zAC^f~QMSf$a7su^sp|gv#V0XYJ^bqm;Tr(SQ+vM;Yh?%e+b+yrp`iT!*Y)j9879S7ScKbEE|(I*wRdTT2WTL_K=^gy%nN0lw0YyLvDyZN&I2bciUAY^0RsRw-pi z21`k7idss%+!VDbQ(8{ltNOgKG&b-$R(M%fk#SO_u8ua8l6?PCk!7R?HC#MBf}iN5 zC^+!Cm9*8wubEHt%WA3m+7}aOxnMrnB_xI4pTFVs@Ki>`JNkRp0Ji*%uE8O_$aZ!F zc$$uzwNK(F0tFpk+26Uwub%2RU#Yy=jMjitiEH_>b*IbG!{_P=tq%ZB?##@2#{V^c z`RXs~;(5>`X_C`4zvdwpGaID+Iquqjoe%?N62TitssF%-OJ>;$Xy*5N1;DxgB9Z0= zAh5-P;1$6cM$#5L*t?mZ`02ksI|%OG0;HrCxy2vTM~J)4y7WoMR^C%GUtThzPF;1< zfHNbhZ~u@vkNx}VX+Vy1=K_%U*H&o=BT9>KCidriO#X`~tgmPlTU-f*?tpv!(>RM) zXjZx;SmeewY8~@B49)VhZ3L0Zq%RPuo^U;|tk*Sc>-^<_^Gr(asS}bpI*#82J)yU; zkQ?6}Jn$kLOW47(v<44C<`a(v1&JNYhoWpoqHK)5oRh_s(%*V}KUR@pVS~D~qpzIA z;4d^XbM{JLy&@kWzcWpw!fb=*WMd}qR+#;sV0<9n!WK}ksTO(1JMG1xlae_!hBy<( zD>F2+E!R`5F;dwdR!|Y954KXE>?OWwO$V%+m3es>ccNE$*c*PgpMU`FI;irM4R(k2 zbf zAU~(B_C)W!P;vho+v$$i@4S#Es3~Hi0fa8KcB=UMCz#sGs{E}OqU_53WzIVg3!_0O z6t9xmI52rn;}a`$V%aYT4IvX{NiDds^^L%0eo*=L$=hL4+Whons@MWy7W}29&+A`Z zqtd=ddxCeLehPz41hf|H0A{JK;Rm6t^vHank&_;6&;}ZOH_B0iNQ&^aeg>oNP~Z3;x%>;y*Po;}PdA zxxIBn#S&mKXD5EsdftTcX@V8YzSp7+L^eG4HbiI0k!aA-IDo0UI&cW% zNiY0`5jXs-FmVl=5F{4zoQ;OOA3x_LC`1nD0Ye{+kvpQ;mmamA-w$|&wMto zQXU4hM{ooYhuamu`mZHen&dvh*4ear_J5J>yk@TqWa&sv;RVthhSg?o9b8h3lKczPKI#vEgtgRM*NX zBR(21V!vAsXIyW`Yb>07mkfrIgJePv+<sjRw?`JRPm>jfvD(DlPBQPYKVG@w+=nTp$oq&^s|zo zBFHk|Dk$rCPyR{gwGrS1h0S)xt5IF zQncw;Xw16129P@CPq%Kx@u!2G9zsGxM({Br3VTRqHuTQi&y1@!#|PuAT-?Ms_m#T6 z`^8-ATvy}3KYbyX!IyZTPa!hV#iiPr9FaWRPsz^?dlD9=g`{b29^ni%Qi|P7D*THh} z*m_-Rj~RDI$LfeF@R~*KOs8h0r__jwJQIpvLiY1BGWxxa0M|wh{3f(|6Sg){o5)&g z)(STUIHB{G#Wkq&6%Ku&UnJ+~|BQ`IPQK*>A^>d(NYAkOV2^#PplqxX#lD?VoO2e> z@1i==7~3r&mzj*y0b4kIIzvDPB=C4DX^$}?Af`Qm%`k(G=0)?iSC`6bsv;PnAI0P#hwEnHfO{how4+PG(26ax8onxR-Viu%1LK~PZ$ z0$VfpG5SRvtxA0UD~o*xu;)tq>yCbzUoMn+PjotH{2(KhIO{JK@DkjueIB<`!n#N+ z&2IFh?Ii6=U#gyAFEtcC+Mw1(EA8z2+$h`nm+gv~7z7!GXNpwQ9|bt2;*~Rf7?@iX zkXTv=A84n@%>xkh?RtboZ~jTu&rR6C>ocI6AO1fp68YDSo?Z)h;O#Auu-V`~RU5LH zpx>J2UY;bOiM_s<+T^O++5C{Vr5KVunJf)sR*0KXrNFV+!*w|eBJ@Cf&1t3xwsIEk zr!i!U+QXd1OiUsWZ=bhybhP}ApgYB<>FWB@Fq6~dxo|=9d4lTA6x3J8hrPbZ$<`jS zs60paUf7lKCx}uU(I1za>}ctk0BP*w^RN26lDyS& z3C-mT-#e}XVsz~lrS;S=y1EWr^VqEoXlU*!xA2tL zyjUBkSBq;FdpV@_=Z#=Kf68cq;j?GsyFGaBKw5p`zIGWzc$zgNtTGI?8)YlBE+T?i z>jKw)#+tPr#%WK})|16+Do8zeN=G>)r?|}0qJT$)ED-@|UFa0kGDrF0bTm;Hlxf4- z5`QuRXA0iE;`pkqrF}B}!f)Sh?}cH_G~>`I@zV6nBhxjVjEHSsZyc9qS2`cg9EYOK zguM*z(S{4>&izzWr(@v?I*OcKVB(xnnf_C|cpa8VS~-5DK=71UeS1TBZxw4jh+IFr z_WK)CmcA;=ls3S^ETpiJJb}la=-0psa%qRJc<)iISj%U3ZHX6C!;BNP|33U#U7n|= z%@=Mm4Dal!6-!fAl%mg6wz#*f+$wv=pfyfZGjSW3UMOE?P}pzHPb(wf6>|J1{N_b6 zKAg1qbMIj4L&Hq^->aY2(T`{1bAE;MWkQH0UM6j>X!)*Z)qE~EIfOz#ZH@&~OMQ6j zxYMwUggW@3M@SaWu#w#kbvdj}>QBjf&mjZvdi`@zAB>_F?;UqOA!>ahVdMnHcx1j7 zyhZb*9yRkz@aJU}6+ND53%?=?ae*^~$=qEQiA}e?afcs}`3~F71y~+vW)#)`3--%k z{?`vlh?kpx8$JoGd~NXMXY7iQkZ7@FEQNed@nIhKqX_i0-|8M7wiT9u6!rFwwu?#B zRg#2T$Uasmn^&d!B7fKA+$$?c!rUf>_?o3c%d~)tW=q1gp})bM_E02xru5Q zL@^n(_|c)tsVMCQ5K9A+A|aG~2Z+N`X@>f(3XTu#PLsPmFZ0Mb=QwSNCX2hLhm@8M zY~ogymlU;GN6=y}8cparGQvzA@QrhO{*(1XYGIXcM=(8l|Js>PQeK?TFRQwO6a{|e z6mx$CX~(U*Q9w#kp|t}kQoKtQVpFy5`@+H-koSIpCA$N`_YB(0z#^KN@`CU?SPatr z`c+Kp3#FL7-y2w2nw-xjYtAU%{SmSD=IzbN2AL)6b^IOF)yykf=Uqz6-tZyGVFQ63 zJe!CEPhl%stE17{sGrm4f-p*f(}nv@CpJKnH+BdaK(TV-@rul}qBPdHzKUty<~cD2 zBZSL>HmN)4Hn%r}jMpAOwNT9C64Qv8L|%4>8$^LTq!4zDzmyoR-V()JWzwpGdP^Z& z3ZK;a**tU-v4UtXiAWu9UW{(uCiOKKx59Jn+dy~=j1X2J(R1aqYcA(69(z#4UErG| z)Rf9GSUu6~vGM)u&1;yK&H+&4XJ|kum0RZ!u0qKu4~veDFU@&TJ`s-bh)Gv896nd& z*#A-=NU+~jt+jJE%&o&_rtYTxWI-nF5`>n>&kUu^->1u>$*yq(Uc|c#E3_m|J@0Jx zR;S|C+o|0c@EIN8SvVbpmuhuPjau&rakw=GZfA;~h$$jK8(BJF+?FU&36M)5=lm0k z(2{GH8#ctM)&?qPscf-lTZ$T!1WpZ4gxUe^TA(8KYld`2qAKxQNsyo@$oVWP?2RCV z8+xR8MPf1HKuh6*5$)UdEic}|xBf&CO$c`V2g<-$Qy0WI(0yr7(z75905`4B7Nj&x2-zjlw z1NT}&_WFXN)CQQtc?il#p;f(K*ElrsO2L`=c_<-{pbeOgdX#E(VNub~qx`APU+GI- zx7CK~^PT^W0AO#^Gvbq`wK4vi2c8pv!FKUaq0N(>Q39=O2qGyR>KTJV;|{sq*2U5u z5d$aQZ`_&HyKUAwp#s!qop2D1*`(`E674_ZnsolSZk1DSbH#)T_5J8F2^tz*nzd)N z11Je%T#0l=UK;Hhw<9o2^*%y(&EKE)f|!H&3}!&u3b&pjjMV)IOl?e^ZP|1WdO%8@ z4OgGP<|R0Y!0!iVD%rn?j(6$ns#85?EZe8Q(7eN(oPOo=Xf?LtW4sf=b#@zt!csqu z!)FhtkWA&m^<{`dtCuSHz)IQ=h=M{8E!1in>@Xp5D@kp%IZTJNylMrXKXzg;^nkeiW?4a#6IJuR7>4B35T&UmPy^(k;fhCC}wpzaH5& zLWd^sbdC~c76bQ2tK#SfY)=Y>taKg*8sdz8CyIjn#IJY>CTxyx&7=!4fxO~?sZNF% zJ~P9BPJt8-h=;5bSaot^cmHa&m!j)m3+G8Z)SkTZ93~k)%3h7Gx@iK9_ii3ac@GUVWsa zPF&9|FsgChoo6FV8K&TPMl#WKp!%yJbjgVq@2TGi&KXc5=!iY9)^N%U&a3s9E?HRm=g?M)sf>XH*zBF1)TOyuRDKPbQ6( znZ8&vcF$BaUC@`$HHU^qdPAs3^j+`i+QeKvf6XQD@g#B29Wf{+WSn~CexfK;f_=S`yhMIED4 z4?Mm`_!?{Hekpk}MF5y>xqopNcM@})7t@QyxT3(U$K9X8@I7d3*iFb)HQtq!ec9b; zeMF+#BP++SLOpnSjIIMLMvp~V5lIkSuSZG)jKex$Kcc5*L;r0m z2#0dvoMFiYY3FA?#3Nle-85;fO+iut4NN5z@`sWdB(1#WfWUH-3s|k{zdPTrNmbNSR?$ zr3zhI&^)B_6v?y6Z>pLJfuf~CsdR7i2O(a>`JeX|SMS|FW@uxmy%kt{izhvBU!Pwy z5V92Xc-FXR8>nWQWU}9zg6|D^sK-Gq5>zHPSBE4(H^Ems=i`DV#2@cSJX|fBwl*_D zyZ6u)>70NeHW(?WJ&c__Z}AC#r5NNv0-?t z<)12fZN8^Ya^(N9#N&<|7Ssq{{#{|C_|$-o4PP^DhE z&ujDF%_#qGiL4|0iy)f`pnAc|linvnkOMOX0utV~z>TcTyuHh!vx`pxLR%;GE3y@3 z%!!ACZ!%F_i^_X8-=_vqG>|W$UvB+dl=vQb>1&jDqvR<0ghI>rwK3Q(|u_P;V;lK;O!`;(c)C9AHox@J8N}P zrB(mcNL0Ukm?ZT<&{jE+RuZyBwXo_)*uKvb!Tl_z?qg2Sthe`W$W)rN;PK!Yrw$R9 zfkYvr^s8k#@=HTcc8~8fUI#UnYf8Dmr6NTP+7hCNa?D(je|G01b(4Rx&Q!ZB_{odf z!f0>!f1eakwhO4{)+;^J%Mk9j%KFa!>FDDfZ$!w_#vIh0OrW$ZN_+9_Pt+K+(1`gkEEbb`?=xxN| z=N7V%QJxNPxmNEdGj^*Nz%r{s7o4Eozi7!|U(@buJ!zcDd>ohKS4y5%bX+RWaRDT5 zyqCq~>lO#4kkdR{&4B?@NA4acxy3~A>lQ_80uOqLBq9V%{~K%a^d zagTZE@}q-Bc#Ht1bctVU98#M!8MM5;SN#Y0Z6s*9s){^zfCL~`vrSph&^^nu|3e-B zC$_@%HSAr_JD?Q)6Bx>L)9GnjxgAg)eo~z{pmo%C3nEQo0Y|Z(`7HAv8fn{cQiu)| znv4Sb`weWn+5Y;$O+`F^)YmiTpKE~RU(vspE$zjq6Y0D82WHN%Hy6Q#H5*C7rWPPj zgktpnSS~^FB_wrKLq9 z?Vfvi8te$d$HW1N!gFl+?uFt;FA-`cE+=ls~ppKnF1{qRb9~Xl|_WEnS zP%w6cI+j|4_H$Q_2D@F~oZ)tV&wW_oh;|=Tr0wmM#Z2$@K{gE+kK*n+4;o~lT-0gQ zQ~jyx_g0JfGgZcy3J$XA!`(j(z2#Lg0DdW6gmr`!mbp#khKzizV?11KW(im;n%QdZ z-X2+zlsQO2ul=T36&`0O?gdat3Zyx~yB@!WfFeB!&&k(MrRW3R3hn$IT#!+$rq(D6 zi%NzBY08C@v+_?J99G-@yb-RZ_y`TI*bXT9Ym9Uh^D#qjw$Nn_RI_=Q_ z*nB_a?-cJ!gTN?KYxWPTjy5Xp4 zI3Ky%Q|J0@u)jNOnkYK%FT{@&ElIAC4^*^(p~LjtxP{!WBmak@)24cYJWOCKZRaD2(Yis zO`hPt&DNAsD#e&rpW%6HP+aD*I;@50c;xiR^KbnR(p*t^f1FB~K7>Pb|Fhr9F+IiZ zv8VgrYt+;>;H%mx72kA)mQ$6(vqR-JX)bTJ6uv(I^Nd??LU6}KfB)^E5s1RLj>_5- ztFXNX{_C~Kt-?>ZWSV73V?)SuDd?TaV<+g7RcxQd_5e_YEJ^{IGMm7SMh zAt_pjQ}*ahW&DtMOKT=x^+@T{WeNyXF1B~c>xseTv@6M`4oWcj?jq?dY95Ed=r3Vj zpoC8uCeM#*mfj=xYD%dVEfV`44hg@@1Piel1>cPa3n9KhZZOI5G{ky>XCo65%D+9k zq*`>l1ZHDKT=G`!TL4-by+z-I%OVx}$|BXCUG-090hL4Ae1Q{l<6f66CwC#NU>?~FS_pWQ9oGmr$esT47AnYuM{A-trq2Ion{Qmt`x{#yX!0qNX)Zbp-8Vd;L8 z0BMx;?J^}qw?v!;TAzziZ!y_am6Nb}#TM`)PoU36Jybw9lluEUFFz@|Jut+=8YsQoyluoTVLsACb$R>-MSvi} z8;R&z0h-6eqy#(QVFp~TQ?%IBzm5oW*cC>qt=x@)mMotF(HCF+zuEp}yVG3P_Vs+F z=$WHK@}&TDarg+v8~gFwRrqV(0r?+Y-W~0&%!sfLMCa*~RdZB9OZjzHMl5G5B|@b6 zGTZDR(Ay7yzLQdc#-JG=O)YUi`Gy{yH)@Lz0Vi?C14OHX}&rcni;ySWym`EG&@+8$VEN6?u9jvJnH zQqDeATat-N$JxI|llnjr2XogXhoAJz)w%;w_0%Gk)MuE8V+F0=jE;y;Mc&+X;I8b0id!cHnRoaBAzfTOd)p`8Cq8KAAg~TE$hYhO|Z(Mx@fR@J9 zZ;VajqoM3m++Q!-Ubx<`6RDXHZD9F{HSn$@^A`k`X)CJpS@=TxDlZo1eGiRsG$Ly@3e3UBM-#i~dl@ zwAhK*1pd9rjg$Wia7i_qxMmsy!`7GH{`T?H9oCn%FGf)?m@iuS@EQ%MOi-m!DZ0S+ z7+nWDHG4tO_LeF@^Alp+r;J^0ul;dt;d5CZgD?7w1BT5TAQ(U+2nG7u1eUMs_JEL& zMh2;$OsT6FH9GYxB~KSdJ+uFDh=PD1iin5`h)5F2aWEhmBxi;ol0kB2Fd|uo97iPyl5?B^6v;U= zz#usdVTLp?;cdS6cX#i;cke#?$L{hx{hV{Ed%CNu>r~bGR2{-!YAVsu+@t}4Ky)g~ z&vif`iutqS;st;bJc>vJfzDS3=oxuExAnB~aCqb8;N}Vf`DJ9Lwz{IEuP9FJ8D7MU zU$T~QA667sj0_W;KDyNQ`IgGa%N*%jQwOIfwO>XgU2d6Qo8xM^E7h=MM&EVR-Z4N9 z!W#sgoY2P~&puR)$X}msf_W<0^tN{0 zLND*xa`H=WbFsa9&2x+HgP4BT@3;G!q8~>?y?({*A!3J5KWN@CPWC`oM2PsfF!P)* zZgGAETgaeFG%YNSzc}0xE+@$OMw>8Bg9?q#?22LZ)7oHV`l0%QF+*J9!P~3X?V&A* zp6XHRL9K^6i)*bhx&h}$=n6v-y3C`Hr_;|kMpdZ$R%73e8p(8D2$6M&U&*Ce=AU|C zt@bv%e)O(=DeP*B#@kHeDjl`;YwjY@3kq+E$W-#%X|4gFYGC5*}YFesZyr_ad}jQD_Nh{;r3?7w1${#z4+2QGj*PIgD zyo$3-u@13mmf~$RCY+6W&UCpA^h|fN_tkGV#81UPogyYorsyJE&LLMB#n_3@hwgJf zk}Gh?b@+Q_uqgk2j$DLvqDap?-Ri+px&WeH9P1AY#n(RquBCq4(0_HI(D2^~&|C}k zYg1m8V+S7I#E#D?TLtw+Z7sv6H2K z)#vKdHStWTv_}SYx|Z!vMk5+OTq`o479Qm>d1R1QL?v#qbwweO<11e{|SyorJl3oLMk=VQ#DMA+}(;dRg3)INDSJ@r@m<(|~toiy#3 zmJles#2j3pep{M1%5S?>kJUY3adMvraK_Y|MuX=iWi@4{H%`3V z4eoNosgEu`ugcDNYxJVXIU#>G@Kt_fd0cvk0Z0A1-2u?qW2?t_HDmd0jJv$r{YLFC zOh4eb6VgQcJ*HXmVn6kSrtGC=A$jPj-kDk11K&pP$Ra;#Gl4*NKq}9l==o(}W`q5h zm%owr0-x#?e!BDSX+*@$me7kn6S@#h)3^tE#bfVW^hYBET1QCJCOM&rw+C8PW$iJI zT>3Bfnmt~|>K8THoBkY|jd=R`o?{{N;8#lR^P;jyuy|$a?AHCeud?joi6JFUrL&nD zb#~%bJF)}4TLG}445`Ey#=RL*zj_Xh?4*ztTH^$8uOE1yuxA+Em4;mVWBYBjG;M;< ziS(Hl^>iRsv8f0@RCh^^ENwf0eDQZx>E2Kge$S78pHNX@WsGxjn)r}a+SQ#_>i97W z{94_AoM79N^eGFhlU=cb%t`zUCKpRCW6xERou_wuT{yN68XEh-b~+t6j#T(5{-fuL zUK*>&Yh{=qVKyF?6G&S0Qqi%swN)u zcIc-pq@#t9$kwCw%O7poatn3xpWi{1<% zDMvr1-r!al9w4J>REA?ibdl-`0;Xvh(T^Ip8FTez|nx9$rd> zvY#rJu+7Vp4M79UFTL8|l))h=&xTsdulF}i%Pil<50&l=Wd}&I5>;K5T68u(PblJ5 zhuw3-u~g2y328_8ni*WI7Z8a) zu2TY#10WSHB}6N#Mm9h%cIh8d=hDhTwH&3OfIwnS0%I8$-)U&>^F2hF+fglqF;scR~~`M&7H`+ zOnhKvbg{$0VXbkC(q$K%8kdTe+`fA^k+bK}VdAKInGL-)v@+34=!&`C^CG$|9?pw0 z2&viHP9VScJnE|pS|B^S9h_?37)GE`F-x_Hv#EF%cKC^`rf~*Qis7W~YYiE_ML+EZ*Jt8OYN5R;*q7L30n_P{AW&%VM~&r5 zx1hHm%7Kb4}oX0D9H zy-vr7sa2DAJ*Y~-CZ|=2V9-gX1Zv9UXb^^V}_nNE^ z+YPX*F(-*zNY!L!x~;LR`!VwE)u$X7$X6>CJ+9VhKlZRg$n}&)QHnH@E5}(&d>T`v)rOnhE}~MzRc_Z7TVmSLcMqgp$** zKJ?xS?ex)?Y!Uf!T<6u%vd1$7K%gQkrEuSGiI{;TA@1(h7l5=m@bz)iFoAb<{I zS#gkPY+Z23C6pI_@ZHkdQ3_nEm*EjR#`xyGxKc|9 z#jy~grUuNS^tA>z(lgo zve*w%BeAg2&127}eMve>3hPu?g4}E3;3UtoOnARRNFM7A6n;G$y~6tC4UXIP*1`16 zw^a2v-=6pj=4A!*859jhTnh((GAJ^#5=hSe`t97OpspPFyK?d_b}$xna4lN80~n41 zVlG;4oD0F?WZ)xTBX6NAD#Ky59PwDAN$$1PQ+mQUUzc}T z9Q5F~_6qLT$$Cbr*8OC;$E*8GHde{I&Oj(Ot|SNC=@_qV!;E9n?yJQtpMJl;XJRRX zMz73QH|^p&V&RtGhwPJ-cv8wB=ilQ+UiT^smKGINW$lzcyJtF%BVq<>3Dg`xFB20J zc?XD5tRkXTPml2*tw@XJie>xnYRyZ+Tte1WhowZ|>h*4>WtUx68xlxLElkt{Z}|iu zL73IXZu*khk**SIBQ??f?U;7mdf`Kx7^4rq^B+?p4hxwaga()nyz2O=E)D+{JGCZi&Q57V8NiQVGuU?WQ?M z&=2Mwa`Ve(&_q5(egCQ`7uI}b73c6^Y1J3Ov;2o70Rmw!?R=p6KN;P;TnnHAfvm6< zL2HfW*tbW`M;w-1>s9XHQ7ku7SrA{pEu$)}A9cZN~tg4IeB~&GR>OJ;j>TkZ`N4ZaUc)u@dnsBQG z;HMY^4BW5v@m1)w)HV(Mh|km1KhV%pf!)`V(;t}giZ78Yq&@|1ErT+Hl#*as2Q>T6 zx_H-;(%K|)eWx9&nxDU8BE&GAc>;$+X0NV7mC~8DVm`ST`L$mwM6C15J<6-SePhIQ zOhPXAqoLW|@Zc8EV6jH(V?~CvS!v!n=QjK}mdr>_mS>4OIV3uFKXwu?HQbrrQB9vv z)9H3$8!s{EGv9MNIb=cpXlRfwzJ)cgP6dLTwegLO4N=3$#9 zjhe)hgG8>e3Agc72%^`*5B)Zve5;l>(m5uSdwtdy-RGB1c_Gxbq@+YsH&0za6dr-dB^n9_cU}$sh**BpO2a5C#6K7jAlOHMaMP|G((rTI002>(@XxEEw z@K&>sC700B;CtA>Ax+^gveSfZUUZ)WY)?eH^*1ul4RFXi|J_zb8=RsAJ=@}T9^!13H*-!kr-zzwG;H6=;1F86& z{#5)cEUBjy>1NArhJ$Z*cXuzfuk0+YbdZ$NIZojTr)3>NXnWCziH+x;IqKyw9e`B6*7&m-6z6iD{zLK0ZrKG7?GLR7Zw!9Z*9DQ@bI$J% zSISWy0@1`|(!A&P_bB4M8iC-ADP+GytAo8Nt9VYvrzIq4xy@_$AG_anUdDzsZz;*Vd%pL3wT4kCPsV`sYW!fc{U0{WO^0b;Opyu({6Jn(SDAmb$oZ$BO!$E7a(u4V}3xs1D4xymr7!zOX_Ns z4`zC>GWuSC{qOt+SM*bJk)RZ=^@d>DGo~{e3tx&`1dsF>!b%Pd2bt@ z9AbWAu^ui{6^i9Xy^b{yL{F15pH4w!&mR*-%+WpepQx%wjt5(xY>@+l+ zYrXKq(A$5K?~a2XCOjfpF8|EX!kC2uHGes2jW*=}5>imP8Ppmbq1@oMt}`|^ww?}i z4crvqo61@+F|CZ<*0)~bQ#nE$dyLq?jf}%k9FQEk9g=||q`_)>nNydL5mVbLG*^@Karq43 zfjvX;sXUZgYHT3g=g`J%W36@M^{LMj4Qb08U{dsw-qK26diDBxcF`*}9dq-{ zjTQC5uX&7bW-~4YY!=rRMJY$!3s8m^zCM1GS$l@4EiiJ%$4;fZLjWjDmxDc7x|~6h z9K|LfC`Gm9@8gSX$f8i_XlEANYr*`mHh}tDN2GoJMcD4{c2GW3bp#RP#>1fSP)KOv zZrCkrP7~NDl)x5H3<1k+`Ui~T_Dzr>0AqAc`1cp+hQB^}596GF^8Uj5?k@&I+1sSI zFS8c9-j|MF-^#A0I#q^!nkaH`f8}L_I9T56DzGEpJd9?O&>XT)z*2d9_{dnc=UU$` zvV%Bvt?;_4q#y)~=6s~2KDAP;BP3FXkoP{{wDur6r9xnz@LRh-eB=v>unOj3XuA3M z)n{jCr1tZ^3Xphj^IQtA6&F;@{@JHsfi3B zn#jK91iM#xR<0bBH4+ar$kb{1a4E`$pPwJD;75>xFW@D(Mn0`>I4|+!q)$WWcQBrc zl8YEp+&f^=OPJJ(Nk)ip%^-&^%nDT=AlM$u8xZ=|3r{~KHgkpYeWGO%^bcV5LJG6{ z7gY*UXBwu8Wmk99y;-McQ9Fy`@cbh~ztopkWB?H4={2!GdMYqkp@%lsB$sEGRwd-4 zC_wzXP4?Yl0Dh&=Ijok<^yxX!TO&BEIv>Ts0nlWr9DYlPxD{e6sqkZ6H0KL05-DXq zOvn09%fV0YPsRWEeo_U)jbUJEV333xG7T)MG?Q~rs3(;qvWl1hqopzb7SQ|!r6+ce zO|$SmNgb|K;w^5uXN{|hfdizjRQ*eJzvXD zSx<3#YSzN~DY*CN6Q$gv{!Qz+o8HbVtGUf;$q<6-hEa zTXjVPtyi`9FL}$o?r)k_9_|rBW&knq;J0ZvBvI6^|6o=c%oJXGa>^2`^t3P5);~-D zGCC~d!n+x8Bi6U=Y3)Ao-R+g+M&H^KG4O*27t248dT!xxWak4uivn{_Vu;ZLd>3W_ zyXT6cp%v@7!N)z5{{vY+&u8P+LP5Qj9VeG;5%AVhyPz-OQ+ZdaCaP31QbvMUBjNG!H zi)v6HFNuJH_1xEJFjG`iJmW{eceOury2?R!yaN)5 z5o7lnd@_z*9e@j|q=`Df5((q{@*}z!>Gci2UKJ8560PInQcQnaX58d8|82vng3s@3 zr>LU{^ZtG9PK(cwP;yv8qpgGli(5rPy6W^Ni|A-x7PdLJ$tAi6g5y0u(O>ZUx?^&u zu-<(5#`2h(y@Gprb-@}Q=Qfg~lFTC{-gL6@vukTU;5d1H;zKI37BZ509lkD>ykl}I zQtBoY!e@-IGjk~o;$ENTuVtn1R-t9%uh*<8LWH zJrYSa^QxaiH5r#HB|ELlxD^sOhNtY{dGAjT$1;)Ib_Q;xwTF!`d72uR;hdg$=;g_U z*r1V}Q%)<>>+sZL;YNOlie|SV>^7bHGio;x%I*6x`1)QxzRiQ~?vq!H)BQVORK#Pt74-@RxALv1s)*;y959Tt2ncvU#T9 z@@!GwNL-tFbdl1NqctmA$Z?F8{E!l=)@e0{{bYABcFYDI4C`^Rx3_<(t*sq7Oos#U z^ST!f0Eok#0{;z}VD?Y+?1f;G@C;#}cNLFYbs`b)fL7`Jz$4o20)|ujxCy_bVN1s8 zpF#rnOas);##go0v|#NH_KWR{Q(Diyhc+@!w698ov-7@V5`Dn?l#Vwk@?(Q^x5Jtk z{7hqS!!U8sv?Dfg|5*M_H_cn_RavG74ga)(D~f#7mU4T)ncTJ}-S3-Dee%D(8*+-t zZ+%Z)`@o!xfZlw0j4v4JBN5ARxuZlx_=1ZM@ruxX_Sg5P!EnEY@PrPM7xC)#*mwQ% zBftDx)@o*ujP20WBDc1^Ox!aW>dDoR)AR%04YxD>#!u9En5RkM94kFn`>!jpp@KN+ zlkrWAN~nLJ?s;HA_MdGYO@HZD{K12w@!OmHb5v6UR1TQ(Z5RWnQ|lvaA0B%&U?l2f zQBlb>HP^5^#)9SK0DXbd0IKgU02bez<|Y;wKmW-wl|+pPg%SXO;}{^tx2G2*{7Ty6 zMBQ3Cbz{870Ao3fNJZj*ZX(b=xM&(ceI%$Kv@1wW$Rpj z+(MrZ`udA`5Xe-v>y_N>8iUAOE%x=;l;)A}(I;Z6dwm?h960F4IUpgktNFhT+%eY> zxiedPu&x|=!8@Y*iGNS|rt!_0ck=8b2|ujIu^Re4L8WaLfGLl)oh1EeCe%b_RhPA& z6sH82Hy?Ns$mbL~&SLiG_u`^re=lY^RDSp=8^4ZP)Xys4yLVN0^trk^_In?#hPtqj zqjSQSf{2?MC9s8SeYBkVk0Wlfac4}D9(Mh-FQ4f??D+n|T_yf!&PK#ib-1F2V8ZU2 zF|CG*N;ua#faG$i0LYQ)@Kc-I59i2W>$v9(6QiSRlRhN!Sw=Q~nF!=#O`!4vsiPU> z&Y)9#{QcWsde0I=<2a;TiQQxJIJZpEDukFD9FLy>H}?dPyorHaxYDUndpWY(+t$Bb z81^eZ_xL#HjbuygO(Op+xL5l+*)V3?Y!v6^=TkH_`Au zyOcfkFNm=pJ3@}Fn$YIK@TmkWPMK#mt75RPF+8vwAb;czLwe}ngN|O5zzY=-^vkF*dO4?2vh2Bz4@MxJFp z?iWqvpH(c1Vnc}zc4X_u5AQkAK>~lf^b01WxXK4=@zZD)XEhBCjqd7r@XLm82WtOb z3qY|YEFp9I@cGBR1^q0C@_~tA?JVu~rj%qK<`R}_ALcScMx6SIcIO_AlhPBVYdDiz zR2cn96v@6#k^#^Msjv5aDwFZjJlmT2kG=@rSF*Q?G3f60+4B-b`f$Y};|E zkb@3%JDeyd?Hta}cth?0S)OzMQ=Cs>8~*7$=x!>mG7FY-y5r>4biY$6>c7s2Wq+k; ziE9jLLUOGqGhjTL?!S4<_+REl-!O}UmJ0k=x#wt4w^_jMP51HP|Mk@XR@n@gfF*X# zXOy9?&hrIoA~6-?VEyf7T@orWUkyf|zLzsb*gQGvtRqf1JMPl}D{L+KI$(v($CuEz z^f}oqd84izAqb$GA-mvivGkk8t7MHn6trT?4Y@h-E@*(^SBq|P+JP2#gi?IEcTZ{SfcSihqM*P=T zq^nHz^`GnOGuq*yR)fXRx_lCC103utO4j8ml`NrV z0RmfI@zKoM3y-I^cl;^{Y1n4`i`TGbq#MjQ4yYEu<>q1KFrw>KBRW1O9#^gd2C^0F z{j#kUOP5qe=Vq8SmvJqw=_%(9H>VpyMN=hAz!(vyyukFp3J8V=i~WVfSP-nKGJz~- zcwc{^9B;{}TJ_*9hP8Kt)GUab_7`nql}Og80ymb3s=;aG+R2gAG@`ShKJ5c(N#-nm zQD>lH?>N4sK5Hj)ZRK*rOi~yo&u(lt5u_IQ( zbEQ`pI8^Wld&$up;5n0!-M5yA%;1&*6>05ZhkR~99&v%n_5o>3)e0&zgCp|B*yyO& zHn@R$YN#&Xer9C%@2||F_gspLS=Nj;auWmU$QP@1ULECKXdxEx;@=L7hyFt=k>SRD zXtua_lrD3Gtdm2zx_0lAACi~v-^=cT-M6cAdBT5tqJYKhD3$DV`-cf1~Q-m`0C4%46GzS3a9u@i(?IUiqlK_O-584EZ~Kn|MNKql*dQ zHl-qD?T+u4qc^5YBkDiZ(kcR)YXmWw>I3Ie~fy8 zm*JR_Neej0&&=$5b3D>dI`sX zDU**}hRd63LXfUu?ZK{K1dn*MEHSu^Se!$R<#zDLRrGh3KFUg7R|cCZgb^16dCOQ^+`%o zY6%vRy)G^!IH1=v$q#`5*i)W*>UU}m!h4`y$O$4A*mY?zp6U+hI5LJ=w4B-eQDoRq zy`x}L9!gyE8O;iLslLTQIWyG_m%xU_tjf&Eui9Rn3@LpI%Utw@>C~X(b4tW0Nxov4 zpGLFSmutSZIO0#t65L*j2E4mKck`8;gb{)ioDSrbAY=rjt%;EubcZX0dd5WlpOPQE zC*Z+AQXl>w6o>qGoA|8`-V7hax%WOkCCp-u{TlBs-NTtF4i`{mK2rKSF^nQiB zlDCj8>9!YpaKs4@6mbSRU~yZzqv)oI-F^nH_4)75pzA^mf|b>R#h0o>f#gU!4927~ zoHjk3(D5lTQDwuWEr{{riqH@9FW5<2+hpUu(qeNUFKj&Zs1Z-AQ;Xbs+=D{iKUjr` z_hJX2PaH|M$x~f$Ael1W!N>QjkD=rlzBe`C>9CQCmhy(Mo#q-oWZgovQ$#6QnWX@a zfc$y?B48y&mk9#x`xw5txvgS`#Ht%PeJcC+waQuBPdFOjP6i)NtSpPu?4B{r+6z7| zB_HQP+UoD@GnS3&Ax83Y1=D2=n_DgR@ScOPQc^)<+Y?wr3OY_odp-?k48t8<7n2K z9y;u)T{mF*MiUbxL0Y^Yd;*86;C>K6Ua|uL2?zS-jr{0V%}|e8z#Uo2SJiBBWA^F zC3{NsP{$iTL`WwL>_{>xV5^io2)}t@BkKFXH!VfvnNHCQO7AC6VbM;0tJM9g@a5e* zMf*={1e(9Ns0qD74bx85{M+zXRauQeBzLgE@Iu~cjX;F*`Wsp$V*NiA^nIg}fW)G)?+`CD5d* zf?KVy`EUqSGa&fc_n_S02b*k6J+Xogf`4%@?jzjx)WRLs($c;dz7eA8F-$A^MIYF) zcXPQ!*{or?%(HqwQ^LE)YPDevl8<+}6igFfWSlzQo0*>CL7ygLSW(7sTv5?eH9t)i z&bt~KJ>ipRR5bbt<#$+TU(PdOP`Sh&&p^vyPj?#g%~4gyO;oFgF^~5@F63YQY#1IW9Cu< zcE^Ue!x?w8ks3j>U*odsE1x#xIBeAC-LK7unC0j!yJcPT?kI(Vfw;k3pXFgrhs zs-QQAXTAT(oYp_Tgd}Bf`LAp#e-DB{OZ@fBj$nJD!y=v`6IgU-weA<4o?6yrRK({h z&yJV`r{cbBg1Dbf9d%B^@#m|S9;XsY?*k7^DGGBrnwPHWnSzRT%1_?d##r55f-t7?$5<0 z@?*|j_=0ZG!i#4IHGVSVo4s=eiVt)39BCOgT3qwGnw$H+ue>8hIo0F!`O6?y0#2SY zaW?5-Z{N2KEByFH!|-tH>k0ElQIBn970%v`v7fTxKq$*R6;W+mJr@#a@JESW#@Xl3 zPJRN;&|%#YH;W81mOvkuk%$u98asdDA6NlZilL!z&oP*i22Rr;EVP>I$S`u-QbHh! z!c@Ln5_-%DAwFrq7M5{Q z@)BEsKIRFKGoZGWeh`UO4BP|ImqCgU`~?Pt^j4Yg1B)s)fQ!jz2}086&hD;&w{{bz zq64wN`7I%*vbCew0c2tU)aDUD`;Qg1El-T>O%o@u3U6r^ZI8QO{$_TGEoskbuIy?)aGmYp_D0q@v;3*!Tp5Vj-CbxLoxj;odlGdA{A6|7r93Kri)XX$# zo4U^Zm@}kTPSSF`gxB3=&0CNW1_!eTB^QQWvOrmcQCG!YvhclsNa0I?;f26gyF_06 zxsiGp6dag?+%*yU+CsbYrb~rFr4Pj(dBa~Eehzv{#2hO9PC5^rBRPlax4Kj}VRU-p zkntD>($G*B3Vqs5!COmY(lLH6&@&;Tv${>DU!k6OGGr_2`>SGy|0wYzFYnJR#~ls)uaU^f$2`kyOJ9S4 z>O~n;2=aq~Gc*iSq60U6cwFPbqwbrw%dOU2(%8&=J7u_hxGSkKXi;KwmwLgE?aW z^RO~$qa?}qxg-fap6+^Hh#e2qSZy2e&7Ym3g&e;F!03l8+(y78Y^rfhTO@d6`j61+ zoFg`=s$!-?HHSMO&`h~bO9(#8{SPZ(V3H4*_InJ~a;RA{|2}|bin^rTHmmwEMmS`C zeKO&-6bJ&jeza&gvs;Wxx4wz=OFmkjbZ!o`>c)Nf3r=(N=Kgs$M#$;9BN!`wd{dL_C(1HBufushtb> zDNj1KaY5B+{4^}BsDM^fd6nU38yuvA!@WB2PI__+RGavtV$=N2Du-!N-;zJ@Adg5w z4D;e#&@tudCyEvUC%4}~xz?X(w&EnnBeL&i-uiU>&YL7CP_T0n@(G(*fpmYdyZ?QB z&Ww{-uAa}mw{i>gMWzUG)c{~*q|#1nb2)hvkKrBPAKIP^G0*D&fev>K5~RLXOAOh& zaG^}5w%3uDKxI7}{w!JJ+*FhdER5R^W z;tk8poS-#n;46NuK37m7V6#sPs*k4JzIT}Ok{1H%48BD*+x{l>8pw+wDzx#2JpLl6 zftsc+^6yzy(``UKhR4JBs`4#SCn2ggK_2ITI+Wfl=2uGcQEwd_L7jBWZ(k6&7K zL(l@{((0tva-dv#oZNB;9z^yT&;D9F(=^mSZPahgZWLx_8Wx0_Gkd9{^Bsup?eGI= z=+7)9*#L`^MJhOw25OgAqPx^~_^7#%brz>-^WJuw!ONjhoAZGRrzyY)S1a-F<|8Z) z?!fM>LauN06ZWa6cOjC(ii^?Yvg(6VhC8=D>fmS<@>nwWvBeXJJh+edNtxWDbi#j_ z^o|Jllr?+zJ%R2cor6cdKZFwq*EcO4XdV$)vx0<6l7Q#?&&iel6(IFL?mIYsbOBW6{Oc24 zi6Mp5e}kfchljcr)z$g_(H+eSvKN99Etx(gQQNri%c@OU^W(%KPmJ_NpV3I=kXe4~PFbKWWIZzw~>=j@+5=T!q z=*M&GtEJ6UHJRvCe}55SOeS*#`!#d%0`PyTw0Ge@or2HzOMY6@GqeSeNTvq_Vr@eN z587QGBvY6!$f&Z{LR?tzt}$HxwDxN=^IB;RTb^d-Mv)))>`O)s=28H^rufR1ek=Yy zTXr22mF(0FjhN~K^GutH4r{?iZNTOX0Q>dOi|ElEt8y5gS&j(M zR^%#}oRb#ap^fopRJ<1KNAwC@Zw+o`Yoa)(D(by4nn$25TFS@J8Yt?G0HGhKp&Bql z;cc0XW-#XX9ETAvsCRYWSl!)|-IMioYHNQ6R1aL*dt;yCTwdO-&)$DO9%A{vr)7oQ zxemF+-(r=!k}d!^UWVglH@P z%y3$&jQq6LQ54nwO?rCv_=4XBFS3SW^Tjy4mbvL$D%@|vgdS~VZd;$fb>l$OSD2DM zDj;73_^wS>vTh}I>Lc=&TJ8=%%k>fKoE9j~`6@=Y6XKv!3oqx~{^=Pk8yL=X=!Q~t zk;eMIm|oaF{pKKzoiYwFMQH&J%A(A$$)2PCf4-^ZlUS>kmB-)EyO4!nr4&n-X>J$* zIjupUHc^uA?^${LmJC5%^@c+Kzu<>Y*Z5vTwp=F5o}9HyX1`;{ z6ier6Zj9GGgm5g=-bt1WP2>J0t zEm_RW9_!dxvz0e=FO&i<#=}1S^?)NVAkZ{U+||rYf?USr>G4<4#eSx^K}$Y6nvI-j zh!1AK*xlckQYeKI$}I?k_P7;aDGSiI9u(z;ppMJyHvOj?O46H7(bL56sQ6XJ>27)@u=;Fu zq>0pO?+`{tkmCD;LeOg6xJ7xOTuJE@DUbc!h0CILw}yU*umql1=I1xW((G5azqm?I zetzykf>9Sa0M+_m4x@?tFW_H3T1HB{x2&ld0Lnd^++T z=hSkX`J6pk>js{yqWWfie(R#{e7zNUzp0(4Bwz4Jcve88CY4-NuWv~L4XyVeJCa_G z10T(6zf|28Og|W}r78o)?xQ7c^dS)1D0$Hnq!R6D<*MD&0rD$fA!6`*9?o@wEtNDh zmB)X$*^PNEw2k;|fL!-A+4?kKSpLP;s3AY0aukkqj&^iplZ4;dk$+i!P^#AGyWYgD zWlw-{!+2(q;w8aN-v@DV=o=KPym>8G=Ynu_JKHD*kn!gPxN5lf#kjTpObZp~+hDiq^V56ff#873} zA+bu^m)+AVr3d;P&ar9Z#`?IV~SL;hiR2NmN{t3;20ybIrI3 z3F5Tb?0bO$pdXc}zuiCn7PeMxh~{2M8kReSVz;XUlbLRqqpYKWr#8eTu%Cc>Zx=SHpg z^I8CD$w>X$&~u=13{e!F3Hs_yIJpazlDf!e!meE=;eHuE{xdt zQAyaa*BjIJ#e+bnR6)V}nC#c_Ov*{U2=sNT|;7m4yT7eJGC)uD?K zeSpKzT#jeE0@c}J9;{Ubw?-H!<)OMYR}2-G^nWwqueopH!-HGH2@xCi zx`@ns&T}jooux6;ebk_w3jdqKbVD1R`}^n0n;awY*Y^JL57z*HP?$Z!snh+|NIMb* zVb@rqRzhCe0v^uee0_I+a;fh7SR9*kY)Cv_pHY!-L1Ges>Cfa)_#bg>$~;hi^k9;~UFSnc4P>l7M6Azjy;QLraX7ycc1h zN)sdLc5yD2@A{#C*^*4J66yuuxA(w*Bc@nTcv-W2JRr|fRzb5m$%d#b@BI3;q})F@ zYy=x@9l9|?mD{4?IHiGxk+V}{K*Y1>pd4xgY>yc!v9($`+bYA&&Ha#`XL0w(#RD*ZqD!PAPthIxP0)@s{aXcD+-X~GxI#y9^x(qq3&3!P!4H{Ir zLBYu@g`J&_DWw2yT|1=U%+*7dd;cut)<{}{zEU((6>LP-N#cX8)SoFai1fTdbdNser zKXf9`FP*y>dm8&{5yqChuwbogX6Bsp+4vasES`bORY@JU__z4kb4DA)iT)x)Lf~iA z1M7PcAJPO^0o=M}#&baK57O1dK+3WOBx2bTI*7yVP@c*5X~e?9+zOj%ZDIHG(Z(Zb zmEk0T+%A+=YzXmO>34=w}e1DX&EE5nQhwh+#EBw0ZzhorX|B6e*xeFct9Ma4c3fRlwX*j!ADZQFd)gi(neflK$>(y{-s8x aWQIQ>Zm)4~Ru(|OpNgX9^OC2Q@BTk~r~5tt diff --git a/icons/mob/landmarks.dmi b/icons/mob/landmarks.dmi index e8ce4907db90f473c978f603744a36b873040fae..284809da700691cab9a040b3aa778d65064e0021 100644 GIT binary patch delta 8422 zcmYLuWmFtZ6D}6qLU3Dx1q&|0-8Ha4a0tOQKyVm>JHed|!8J&5+29`B65QQgcJIFT zJLlf{G1FCD(^WP7bWK(F>NIlu81gqpz|I%^!9&i<-O|m@)x*xk841ZdCpBe61C<9? zem?hSjd_B%Q=6?Q2{BK5w7C;+UR0l&u`p*5F#dy0l(=5CaPyGLjJ<^0Y^9R+yR+Ub znVq#Vci3V5rG4Gz9KG85L0y*IhQ#0XB)m9t>^Jo}!c@$nWz26K!dZ>M$r_&vfu8$x z8I*Dyej?yCD^kYdxczw~kZ_5+oGva2}W&OVDWAl7A=b$oFJi?{az&{r*e{U}? zC?_%E_A%pKdW2s@lsdHu#$u}3(wUM~S=En{ZSj+vJRi9w+`Q)xa>e**WxI0t%MJOp zj6m0@!cex-@VcatTg|N22r`EE5g>veZ>`vwwieAbwPz4PrSgedY>%n}cgk;qY&evX zex`Ekq77ed$oTKYYmI>cf{*GJ6^@S|yF~3(x6vGUvHQ)oXC*y72gHn03zmV%8~LL) zHRH6z3SKu8xje1Ug=sxzTdW))`_gRPYgCZz+!R5X)Z83{M?%n0B8xuX323l6M&26vf^LNZd2pv{h3N zHq8f|9Cn`K9hytOV}5+WW>&Fp&?`OOiWAy|85b@ULoU>G{+SH zNBa@Rw9HeW5FgZ7IBVZxsStP2DKIX^{ttr(k2mni+Zp=o*`EO7B4bX9SKSq*Z$nbK zp45u~Uh82veOrF875P8|3oE}~G{w9}%f*jYu04ci5POJtOG^g`Dn9)y2Q&w0Bn@3Q z^Bz3bht|`!_dfwY+b>l3;OA1_Zr<5T@a3;_|Gu9*kLL*MM8?M#mzGA>)$t0WEV9L= z=jN*NQ|%gZS$wo$*(|C7NGd$c!Jc3|I_nl=K9iHX_v6U9W_8rZi_wM?UHqR4ZF0Hol761Aa@svH46!z%n zwS(YYRYSwsMOtnlOWY?#YiG2LoVmx};8m(NI4>e@U3;3-ll|cPN$|F|o>n`{452zM zQ;Gqai__H4#{UtA#c}H=C!8%dSCPo=zdiylHAiFn+B)TKp!Z?#*x?D|cOm|9UI9^O zy`vvY4QnGO8PJ=zBt=BBV2O#iAi>y7J{xQ|uD!>(=a*A_C3+QBJENK1XBItsAPQv< zk6)^=@m$e?VG{P{oW!nj-3m0LmuG8TA$4%w3O%fJKHd*4A7AWJdpmow5G)iJ>H7j6 zm#F5`I{Rj5@!-QmU9|mEn~Lg#OBO_YiK``;&wTLRgePC^o@wChU3l$ zJ9>mF=vYO%cGJls8%A|-X)@e0T(@S08|XwB8p4TtGDkV#guF?K*V|LK23Q$$u`)Cx z%arLs*pm*XNmAx{0~f7msX~`%fYtEF$Y=Vr%`BmJL!=6tMDAAL@Xdd{Tt^)f$enarj6N^(b}pb~$emPQ)G&obqno!Sr~lN*RVZ7r1cQki z8X6p*Aim+tW!ocMw|t*B(CQ*^^T&Im?(XhfH+r#j4`o$g>=hMOaH2iv(*@2e<`0k1 zixI9nwhXd=2eIB|`xO4Wj$`^}0Zg&f!by^vnKIJS$e;PF&&Gs+)xlj(qsCZC*m(lw zh(k_`g{rdpc+F&O9sFwudSc)@3YCzv<0N!jp!y*_EARa0k@GbSk~tHV-(i1u>TZdY zAB@Q!W2i_S#br>w`^YmnQzw`o!w8mvs z;^F#LL}7~|Xle?cCE&oXtgIZIo=vf^>HkT{h5reOZC>S>^_&yM4#-B@Rjs&;dQ zL{>p7$&(B0pKJI{-5=Q&?C(VIlTNtH4RpLs+3Xzj82~;lmd}5JbN#f-!SRNNW;&n4 z7c3L7r13`bja|rNp`7nhNWwODPxAAF793jLcQt08f9CKgX3)|}gcl`1ArukQgY6c@ zW*A%&&0hSd1knKIZCYCWO^C@!1wpB20Dl79XaFAD5~Bol{pyw6S$6?(qx~AmY z;dFcS0)iA49-Mt;EnAjJAAGt)mQvk9N2#p;V?uUWfb5gLIPj{tlwMF$L)(^4I=Dlg5ERPV2oYb!!QK^eTC z{k7KLP8=XE$w2?$fczZ+EN{lusA~ipq#^q za4Y@sd1jz>O)HITI~f8=NMFl?V({pIiW?i#R!^Tp)nWpQ9`TXR9y=gs=b#gJmV0N` zK6c9r6VS2VCD2it*8TA?KCOF$(!cFaYs+2q60*ELm$@$V2y;pEe8Xh-(b6(3aq3F>qvpF* z{4weEB!377J~2{7lKM&c_#Ew%(cFOF!5Dnj(PxJMg@10qy$NV;xpe^yKyJH#a+SEyPLu6v@94O{n$~oofJYyq!rEqSbPnK6 zrl3>nnKwDSR?&ncBz@ndL-rQyZDL@4H%CJVA~HJq<8TUVQ!JnvAe8|3JO%#b>|7qO zv9aADMiQv4t(7qca2yDa|89HpK3PA&$L2AvE-vh+ov(^{v&W!i!z#1}Bl{0QaL%OS znI(>f0m&dg+Buwh3C;J{1R+G(zR$F;nXJ;vVW|sGhnl`!ZYa%^bym~+nBIHG+uf*| zmGerc)q&DXDoRR(t)BbzF8W~ITAxenlFks*pJW#oGuf>`pw}BadSpGKKBpO&>KgQ7i;-V=|T>T4J4shSXjZPKL_UL z(+3BYczJnCD=Qh9nEF^TnUENKZ<%ZIy~dZ>SUH(@hf_T-`KlE)rl8de zs-Prfs|8p?=yS_aLaP?RxaRv&9Wn+3JDVp@4wsnZJj+#*#i5~S`I>TQ0hGnrcMlKR z2CVUsgTteY>~9o#LWzQScz9Cy_m|z$QQE$2j%M;5V@s)O4dMm|%5%yhj3!|rmDJOx z1Am+*B4$wV*uXIUI`J|aA9X={CYg9gH+E==91ve3!FxqSgckJeWO?6_XTP?!HS6hc z1J~aM85av{{g3GBmi?&555;}mr@6S+I}_}6o12fknSV)w#-tJht2m`fd#(Aj7(W;X zA>1nduC&{Vl3yT5BL7<-{!qR)-4zjCVMna?6ijQTk+#|vp3u*c;d7H}vwRcs->j$r zs;Y}w7YuE&AU;JQ-N1zTRb?ruAk~-L92~gN`zYfl&c3&+lD;W<7su$jNc`k!hR@P! zYX0&K#Xl+tMJ!d-F>`B+m_t<@g>lVIOmdOVF4~2?{p?DGaK=_pT|k?9h^cr*KwHw< z8cs2pd%yNkAXn6@n>&yZ85#Mi)87DiAH`yX6xd-W%s$<_a~uiljD{XYL8vfre$pI| zG?&a*pnOMLfxxcbk&vWrZEtU!f|TqJBz_AJ&IV18P}xiEMdJz3f$e+NDfpvCUM*gA zGY=mgBGjYFFU7!*EwQ4T(|zlut_%NRwZf1^A9OB8}Ki#H-XiKbst>sn7V}64AJyaD88+`E1>siTP!tG z#8L@`1P6r~zw846gCIomy261KPu{NIN ze><9-vi+tfH|ld>v}KH(0Fck|f*LsVkx9F_4N)zzh(y|$2y&1YEDZAkwhhMqPH75z z9*dam!iEb)FIk3#N4cJ45Y9NaeWnVgtFi5&Z<3g13^?oD>BJ}*y527y3&?t;%~6=b zICaPgAO-i*(RU;)s?P$>F2~5E>qw-79^h#9m;T z{fa7j2Yb|f=XZl-Gfw;alStfOHB6$oV z1lny>bu!hMd7*HiZML(afU01=)Yhy5Q(xOw^kJ5t10wtb%H^Q=c(L3!Yz;$*wduU) z=AMYi55bsb=ZH16uplNOc@G9Nx)9KaW&Dm6mE+Q;njw&FQ(a);JPY6|3 zQ6U-)HV7ZxB8zOSi*+>n+@Zl0M`qonrmdYsNJduTOAMqO)GyD~zk#BxhgmVg?*wYS z;tS{&Apd-Cw*I+5Uug9~(N?_3*sUUY6Z~00kQ>nS);Or+G4ZKobs;Ktk4w-fpgl!W zw6VB;cl;GG@u!BX)@_Lf>#*?$G5Pvyiw;79y$2HMVzm61CQy2ws%517zv88IGNtn_ zBwf4*y+AIW%Z8`e#%HZI3=%m^_(QVk?^4;4X$$^nbBZ_x4-p#jx34{5EtC1*8hoyk zWt6NoFI>pnFIqhIi55Fy#;qPvF~V^pK@s3Q>&t^Tx-@1j-jhTY)(1Sl4ByUEDpZM0 zijyxdMELw@`#||vq6{|Mo-aAfTp(`wX1;PTE7zK>VKFPg%}ehegTv0?UJ4 z&vr=EOAzY@vnj-i6wLnqj1b#rw$;)iL=X8&!mdY1Oe}{W+;{&l2@2|6Gf_}Sg`Nay zCNU&V(3~l|F%q@@wVP%O%GQ@;l~W8Qq}NG~UE=kw#oRJp`I^!)hvT#*{-()#l8G(;x!4&)+Fm?!LBZ1CzA zt3SiTBk$U6Z7)cm{%kv)T+)IcqcH+|TlWt7dH+(Yfl!4+` zOUA@U-)xTr*nw}F6<36IXwTiPJ~RBA+WjitDwW_@*{G91Yqe20iA4S7o+=7pV`sNC z_xOdIUx+|;p;>!r5}CuILwvLwfq&AGpyJ!53Oop--`IOq_@6D@W0-c)9){~yN;9!K z7z~ctRe3DBoQVvMAmt#Q3%fDb8;Cb@V#DLE5xE~?G!lGtR9m4S;HMp0Qz&b-m_0as!%-?3WY*d?J)i7D6p1s zA&hN_6LDwCbtG6OUkRvfgTvA9-M7HZSQSlnNG%G2Qm(EwPX>P>HNM$9gJo(JrTfvH z)fI1wN;3)xR_5Pnzy5NJ(Z){{8ed+-%p!GLx{g4W!trdkbw@5$Iv`H)yWeVD=#ZwW z!|*@cc_dKcPaFwPWHOg_)qu(QtcjSIzL4XhyQwp4vfAXWmH}Mh8v(rA{hz8o|ue20MPK(pH{O zBJ|NGHIQ!#3b#cUueilK_ia0Ooe z7&s)vM@HXDX!bju!D*#q5oHSVVfHX*&_MMI*M`nFC8{#p^dxDmzPiS*k3v%VOPlRy z+15RjS@aM6+>Q)KVlqU^*#mr~!Jwybg4*(Nbb5~|2jFz2L&`Eh5V|f)S59Dx%HWjQ znAE|{@*ApAq;pC&!+|Zqds=4wcn}bBH(z!|daUGDjOF`q^>T{J*WlHwS3KmnZfLP_ zajBvfQ`2!d5&^w=tbKLqyYAM#vD%AaKk?{({f{UzbP5)%N)WvE+Ng}EtmNqK>6x_U z=LBXIbq>r3(XcNrx93+n{7i0EwO{?RtFPU^G&`6q@V}P?CHr2LjwNz8I56T`Yd)h=)375|$AH_2r=IT}` zdtxMCH*RThm4ZRXVI?*-4y!zMm(e~C`#?#{VRc*OLBUwwyXY!E=zB0oJqj3ka5St+ zLs*%9SihL0pJ@Q&5XVvJ_zr1r3hPSV86F!of&0fO?ufsjyY*K|)Qm#_%g0BUIXTMb za!240IhEgKMNEzPm4$@`=OgNXLbDVqt!L8pAJ5@;yxsCJ^#9)mF08l=PCe)Y$Fc;n zh7au7Dk==>t>bns6Fkq`z7c(tIo#7v9KKGOUxWgZyW^1E5iaN!qEn!)Ka;9yTN3ey zT{Y?K2G^5qzxgv!P%}CVeE5)|12eJ@wwG<+8Wdprn||`X$H(tc(7(+tquv|Y?%#Y; zW5C-1qycXv*7AR++Z(mc=^9{9qRD#k%+Rh5j$6R?x*f;}#F8T&6S(No)bC_P-MSF-aM!ajsFY2 z!u9TG&)du-p&qYX^Y!T%3phyuL&mi2XCl}UMO=+hlb{c)3E=T?rHqFDa5f=(i}F!} z@S9Dy(TU$)z8@Cul?9?J+MholP{-1|fhc<{Z`C+x9HBu1DvSjo%Enjx-5rdw9!2J5 zFgt*Hc1q{j4JcioW8+|>dCf*7OPCFfHHcWZh$AZSuFMBlVg2gni|eK0S8p_2*M1|< z{WSY&(COdedbChWI$j^^G1a0HV4(1}!CHW&){dkBoHhHsx7cdNjYLAxNd(ROVX?kj z2Oaf(zIsx0UlgXf#KMkQ^x%yMY~S+47n3qraH&PWfB=H$h!hqUX58jEcF+ulsAuKo z6L(Kc?63zkVIY#^iWK?jr98CEjvUC;Ry$g3mQHlaLQ2qkca=nufzLaKs0Y^%+0P_m4|o-Q8X4lglCuTD6@r$ehhe5T#|edd z4O#$KFNYq$nWaeEqB@4ORB-!hq6{bhe=?k=6C;YDxV^WDs+9Rh4O(1R7hgF|H}35N zyb{FRN-B|3q$qp~s2k|OJ=W`Z=i*KH)pNnjrlELpECT1g>-JUNOBenLV)my=$iL8v zbTA}!>A)k_C;h~6Xdo$X#q*9~4jI5pzh}t^t9vO<2)dQ7NGnXwWs4t;Zyc`WluZO) zr|B!zw<2X&o;BQSerpgug$hw@N@_>4E=qCW?q0+XoLOQ?$4C^#QByTn@=rxVLOb~H zaOsTVYZldZ&hZ*XKRN`PsVm(GW86=6)hl`Nn2Yvsdzzd={9;cpaS2Tq2axgV!Z0_i zLk?PtQ|9ooz(GgzDnc1=DdHIvL zyD|8*hd`1T+vWGSLCgzmKy_;#(Lj(_`_tn0k_pbNi#hRIETK+Vt2ACq$WrM{pXKC3 zUr|ykf#u$rr1c`Z`bGE?gwif+*NK8AUSj@3ktmpCVPs||0)aH)d?*m{TM6;qYUYWb z?1;xs{qD-{B+5GrqQQ}o9$S82x~si3t%_G}MjBHjiRIS~*83%VOS8E4Q^A(#ysk2_X5Xg9WH6u6}$2D#D%Y}A@#l zCM7XZ8nLxZK|yiR*%|Q2ORv_0mAv;u69Pya{cG0XOtn4~K_E53%~qY`9IvZjNz+e*+mj zmXWcsjEpSb5a%hJ+r|x+lMD%eBaW)EHkFcST#Yy<*f*QG8F_={0l(-=Xk^dWf9^^d z52^i}Pfkh-1~0SF(FH}l@4}6WMOrgfz;`*3jJH^q$%ctLbbEX7S=D2ee+nI;?SQ!I zy-|=5$S&9!Ow4k}Q`Zd2F{il)6g7qiB%feJySK+_O(mMy{hEI<=ol0`VO975$M*AL1LpZ6=W|m-qgTErsxh@3D~wQ(&yy!o^teQ1Hfnm8X0tXWaLVA%25+d znjl_xx0KfF!2-d=G5O3CLDt#483)bW=eGC0+q}Bh0x6~~YBoUaoD2ZPtlg&|Bp*B) zGkY~rV_N!a72$riBj@ne=w(hDo&SZTQWmElK@mODw z%*w6k&84+8`D6vz1b~^32Kk@P_WW%PV*P2%lNzj#12I+4nZhrr7oe-;CX7|5 zgxB-vgYWH$(+jG|v+I-P>{`nKUaJG})Og;tn(W11+Qi%Ud84`4SmG}y3bM=K1R&Kd V<%piWG9<*MEUzI~En^=1e*pXH#pwV5 delta 9224 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 Date: Thu, 20 Feb 2020 22:47:43 -0600 Subject: [PATCH 16/57] Update tgstation.dme --- tgstation.dme | 1 - 1 file changed, 1 deletion(-) diff --git a/tgstation.dme b/tgstation.dme index 8f676c5bd1..8c49eec3fd 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1981,7 +1981,6 @@ #include "code\modules\jobs\job_types\medical_doctor.dm" #include "code\modules\jobs\job_types\mime.dm" #include "code\modules\jobs\job_types\paramedic.dm" -#include "code\modules\jobs\job_types\psychologist.dm" #include "code\modules\jobs\job_types\quartermaster.dm" #include "code\modules\jobs\job_types\research_director.dm" #include "code\modules\jobs\job_types\roboticist.dm" From 7889ea0d68bcf9bb3bacb290b4959065ff15b10a Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Thu, 20 Feb 2020 22:58:43 -0600 Subject: [PATCH 17/57] fix + maps --- _maps/map_files/BoxStation/BoxStation.dmm | 637 +++--------------- .../map_files/Deltastation/DeltaStation2.dmm | 19 +- _maps/map_files/MetaStation/MetaStation.dmm | 2 + _maps/map_files/PubbyStation/PubbyStation.dmm | 15 +- icons/obj/clothing/uniforms.dmi | Bin 108550 -> 109356 bytes 5 files changed, 137 insertions(+), 536 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index a86d9c30b1..d03cfcaad7 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -31389,6 +31389,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bzg" = ( @@ -44022,12 +44023,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/misc_lab) -"ccS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "ccT" = ( /obj/machinery/light{ dir = 4 @@ -52193,14 +52188,6 @@ }, /turf/closed/wall/r_wall, /area/engine/engineering) -"cDM" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "cDN" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -53223,11 +53210,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/science/circuit) -"cVU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/bed, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) "cXU" = ( /obj/effect/turf_decal/tile/red, /obj/machinery/light{ @@ -53235,9 +53217,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) -"cYG" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "daI" = ( /obj/structure/reagent_dispensers/foamtank, /obj/effect/turf_decal/tile/yellow{ @@ -53322,9 +53301,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"diM" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "dly" = ( /obj/machinery/door/window/southright{ name = "Target Storage" @@ -53430,14 +53406,6 @@ "dFX" = ( /turf/closed/wall, /area/crew_quarters/fitness/pool) -"dGN" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "dKP" = ( /turf/closed/wall, /area/maintenance/bar) @@ -53461,9 +53429,6 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) -"dOr" = ( -/turf/closed/wall, -/area/crew_quarters/fitness/pool) "dPk" = ( /obj/structure/closet{ name = "Costume Closet" @@ -53493,9 +53458,6 @@ "dVU" = ( /turf/open/floor/plating, /area/space/nearstation) -"dXo" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "dXq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -53522,14 +53484,6 @@ }, /turf/open/space, /area/solar/starboard/fore) -"ebT" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "ecg" = ( /turf/open/floor/plasteel/yellowsiding/corner{ dir = 4 @@ -53570,9 +53524,6 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) -"ekE" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "elh" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -53613,9 +53564,6 @@ }, /turf/open/floor/plasteel/freezer, /area/security/prison) -"esx" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "esZ" = ( /obj/machinery/door/airlock{ desc = "Private study room where nerds are probably playing Dungeons and Dragons 13e, or a place for blood cult rituals."; @@ -53814,11 +53762,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) -"ffy" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 8 - }, -/area/crew_quarters/fitness/pool) "fgG" = ( /obj/structure/table/wood, /obj/machinery/requests_console{ @@ -54030,11 +53973,6 @@ "fHG" = ( /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"fIq" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 1 - }, -/area/crew_quarters/fitness/pool) "fIs" = ( /obj/structure/grille, /obj/structure/lattice, @@ -54045,17 +53983,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, /area/science/circuit) -"fKF" = ( -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) -"fKZ" = ( -/turf/closed/wall, -/area/crew_quarters/fitness/pool) -"fMZ" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 1 - }, -/area/crew_quarters/fitness/pool) "fOA" = ( /obj/machinery/door/airlock{ name = "Theatre Backstage"; @@ -54142,14 +54069,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"geH" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "gfr" = ( /obj/structure/bed, /turf/open/floor/plating, @@ -54196,15 +54115,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"gni" = ( -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) -"gob" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) "gpD" = ( /obj/machinery/light_switch{ pixel_y = 28 @@ -54308,14 +54218,6 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"gMV" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "gNC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -54482,12 +54384,6 @@ }, /turf/open/floor/plating, /area/space/nearstation) -"hul" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/closed/wall, -/area/crew_quarters/fitness/pool) "hzK" = ( /turf/open/floor/plasteel/yellowsiding/corner{ dir = 1 @@ -54636,11 +54532,6 @@ /obj/structure/falsewall, /turf/open/floor/plating, /area/maintenance/bar) -"inO" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 8 - }, -/area/crew_quarters/fitness/pool) "inR" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -54704,9 +54595,6 @@ /obj/effect/turf_decal/tile/green, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"iwv" = ( -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) "iwB" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -54721,18 +54609,12 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"iAv" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "iBv" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/pool) -"iBU" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "iDo" = ( /obj/structure/grille, /turf/open/space/basic, @@ -54787,14 +54669,6 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) -"iOe" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "iTq" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -54832,11 +54706,6 @@ /obj/item/storage/firstaid/regular, /turf/open/floor/plasteel, /area/crew_quarters/fitness/pool) -"iYY" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 1 - }, -/area/crew_quarters/fitness/pool) "jaF" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/tank/air{ @@ -54961,12 +54830,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) -"juP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) "jvd" = ( /obj/structure/closet/athletic_mixed, /turf/open/floor/plasteel, @@ -54978,12 +54841,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/port) -"jzi" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) -"jzF" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "jAD" = ( /obj/structure/grille, /turf/open/floor/plating/airless, @@ -55154,6 +55011,10 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"jUN" = ( +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel/white, +/area/medical/sleeper) "jVl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -55163,14 +55024,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"jWJ" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "jZT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -55183,14 +55036,6 @@ "kaq" = ( /turf/closed/wall/mineral/titanium, /area/space/nearstation) -"kcB" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "kdO" = ( /obj/machinery/pool/controller, /turf/open/floor/plasteel/yellowsiding, @@ -55383,9 +55228,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/closed/wall/r_wall, /area/science/mixing) -"kzV" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "kAH" = ( /obj/machinery/camera{ c_tag = "Bar West"; @@ -55444,14 +55286,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"kLk" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "kMt" = ( /obj/structure/lattice, /turf/closed/wall, @@ -55471,11 +55305,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"kNN" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 4 - }, -/area/crew_quarters/fitness/pool) "kPd" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/cable{ @@ -55507,11 +55336,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/miningdock) -"kSu" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 1 - }, -/area/crew_quarters/fitness/pool) "kWp" = ( /obj/structure/shuttle/engine/heater{ dir = 1 @@ -55525,12 +55349,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"kZa" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) -"kZw" = ( -/turf/open/floor/plasteel/yellowsiding, -/area/crew_quarters/fitness/pool) "laq" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel, @@ -55596,29 +55414,11 @@ }, /turf/open/floor/plasteel, /area/hydroponics) -"lvU" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 4 - }, -/area/crew_quarters/fitness/pool) -"lwb" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "lyR" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/security/prison) -"lzC" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 1 - }, -/area/crew_quarters/fitness/pool) "lAB" = ( /obj/structure/sign/nanotrasen, /turf/closed/wall, @@ -55650,11 +55450,6 @@ }, /turf/open/floor/plasteel, /area/science/circuit) -"lOe" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 4 - }, -/area/crew_quarters/fitness/pool) "lPr" = ( /obj/item/twohanded/required/kirbyplants{ icon_state = "applebush" @@ -55671,9 +55466,6 @@ }, /turf/open/floor/carpet, /area/crew_quarters/theatre) -"lSk" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "lUS" = ( /obj/structure/table/wood/fancy/black, /obj/machinery/light/small, @@ -55721,9 +55513,6 @@ /obj/item/target/syndicate, /turf/open/floor/plating, /area/security/prison) -"mcA" = ( -/turf/open/floor/plasteel/yellowsiding, -/area/crew_quarters/fitness/pool) "meb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/bed, @@ -55733,24 +55522,10 @@ /obj/structure/bed, /turf/open/floor/plasteel, /area/crew_quarters/fitness/pool) -"miN" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "mjr" = ( /obj/structure/reagent_dispensers/keg/milk, /turf/open/floor/wood, /area/crew_quarters/bar) -"mjw" = ( -/turf/open/floor/plasteel/yellowsiding, -/area/crew_quarters/fitness/pool) -"mko" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "mkv" = ( /obj/machinery/camera{ c_tag = "Gravity Generator Room"; @@ -55809,13 +55584,6 @@ /obj/effect/spawner/lootdrop/keg, /turf/open/floor/wood, /area/maintenance/bar) -"mse" = ( -/obj/structure/pool/ladder{ - dir = 1; - pixel_y = -24 - }, -/turf/open/pool, -/area/crew_quarters/fitness/pool) "mvt" = ( /obj/machinery/airalarm{ dir = 1; @@ -55823,14 +55591,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"mwU" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "myh" = ( /obj/structure/piano, /obj/structure/window/reinforced, @@ -56004,9 +55764,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/locker) -"mWU" = ( -/turf/open/floor/plasteel/yellowsiding, -/area/crew_quarters/fitness/pool) "nbT" = ( /obj/structure/cable{ icon_state = "0-8" @@ -56052,9 +55809,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"nji" = ( -/turf/closed/wall, -/area/crew_quarters/fitness/pool) "nkP" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -56079,9 +55833,6 @@ "nsA" = ( /turf/closed/wall, /area/crew_quarters/abandoned_gambling_den) -"ntF" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "nuw" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance{ @@ -56105,9 +55856,6 @@ }, /turf/open/floor/plating, /area/construction) -"nFm" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "nGf" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light{ @@ -56246,12 +55994,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) -"obc" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) -"obd" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "oce" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -56272,25 +56014,12 @@ /obj/machinery/vending/kink, /turf/open/floor/plating, /area/maintenance/bar) -"oer" = ( -/turf/open/floor/plasteel/yellowsiding, -/area/crew_quarters/fitness/pool) -"ofa" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "ofU" = ( /obj/structure/chair/comfy/black{ dir = 4 }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"ogc" = ( -/obj/structure/pool/ladder{ - dir = 2; - pixel_y = 24 - }, -/turf/open/pool, -/area/crew_quarters/fitness/pool) "ohq" = ( /obj/machinery/airalarm{ dir = 4; @@ -56365,9 +56094,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/grass, /area/crew_quarters/bar) -"oxp" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "oyl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -56433,11 +56159,6 @@ /obj/effect/spawner/lootdrop/keg, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"oFi" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 4 - }, -/area/crew_quarters/fitness/pool) "oHB" = ( /turf/open/floor/plasteel/dark, /area/crew_quarters/dorms) @@ -56477,14 +56198,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) -"oLn" = ( -/obj/structure/rack, -/obj/effect/spawner/lootdrop/maintenance{ - lootcount = 2; - name = "2maintenance loot spawner" - }, -/turf/open/floor/plating, -/area/maintenance/fore/secondary) "oTW" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -56507,9 +56220,6 @@ /obj/structure/pool/ladder, /turf/open/pool, /area/crew_quarters/fitness/pool) -"oWT" = ( -/turf/open/floor/plasteel/yellowsiding, -/area/crew_quarters/fitness/pool) "oZl" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/closet/wardrobe/pjs, @@ -56655,14 +56365,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"pHa" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "pHl" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -56721,9 +56423,6 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) -"pNf" = ( -/turf/closed/wall, -/area/crew_quarters/fitness/pool) "pPi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -56762,15 +56461,6 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness) -"pSl" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) -"pSK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) "pTB" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -56888,9 +56578,6 @@ /obj/structure/grille/broken, /turf/open/space/basic, /area/space/nearstation) -"qAm" = ( -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) "qBi" = ( /obj/structure/lattice, /turf/closed/wall/r_wall, @@ -56908,9 +56595,6 @@ }, /turf/open/space, /area/solar/port/aft) -"qLk" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "qLR" = ( /obj/structure/mirror{ pixel_y = 32 @@ -57002,17 +56686,6 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"rgW" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) -"rje" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/bed, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) "rjQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, @@ -57178,22 +56851,12 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"rHr" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 1 - }, -/area/crew_quarters/fitness/pool) "rIA" = ( /obj/machinery/light{ dir = 8 }, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) -"rKg" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 1 - }, -/area/crew_quarters/fitness/pool) "rKP" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -57237,9 +56900,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge/meeting_room) -"rTT" = ( -/turf/closed/wall, -/area/crew_quarters/fitness/pool) "rXl" = ( /obj/structure/chair/office/light, /obj/machinery/firealarm{ @@ -57323,9 +56983,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"soq" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "spu" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -57456,9 +57113,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"sGo" = ( -/turf/closed/wall, -/area/crew_quarters/fitness/pool) "sHx" = ( /obj/structure/table, /obj/item/book/manual/hydroponics_pod_people{ @@ -57523,9 +57177,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"sNo" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "sNK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/cable{ @@ -57610,19 +57261,10 @@ /obj/machinery/door/firedoor, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) -"sZG" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 8 - }, -/area/crew_quarters/fitness/pool) "tal" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall, /area/hallway/secondary/service) -"tbG" = ( -/obj/structure/bed, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) "tgH" = ( /obj/structure/filingcabinet/employment, /turf/open/floor/wood, @@ -57724,9 +57366,6 @@ /obj/item/crowbar/red, /turf/open/floor/plating, /area/maintenance/port) -"tyd" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "tyX" = ( /obj/structure/cable{ icon_state = "4-8" @@ -57759,9 +57398,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"tAN" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "tCa" = ( /obj/structure/table/wood, /obj/item/instrument/guitar{ @@ -57784,9 +57420,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"tFa" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "tJi" = ( /obj/machinery/airalarm{ dir = 4; @@ -57846,9 +57479,6 @@ /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) -"tMM" = ( -/turf/open/floor/plasteel/yellowsiding, -/area/crew_quarters/fitness/pool) "tNF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -57882,10 +57512,6 @@ }, /turf/open/floor/wood, /area/maintenance/bar) -"tSh" = ( -/obj/structure/bed, -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) "tWj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4; @@ -57906,11 +57532,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"tZk" = ( -/turf/open/floor/plasteel/yellowsiding{ - dir = 1 - }, -/area/crew_quarters/fitness/pool) "uaj" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -58053,9 +57674,6 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) -"upW" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "usO" = ( /obj/machinery/vending/snack/random, /obj/machinery/light/small{ @@ -58086,9 +57704,6 @@ /obj/structure/mineral_door/wood, /turf/open/floor/wood, /area/maintenance/bar) -"uxe" = ( -/turf/closed/wall, -/area/crew_quarters/fitness/pool) "uxY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ @@ -58231,9 +57846,6 @@ /obj/machinery/power/terminal, /turf/closed/wall/r_wall, /area/engine/gravity_generator) -"uRu" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "uRS" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -58335,9 +57947,6 @@ }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/locker) -"vie" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "viF" = ( /obj/structure/table/wood, /obj/item/instrument/trumpet, @@ -58599,9 +58208,6 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) -"vSu" = ( -/turf/open/floor/plasteel, -/area/crew_quarters/fitness/pool) "vZA" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -58689,9 +58295,6 @@ }, /turf/open/floor/plating, /area/construction/mining/aux_base) -"wpR" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "wql" = ( /obj/structure/extinguisher_cabinet, /turf/closed/wall/r_wall, @@ -58753,9 +58356,6 @@ }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) -"wHU" = ( -/turf/closed/wall, -/area/crew_quarters/fitness/pool) "wIG" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -58831,14 +58431,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/pool) -"wXa" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "PoolShut"; - name = "Pool Shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/fitness/pool) "wXl" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/camera{ @@ -58909,9 +58501,6 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) -"xgo" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "xgC" = ( /obj/structure/cable{ icon_state = "0-4" @@ -59038,12 +58627,6 @@ /obj/machinery/light, /turf/open/floor/plasteel, /area/crew_quarters/dorms) -"xsO" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) -"xtO" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "xtP" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -59062,9 +58645,6 @@ }, /turf/open/floor/plating, /area/maintenance/fore) -"xyT" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "xzd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -59152,9 +58732,6 @@ /obj/machinery/vending/wardrobe/curator_wardrobe, /turf/open/floor/carpet, /area/library) -"xFB" = ( -/turf/closed/wall, -/area/crew_quarters/fitness/pool) "xIa" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -59296,12 +58873,6 @@ /obj/machinery/suit_storage_unit/rd, /turf/open/floor/plasteel, /area/science/mixing) -"yfk" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) -"yfL" = ( -/turf/open/pool, -/area/crew_quarters/fitness/pool) "yhz" = ( /obj/structure/table, /obj/item/folder/blue, @@ -94095,7 +93666,7 @@ aiA ahn ahn grc -ccS +anE aod ahn apx @@ -94352,7 +93923,7 @@ uei ahn ahn grc -ccS +anE aod aoK oyX @@ -95123,7 +94694,7 @@ aaa aaa dFX wWW -iwv +dqb lCo ohq wXl @@ -95378,17 +94949,17 @@ aaa aaa aaa aaa -miN +uEx ulM wcR -oFi -oFi -oFi -oFi -oFi +uzs +uzs +uzs +uzs +uzs ecg jLT -hul +veS arm fHG aya @@ -95635,15 +95206,15 @@ aaa aaa aaa aaa -miN +uEx azm -oer +gvX qWV -ekE +con oVo -ekE -ekE -tZk +con +con +eVJ ujS aqs coh @@ -95892,16 +95463,16 @@ aaa aaa aaa aaa -miN +uEx stF -oer -ekE -ekE -ekE -ekE -ekE -tZk -iwv +gvX +con +con +con +con +con +eVJ +dqb qeA lXE pFX @@ -96151,15 +95722,15 @@ aaa aaa dFX lnk -oer -ogc -ekE -ekE -ekE +gvX +wQg +con +con +con fyS -tZk -iwv -hul +eVJ +dqb +veS xzd sJI jJg @@ -96406,15 +95977,15 @@ aaa aaa aaa aaa -miN -iwv -oer -ekE -ekE -ekE -ekE -ekE -tZk +uEx +dqb +gvX +con +con +con +con +con +eVJ iBv lZK fZm @@ -96663,16 +96234,16 @@ aaa aaa aaa aaa -miN -iwv +uEx +dqb kdO -ekE -ekE +con +con uSC -ekE -ekE -tZk -pSK +con +con +eVJ +wHk ewu pQp pQp @@ -96725,7 +96296,7 @@ bAv bvj bCO bDR -bDR +jUN bDR bIn bJC @@ -96920,16 +96491,16 @@ aaa aaa aaa aaa -miN -iwv -oer -ekE -ekE -ekE -ekE -ekE -tZk -pSK +uEx +dqb +gvX +con +con +con +con +con +eVJ +wHk aqu aro aro @@ -97179,14 +96750,14 @@ aaa aaa dFX jMW -oer -ogc -ekE -ekE -ekE +gvX +wQg +con +con +con fyS -tZk -pSK +eVJ +wHk aqu aro aro @@ -97434,16 +97005,16 @@ aaa aaa aaa aaa -miN +uEx sth -oer -ekE -ekE -ekE -ekE -ekE -tZk -pSK +gvX +con +con +con +con +con +eVJ +wHk aqu aro aro @@ -97691,16 +97262,16 @@ aaa aaa aaa aaa -miN +uEx wag -oer -ekE -ekE +gvX +con +con voW -ekE -ekE -tZk -pSK +con +con +eVJ +wHk aqu aro aro @@ -97948,14 +97519,14 @@ aaa aaa aaa aaa -miN +uEx tAC uAH -ffy -ffy +unR +unR dCr -ffy -ffy +unR +unR hzK iYE aqu @@ -98211,9 +97782,9 @@ mgF mgF mgF vAl -rje -rje -rje +meb +meb +meb iMv vmQ pQp @@ -98464,13 +98035,13 @@ aaS aaa dFX dFX -miN -miN -miN +uEx +uEx +uEx dFX -miN -miN -miN +uEx +uEx +uEx dFX dFX aaa diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 13597584ae..1d738b7382 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -86375,6 +86375,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/storage) "cPF" = ( @@ -127461,6 +127462,22 @@ /obj/machinery/light/small, /turf/open/floor/plasteel, /area/security/prison) +"vEq" = ( +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel/white, +/area/medical/storage) "wei" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -174855,7 +174872,7 @@ cAm cKO cMm cNO -cPF +vEq cRi cSV cUN diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 3c8e251bb1..e33bb015f4 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -52211,6 +52211,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/storage) "bZZ" = ( @@ -54651,6 +54652,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, +/obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/storage) "cez" = ( diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index b34da30300..e6b2af59e1 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -57031,6 +57031,10 @@ }, /turf/open/floor/engine, /area/science/xenobiology) +"naS" = ( +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "ncm" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -61095,6 +61099,13 @@ }, /turf/open/floor/wood, /area/lawoffice) +"wtE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/landmark/start/paramedic, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "wun" = ( /obj/structure/cable{ icon_state = "1-2" @@ -88795,7 +88806,7 @@ bzQ ioj bsA bEw -bkh +naS bkh bId bFO @@ -89566,7 +89577,7 @@ bBc bCm bDr bEz -bnF +wtE buh bIg bjc diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index ce458a1de3bd7b4edfa61ae1011cae42bfc474f2..0881a2c289b2ae1093e800c5bf4d2bba3b8b4782 100644 GIT binary patch delta 16663 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 delta 16177 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 P@S~#eQodN$IOzWXV{l}f From 04f6559b3d2dd4d1e849963accbcf9fd267f5338 Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Thu, 20 Feb 2020 23:12:28 -0600 Subject: [PATCH 18/57] fixes the janky jobs panel --- code/__DEFINES/jobs.dm | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index d45762ee34..35348df3d1 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -59,27 +59,29 @@ #define JOB_DISPLAY_ORDER_ASSISTANT 1 #define JOB_DISPLAY_ORDER_CAPTAIN 2 #define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 3 -#define JOB_DISPLAY_ORDER_BARTENDER 4 -#define JOB_DISPLAY_ORDER_COOK 5 -#define JOB_DISPLAY_ORDER_BOTANIST 6 -#define JOB_DISPLAY_ORDER_JANITOR 7 -#define JOB_DISPLAY_ORDER_CLOWN 8 -#define JOB_DISPLAY_ORDER_MIME 9 -#define JOB_DISPLAY_ORDER_CURATOR 10 -#define JOB_DISPLAY_ORDER_LAWYER 11 -#define JOB_DISPLAY_ORDER_CHAPLAIN 12 -#define JOB_DISPLAY_ORDER_QUARTERMASTER 13 -#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 14 -#define JOB_DISPLAY_ORDER_SHAFT_MINER 15 -#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 16 -#define JOB_DISPLAY_ORDER_STATION_ENGINEER 17 -#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 18 -#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 19 -#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 20 -#define JOB_DISPLAY_ORDER_CHEMIST 21 -#define JOB_DISPLAY_ORDER_GENETICIST 22 -#define JOB_DISPLAY_ORDER_VIROLOGIST 23 -#define JOB_DISPLAY_ORDER_PARAMEDIC 24 +#define JOB_DISPLAY_ORDER_QUARTERMASTER 4 +#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 5 +#define JOB_DISPLAY_ORDER_SHAFT_MINER 6 +#define JOB_DISPLAY_ORDER_BARTENDER 7 +#define JOB_DISPLAY_ORDER_COOK 8 +#define JOB_DISPLAY_ORDER_BOTANIST 9 +#define JOB_DISPLAY_ORDER_JANITOR 10 +#define JOB_DISPLAY_ORDER_CLOWN 11 +#define JOB_DISPLAY_ORDER_MIME 12 +#define JOB_DISPLAY_ORDER_CURATOR 13 +#define JOB_DISPLAY_ORDER_LAWYER 14 +#define JOB_DISPLAY_ORDER_CHAPLAIN 15 +#define JOB_DISPLAY_ORDER_AI 16 +#define JOB_DISPLAY_ORDER_CYBORG 17 +#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 18 +#define JOB_DISPLAY_ORDER_STATION_ENGINEER 19 +#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 20 +#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 21 +#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 22 +#define JOB_DISPLAY_ORDER_PARAMEDIC 23 +#define JOB_DISPLAY_ORDER_CHEMIST 24 +#define JOB_DISPLAY_ORDER_VIROLOGIST 25 +#define JOB_DISPLAY_ORDER_GENETICIST 26 #define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27 #define JOB_DISPLAY_ORDER_SCIENTIST 28 #define JOB_DISPLAY_ORDER_ROBOTICIST 29 @@ -87,5 +89,3 @@ #define JOB_DISPLAY_ORDER_WARDEN 31 #define JOB_DISPLAY_ORDER_DETECTIVE 32 #define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33 -#define JOB_DISPLAY_ORDER_AI 34 -#define JOB_DISPLAY_ORDER_CYBORG 35 From 4542afa537418640cdf1e64414e9ad43515c331f Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 21 Feb 2020 01:14:09 -0500 Subject: [PATCH 19/57] Update trek.dm --- code/modules/clothing/under/trek.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/clothing/under/trek.dm b/code/modules/clothing/under/trek.dm index 9564d03909..20852dbe62 100644 --- a/code/modules/clothing/under/trek.dm +++ b/code/modules/clothing/under/trek.dm @@ -19,7 +19,6 @@ icon_state = "trek_engsec" item_color = "trek_engsec" item_state = "r_suit" - armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0) //more sec than eng, but w/e. strip_delay = 50 /obj/item/clothing/under/trek/medsci @@ -69,4 +68,4 @@ desc = "Something about it feels off..." icon_state = "trek_Q" item_color = "trek_Q" - item_state = "r_suit" \ No newline at end of file + item_state = "r_suit" From f35ee95d672bf46a4b328d9fad9b1b04e76d8f35 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 21 Feb 2020 01:54:23 -0500 Subject: [PATCH 20/57] Update heart.dm --- code/modules/surgery/organs/heart.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 5767e84c73..71efcbfc5e 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -222,9 +222,8 @@ obj/item/organ/heart/cybernetic/upgraded/on_life() /obj/item/organ/heart/ipc name = "IPC heart" - desc = "An electronic pump that regulates hydraulic functions, they have an auto-restart after EMPs." + desc = "An electronic pump that regulates hydraulic functions, they have an not affected by EMPs." icon_state = "heart-c" - organ_flags = ORGAN_SYNTHETIC /obj/item/organ/heart/freedom name = "heart of freedom" From 58df6486cb99c86c065b9ce764af3c2e20fd4104 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 21 Feb 2020 03:06:38 -0500 Subject: [PATCH 21/57] Hey hey people, grammar here. --- code/modules/surgery/organs/heart.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 71efcbfc5e..547ca38ead 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -222,7 +222,7 @@ obj/item/organ/heart/cybernetic/upgraded/on_life() /obj/item/organ/heart/ipc name = "IPC heart" - desc = "An electronic pump that regulates hydraulic functions, they have an not affected by EMPs." + desc = "An electronic pump that regulates hydraulic functions, the electronics have EMP shielding." icon_state = "heart-c" /obj/item/organ/heart/freedom From 7d8f1320b33c5763bc808582846288287d350ddb Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 21 Feb 2020 03:07:42 -0500 Subject: [PATCH 22/57] it looks nicer --- .../living/carbon/human/species_types/ipc.dm | 6 ++++++ code/modules/surgery/organs/eyes.dm | 4 ++++ code/modules/surgery/organs/liver.dm | 4 ++++ code/modules/surgery/organs/lungs.dm | 7 ++++++- code/modules/surgery/organs/stomach.dm | 4 ++++ icons/obj/surgery.dmi | Bin 37901 -> 41535 bytes 6 files changed, 24 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species_types/ipc.dm b/code/modules/mob/living/carbon/human/species_types/ipc.dm index 4249be098f..15f3dd808b 100644 --- a/code/modules/mob/living/carbon/human/species_types/ipc.dm +++ b/code/modules/mob/living/carbon/human/species_types/ipc.dm @@ -13,7 +13,13 @@ meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc gib_types = list(/obj/effect/gibspawner/ipc, /obj/effect/gibspawner/ipc/bodypartless) mutanttongue = /obj/item/organ/tongue/robot/ipc +//Just robo looking parts. mutant_heart = /obj/item/organ/heart/ipc + mutantlungs = /obj/item/organ/lungs/ipc + mutantliver = /obj/item/organ/liver/ipc + mutantstomach = /obj/item/organ/stomach/ipc + mutanteyes = /obj/item/organ/eyes/ipc + exotic_bloodtype = "HF" var/datum/action/innate/monitor_change/screen diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index bdd1a444bb..a915d12838 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -377,3 +377,7 @@ name = "insect eyes" desc = "These eyes seem to have increased sensitivity to bright light, with no improvement to low light vision." flash_protect = -1 + +/obj/item/organ/eyes/ipc + name = "ipc eyes" + icon_state = "cybernetic_eyeballs" \ No newline at end of file diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 680d2389de..73225fc41c 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -95,6 +95,10 @@ icon_state = "liver-p" desc = "A large crystal that is somehow capable of metabolizing chemicals, these are found in plasmamen." +/obj/item/organ/liver/ipc + name = "reagent processing liver" + icon_state = "liver-c" + /obj/item/organ/liver/cybernetic name = "cybernetic liver" icon_state = "liver-c" diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 91153655d3..b774aaf793 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -2,6 +2,7 @@ /obj/item/organ/lungs name = "lungs" + desc = "Looking at them makes you start manual breathing." icon_state = "lungs" zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_LUNGS @@ -462,6 +463,10 @@ S.reagents.add_reagent(/datum/reagent/medicine/salbutamol, 5) return S +/obj/item/organ/lungs/ipc + name = "ipc lungs" + icon_state = "lungs-c" + /obj/item/organ/lungs/plasmaman name = "plasma filter" desc = "A spongy rib-shaped mass for filtering plasma from the air." @@ -543,4 +548,4 @@ /obj/item/organ/lungs/yamerol/on_life() ..() - damage += 2 //Yamerol lungs are temporary + damage += 2 //Yamerol lungs are temporary \ No newline at end of file diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 94f88cbe67..3b383581cf 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -96,3 +96,7 @@ name = "digestive crystal" icon_state = "stomach-p" desc = "A strange crystal that is responsible for metabolizing the unseen energy force that feeds plasmamen." + +/obj/item/organ/stomach/ipc + name = "ipc stomach" + icon_state = "stomach-ipc" diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi index fcc28de7b9324ed4dada532bb91380ac2d1fb30d..e998ce442db416faf6a546f6a72e062e4e0387a0 100755 GIT binary patch literal 41535 zcmbTdbyOX}vo1Qg26rd8y9C=f0TLjA;O@a8!JR-LxCM6!!QI{6-QC?C?&NpQx$FJ$ z*1GS$wf5|pJu^MiU0qe*SJkzDDJjUjK_)^50N{=6d&$oL0M!O=8Hn)U8R79-1^|E= zbyHFQE@|@3$la)DkEdUxj?9@Nj0C*dQYgr{5^r7yqU2q=3_b{Q#zf~h z{ji-7v-@F7O_@+PYO_X7y(oI!lax^>v6@|KweU(<)#5Z}(BQ_&Ve*q-XEnXQ=zYbE z`x;|2i}Eoo-QNqeAr7?E41^%b6Z7mEozu2FEhv(6J@t=t#t8c-xyEI>R_nodi|i~v zw}Saty2q4<&@{XXgT;#(Fp`S{O~=Au(pTDAr2eGAX8aiQ4WG$7)|(sirT9gwUN8y8 zx1V#y&n|^U{il3CxAw+At)NQ7DhcpgF!#*1?;6v@*-EHv884SQ(dS7D;ZoTusADvP zQtVTgD)S5ONp-@2t$k;gmmQR%Xp68;?|aP_DxC1esneyVMe}zIx2!Xx+F=sOU0vf8 z)Bc5%aO!sZoa-4c^1@SMX>rVuB-e;rpf_Mwme zmF?B%Dr&ZC-~62KBm7p(uB7Jb^COLiUyGFPE2?#ZEIakX3%{LN3iC0l)i)^HdR-*n zPHRP^=#Ks>68l(f1IxFMw2YL^%OdN>K~fI8JFzzCJ4-&uJaHtZ<2Z!q=fL6E+o9zy zfFn-8xYs6g_=yYtg2Gi(6Or(f=%DYj2ULizNun1O!2$AmRH40&Q>TqCFGOp^=lIa_b%3kx#|eARaQo_K0@2DAQZmxOO`W3Cmc zjXW4`4WT$b?wB}zJUL!0@<}1bVX9Hcy1(a9Ya2POKir!=S{&^?I`5slVT=D!(Yb#4 zvQg7>Ai@F>KURD1)?7XqD-g8i}B4dn=J1K!So+{BJFQl>ITu-I@R!z0Q#vM z7{CkXfg(fx{f|;X(>c1Tq6Szo4A@N6Xuxds1q;28yr|?54D>b)Uw^Oo;4wn9v)&-_2|>mnp@B zcS0Ful9GiyEkUQq3TU5NK6Jn7oeoi>$3CJ!-Qx&=5;Zo)!SZ$u6jAo0Sb#JAm|>rt zg-N_j4A?#08i%$z22qQpVa`yxaY(Nl?K8ydNepM0MWbz2F#J%6Jq~)H=F8~C;dMUo zn2(cB{EWpsda`wOw;7>^VWgj1n03w_|((9y7$_( z2pcqT;q`UR`IED9vT#*Fhqe=~*85i0RWN zs_z$wM%)e|6hW$+s6o#jV1J{oWQf9F(?Y8*-w}8pVtl1yZ5`9i+{42IKDtnRPlW&K z3W{VNzj7VlktsaaOENK)RH=|Kda#tTzdM2uP<#Ums9y`=#9$i@{4G;HWaf-+n&JUpS*O-FGYbn%tpZ3N#kj~(97Ls^pWXs%DgOw z|A6xfW{OZpLjD&q#4MPzd-r74$H2RvyN4+FBi>dwc{e4B?%CnMJ8%e5P9g|&mYfaF z5OwM`82jan%w@QHhm&SLl(yl6*_zb0%5vrS+Cnd}u~^iPZ_vnue6Fs(5xjHYp7FQ} zi@h(_dvz@gf6RP0ICr+*nTdn~<5Lhu%opA_Fd%Tzg{`P^SWzJ`&HalgpCOh)^5Kdw z=#u{)3Bc0l%BK=#6#=53g8p;{OtH}tjWVZqSW$|JHkM?EZJj8y609kEva&M0Ll!vk%t-_^9xQ5jE!TH8W8~Mmy2+_vo)wQ zi2PDhhe}~@c7%xL!9;OE5wmCAe%+tQ?WthSRMv=7+7o}Ql5-I;-}nXi02D^KtwmB9EFV%D@I!kdz2Y}FHcv6m*1gGE-B z+qwc4NUN2I`VsNWWMPg4Y;Zy0H0pF_Iisk^g7VQK6_EsMD;LApJ$&r2vlZVu=Ns|l zD;QdEaFKT??1wYCj$1ibdrDfyDX&kvkkn;~k3IhssL|;Z{uFzu$s~l`>QPJ z=$^`?B0Zv?((}6XnDcLQj&ZRc^QWz^tit4iGf%Fbp`?Nd#{{2{Pfx_?TcS}$Ya?X0 zEo94%!d;n5jmcQ|9ocbkH_E%%x^SJX^vPCBl%HSqU%sVt*MB*@oW-lze;st=5(SOv zpPt`|;&%w#M5kB(nU128k)K~J(u%JDwM@zV`(L6ntCMBtRY%vS^WH)&4MM`^?na=g)h$zl`rIjCkegm4g`N_N(xy>-W53s z@8mPK-;a8Bz@uAjsm42`J^ELhAk8p|>iqHLY=b8lGeQmt4ejWQs`m7%iCt}Wrla6= zq5vp_@2LU(PBlU5`!JGsL{u{2svh6z$?qBd>4&`YEQJlFG()Ak`3Pr?>mc4#DD?94 zdQYuoxIyB40FW*Y6*Qb*pc1+l2~NeF)x3%a>k{Dh_;$bJ4bF7a4d?=4G8B}}#cR#^ zSD9WE-SM|%x05d_V$n=~YI}8?IOc7*xz{BKL%cZaJ&k>AMw2h#mp=Khs z_2XNgR-u6`L|r$V-v<}&`_**klg^L!FB4w*+G+pk@Zqd?IOsDAc?G6s&RW`a@YJ?J zb){!v`Q5d=wQnOc?4x?O^Rydh3GB9>{{ds;WUwL@u4XJ=iv=$55U1s>G7MZtv3C! zto_?U#VnZxdkq&L8Tig%Oq6Zyhqqy^YRae#VTL38RYHeqk+$#a(<4_X$vaJ=tB&nF zQ|xSQFU6Nlg%Eyc!ma6nvzta7@_ za~;e1S<61R^OVMM+H!>wbFz2YeuakYV>kkWW<~a`q4ykz2dvO=n9I6QO3_ z=pzK%Hr{D_c%=U`hg|viu}U*VRB*)8bHjgf5TT9!n$l*(#1v%iKyHyjLMM3XAsM_d zPhStw3HY6;6<)kBmff6eRf~H3P5UL#g;h=)&>>G{5BZKv zsKvg$rOIB&c#?FPGzJk>LFZ>|CL@om4q9a=$(8epYu@BUu6(Xw8x9VR{(OZA)r!~S zu>>3(902IV&7rDHsxSibVZhn=A7>&VdC-%X+Su6q{rk79;U!+r%eS%7J@um8h?txK zF(IA#9%;E^DDAxVprjmMTA@_5V76-gvSg}*wQR~~pUG%_MyT2WPLY{;UZ zd6Sleq2hdrfIR(+>$P4{-K7p5ce~r}+ihH2ocaKpOgxQjS$@;=QeY8frUn%c&$LCo zYT@sjuk{LPxJlPgro@bA2?lH{T#bb&%j*GD3Q!5?0Pk;diUAhkd*kMd&A!J?kV443 zSHyp0oSYnGpoM6K!dCy30cXR;Un!0Tk<1`enA?m{tI6d&vojEVvop*V#YDre?EC)b z7$rdyj7rmyqu4rEF0z#7DfM*NZNeU9Md5(2lYgeQ0vk^nP=K@9))!phtPKWT|K;ia z?&)%r!~4YpbTZ@wJQg@NC(9wpwk?DakQ;(fPiKA^-iOn5-AX#wAzw6gOVaQ@nBuoZRb@!}-d*tGNax zh_SZc2oM=(0;}YU4&5D-7efj6HN)Lq6N`}Wi&uvnK}~2-5CB{qOr!WDr>vAPR0J80gt$7W9fcPO)gcyT&9Y4oOHL@OXW`by*Lj8-ZAx4B>DtNjb(OMFnq9DG7ZJXah6_87fz*24aa${fo2YFPRF;LkWT zd#He(BOhgkJl}q=RjF>%1g*`Fp53y1S>?*NB6VG4mrqGa&rqT}aM#{}a%oUENQJM? zh1%gm#3gCcT0r40CtcLvI1B?&k(-hlc} zchmZE%?4Bxt{qGla=71ESuIo{IWIfn|I>`RI{qh+l8#wagKm!=sVO{%5gib%Xd&rm zQcXCne0Q!_Kp5LDHJ5WY8}|MJLn}OHkm;an_agaj+04cEzz=@YTSzK&l#88agAEkX zJeQZmP?|8Yn3z}s#9Kt9WxH=2X7CbKiaqheNiNOIBL;K*_w}b!;?@=Z8ivIIx`f-1Up?M0&xu(dgJR0XxCjFyCrMSs8{vDq44UH^0LcA~G^^ zq+Oq~E|Pbn8Y`2@Efas04-w&pcXk(D_6jF&SpH4}A4bn7P|)QspNiVItt{{7i7Q=wIs<1>-7qUf@14jDhEzaT7FrI!>pYyug#g$+ zbRj)GO)6p(6hLKT{w)yyU5El7K@d8a2WU%W&K@IG%gJS~L*E0#Y-P2Ef#=kvF}fx?Say;*Z;Zc-JhK+eT%u{m=e;wW zZE*t;*(!0pG`H)4 z@)S1D$-+|I-}&(EYTk4-nGqs#7O;xApz60jIY~^+>*;s36~phHU#DbQAJPWsNFY9216*!%?6S;XZ}{^IM`32MM6q7_nOz4#NQz87w^s(r|qlah-I zTc^<}AS49k18uoRas9J+n6>Tc9oMbxZ?aV!9H0H95~q;Yo3$3`P#>1f!LNmc`btXl zexbNNAzW^qaLKH*-cd_LnoLzaWh75;$=fC{hH-OEDjD-u1l#A5{zVorZXXN=)7|iZ zA)EE-gsmxyV3IM3r+3-cht{{1(mBQ(eclkbsM2q|WF`t>z*QEmitxg*A!@4Y3-!46iL0<0%Y?!9=)ikS$tEZm+T8uzStQHP|WD z!F!LP=|VL=qU;t=61i0t5R*|QpnJ=0nj7RjeR@$J7nX_hxo@!aJd4~~ZUW6f(zu#~ znQ8I1l{BT91~uU|`e}zn3*auzpCW^Nos8QU+=X_idm@S2%V@Vcn9Bc0;z1S`v9zR} zBI4Qb@ngUqeP|HLs{T!@`zVsW8@tz&i>%K_gV_?DIwiY>12bu8E4n4YZH=0z z0GYFYtahV|gF&K-&ieRm`)9xJTvl1RbB{N+;X{A-wC2D#6w*4J$W=eu`h@Y302T{p7Ro(zdfam`-sZ9$iVUR;tV6uB(S_ zD#1p4+qP%yS-aY*CBbowW!=zcf>C>#Gm z{L;v$fA=+xH@iE3KVGOFKL#ll2$YsQi-W_%zi0UTW1+CX9F9NL_`#|i6?kvZ4I)w` zmmhy%-=}Hy@_7lwi zZiyyoFDqMkdp>2EmsnyEx6COUY`c2bP@sXc>btp^oTn=|{IGxa`}1SA-Vcf-se={n zCT%+`0myl}(q^>zq%ly(e1o;2du@B8`d&c$(z=`%XWTU zu(*e!ZZpN+!R=;#J<`eB$vC(2^mK>3(r+~U+@vz_(+O{8=>i*P3~wsRzc;=K9i2Z( zvYoy4ZnSLC2~Y2>RPzXLUiA*w@g~9%2Mgb$JFyr=%r>Ct^@z1tRPUiBr^TtqK{6|jk!0nP3_6@C0 z*RXvvg^TNt-#9RJI#@oMoZ2qE-0%R`$%nQmm^==v@7~`X90L2*(e#sW^xhEubdhAo z$LE8Ecb4#_M2A{#=rHH*Fy_o`szS|NUxostvoZUE4dvv85Svw3Wnq)quakHsau7b4a!kM$J@!?tGVys+zEPUN0s|RP8Hv zLcAjVi;z1fI5x?rVT%cjJCTixzWGW93M{^nY0c0EPNP!iW08MKt1gmXUG zi%FAxyIEo9jS}~hu24a2@V1Zoc6_mTA=&g{(%DyYgT2Jy;Ao_}0YJ~&8@BQGQxTd~ z)E!-B)H75Tj-%*UT!yCDfaJY(tql-M2!#y9IF~>vxnsH2ujRabw6;Cpc6{Fu_cdlt z&m-~+6=bourc3vSuPG)fSp~K z2O5w*eX0KPXz4({cC`qcf=Rjc&LUDdJLS+q7ZZ zQ><(&ZfXjzEySdxqZ2&z;nS0_`;CO-^c(Gl@9+S-l?vqPenty7OixEA>|%n`#m&8a zdYKehJK6UIe-eaA*VWa%A1!2L1e-7SktK(h)!1B`jm1$EHGNT4qU!Y3C~sTH-l+H~ zSfUFz_OPP}xI`XfZM~j7rH`prRo^wCrNhqe9Lz49FEToLo?9a|zutJhz7z4)9oyIZ z?NS}|8a9h|Jz*m2TMw%x0nXmwpq$