diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index f92cedc2bd26..0091b88fa15f 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -232,11 +232,6 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/storage/box/donkpockets/donkpocketberry = 1, /obj/item/storage/box/donkpockets/donkpockethonk = 1, ) = 1, - list(//Donk-dinner Varieties - /obj/item/reagent_containers/food/snacks/ready_donk = 1, - /obj/item/reagent_containers/food/snacks/ready_donk/mac_n_cheese = 1, - /obj/item/reagent_containers/food/snacks/ready_donk/donkhiladas = 1, - ) = 1, /obj/item/reagent_containers/food/snacks/monkeycube = 1, /obj/effect/spawner/lootdrop/ration = 1, ) = 8, diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index caea9ac9f083..3f35c5374b02 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -107,15 +107,6 @@ /obj/item/trash/attack(mob/M, mob/living/user) return -/obj/item/trash/peanuts - name = "\improper Gallery peanuts packet" - desc = "This thread is trash!" - icon_state = "peanuts" - -/obj/item/trash/cnds - name = "\improper C&Ds packet" - icon_state = "cnds" - /obj/item/trash/can/food/tomatoes name = "canned San Marzano tomatoes" icon_state = "tomatoescan_empty" @@ -139,8 +130,3 @@ /obj/item/trash/spacers_sidekick name = "\improper Spacer's Sidekick packet" icon_state = "spacers_sidekick" - -/obj/item/trash/ready_donk - name = "empty Ready-donk" - desc = "It's been Donk-decimated." - icon_state = "ready_donk" diff --git a/code/modules/cargo/packs/food.dm b/code/modules/cargo/packs/food.dm index 61df4ef7f538..77762e4ddccc 100644 --- a/code/modules/cargo/packs/food.dm +++ b/code/modules/cargo/packs/food.dm @@ -246,32 +246,6 @@ crate_name = "beekeeping starter crate" crate_type = /obj/structure/closet/crate/hydroponics -/datum/supply_pack/food/rations - name = "Surplus Mothic Ration Pack" - desc = "A single surplus ration pack from the Mothic Fleet. Comes with 3 random sustenance bars, and a package of Activin chewing gum." - cost = 200 - contains = list(/obj/item/storage/box/rations) - -/datum/supply_pack/food/ready_donk - name = "Ready-Donk Single Meal" - desc = "A complete meal package for the terminally lazy. Contains one Ready-Donk meal." - cost = 100 - contains = list(/obj/item/reagent_containers/food/snacks/ready_donk) - -/datum/supply_pack/food/randomized/ready_donk - name = "Ready-Donk Variety Crate" - desc = "Featuring a line up of Donk Co.'s most popular pastry!" - cost = 600 - contains = list(/obj/item/reagent_containers/food/snacks/ready_donk, - /obj/item/reagent_containers/food/snacks/ready_donk/mac_n_cheese, - /obj/item/reagent_containers/food/snacks/ready_donk/donkhiladas) - crate_name = "\improper Ready-Donk crate" - -/datum/supply_pack/food/randomized/ready_donk/fill(obj/structure/closet/crate/C) - for(var/i in 1 to 3) - var/item = pick(contains) - new item(C) - /datum/supply_pack/food/ration name = "Ration Crate" desc = "6 standerd issue rations." diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index f0b98f1554db..648c7f135aa6 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -876,58 +876,3 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/consumable/char = 1) tastes = list("bell pepper" = 1, "char" = 1) foodtype = VEGETABLES - -//DONK DINNER: THE INNOVATIVE WAY TO GET YOUR DAILY RECOMMENDED ALLOWANCE OF SALT... AND THEN SOME! -/obj/item/reagent_containers/food/snacks/ready_donk - name = "\improper Ready-Donk: Bachelor Chow" - desc = "A quick Donk-dinner: now with flavour!" - icon_state = "ready_donk" - trash = /obj/item/trash/ready_donk - list_reagents = list(/datum/reagent/consumable/nutriment = 5) - cooked_type = /obj/item/reagent_containers/food/snacks/ready_donk/warm - tastes = list("food?" = 2, "laziness" = 1) - foodtype = MEAT | JUNKFOOD - w_class = WEIGHT_CLASS_SMALL - -/obj/item/reagent_containers/food/snacks/ready_donk/examine_more(mob/user) - var/list/msg = list(span_notice("You browse the back of the box...")) - msg += "\t[span_info("Ready-Donk: a product of Donk Co.")]" - msg += "\t[span_info("Heating instructions: open box and pierce film, heat in microwave on high for 2 minutes. Allow to stand for 60 seconds prior to eating. Product will be hot.")]" - msg += "\t[span_info("Per 200g serving contains: 8g Sodium; 25g Fat, of which 22g are saturated; 2g Sugar.")]" - return msg - -/obj/item/reagent_containers/food/snacks/ready_donk/warm - name = "warm Ready-Donk: Bachelor Chow" - desc = "A quick Donk-dinner, now with flavour! And it's even hot!" - icon_state = "ready_donk_warm" - list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/omnizine = 3) - cooked_type = null - tastes = list("food?" = 2, "laziness" = 1) - -/obj/item/reagent_containers/food/snacks/ready_donk/mac_n_cheese - name = "\improper Ready-Donk: Donk-a-Roni" - desc = "Neon-orange mac n' cheese in seconds!" - cooked_type = /obj/item/reagent_containers/food/snacks/ready_donk/warm/mac_n_cheese - tastes = list("cheesy pasta" = 2, "laziness" = 1) - foodtype = GRAIN | DAIRY | JUNKFOOD - -/obj/item/reagent_containers/food/snacks/ready_donk/warm/mac_n_cheese - name = "warm Ready-Donk: Donk-a-Roni" - desc = "Neon-orange mac n' cheese, ready to eat!" - icon_state = "ready_donk_warm_mac" - tastes = list("cheesy pasta" = 2, "laziness" = 1) - foodtype = GRAIN | DAIRY | JUNKFOOD - -/obj/item/reagent_containers/food/snacks/ready_donk/donkhiladas - name = "\improper Ready-Donk: Donkhiladas" - desc = "Donk Co's signature Donkhiladas with Donk sauce, for an 'authentic' taste of Mexico." - cooked_type = /obj/item/reagent_containers/food/snacks/ready_donk/warm/donkhiladas - tastes = list("enchiladas" = 2, "laziness" = 1) - foodtype = GRAIN | DAIRY | MEAT | VEGETABLES | JUNKFOOD - -/obj/item/reagent_containers/food/snacks/ready_donk/warm/donkhiladas - name = "warm Ready-Donk: Donkhiladas" - desc = "Donk Co's signature Donkhiladas with Donk sauce, served as hot as the Mexican sun." - icon_state = "ready_donk_warm_mex" - tastes = list("enchiladas" = 2, "laziness" = 1) - foodtype = GRAIN | DAIRY | JUNKFOOD diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm index 342d61b222f7..88c1188f1dee 100644 --- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm +++ b/code/modules/food_and_drinks/food/snacks_spaghetti.dm @@ -104,11 +104,3 @@ cooked_type = null tastes = list("noodle" = 1, "butter" = 1) foodtype = GRAIN | DAIRY - -/obj/item/reagent_containers/food/snacks/spaghetti/mac_n_cheese - name = "mac n' cheese" - desc = "Made the proper way with only the finest cheese and breadcrumbs. And yet, it can't scratch the same itch as Ready-Donk." - icon_state = "mac_n_cheese" - bonus_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/nutriment/vitamin = 2) - tastes = list("cheese" = 1, "breadcrumbs" = 1, "pasta" = 1) - foodtype = GRAIN | DAIRY diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm index 0382ffdd843d..8bff9db3384f 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -146,112 +146,3 @@ filling_color = "#97ee63" tastes = list("pure electricity" = 3, "fitness" = 2) foodtype = TOXIC - -/obj/item/reagent_containers/food/snacks/peanuts - name = "\improper Gallery's peanuts" - desc = "A favourite amongst the terminally angry." - icon_state = "peanuts" - trash = /obj/item/trash/peanuts - list_reagents = list(/datum/reagent/consumable/nutriment = 2) - tastes = list("peanuts" = 4, "anger" = 1) - foodtype = JUNKFOOD | NUTS - junkiness = 10 //less junky than other options, since peanuts are a decently healthy snack option - w_class = WEIGHT_CLASS_SMALL - grind_results = list(/datum/reagent/consumable/peanut_butter = 5, /datum/reagent/consumable/cooking_oil = 2) - -/obj/item/reagent_containers/food/snacks/peanuts/salted - name = "\improper Gallery's salt reserves peanuts" - desc = "Tastes salty." - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sodiumchloride = 1) - tastes = list("peanuts" = 3, "salt" = 1, "high blood pressure" = 1) - -/obj/item/reagent_containers/food/snacks/peanuts/wasabi - name = "\improper Gallery's raging wasabi peanuts" - desc = "The angriest of all peanut flavours." - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/capsaicin = 1) - tastes = list("peanuts" = 3, "wasabi" = 1, "rage" = 1) - -/obj/item/reagent_containers/food/snacks/peanuts/honey_roasted - name = "\improper Gallery's delete sweet peanuts" - desc = "Oddly bitter for a sweet treat." - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sugar = 1) - tastes = list("peanuts" = 3, "honey" = 1, "bitterness" = 1) - -/obj/item/reagent_containers/food/snacks/peanuts/barbecue - name = "\improper Gallery's IDEDBBQ peanuts" - desc = "Where there's smoke, there's not necessarily fire- sometimes it's just BBQ sauce." - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/bbqsauce = 1) - tastes = list("peanuts" = 3, "bbq sauce" = 1, "arguments" = 1) - -/obj/item/reagent_containers/food/snacks/peanuts/random - name = "\improper Gallery's every-flavour peanuts" - desc = "What flavour will you get?" - icon_state = "peanuts" - -/obj/item/reagent_containers/food/snacks/peanuts/random/Initialize() - // Generate a sample p - var/peanut_type = pick(subtypesof(/obj/item/reagent_containers/food/snacks/peanuts) - /obj/item/reagent_containers/food/snacks/peanuts/random) - var/obj/item/reagent_containers/food/snacks/sample = new peanut_type(loc) - - name = sample.name - desc = sample.desc - list_reagents = sample.list_reagents - tastes = sample.tastes - - qdel(sample) - - . = ..() - -/obj/item/reagent_containers/food/snacks/cnds - name = "\improper C&Ds" - desc = "Legally, we cannot say that these won't melt in your hands." - icon_state = "cnds" - trash = /obj/item/trash/cnds - list_reagents = list(/datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/coco = 1) - tastes = list("chocolate candy" = 3) - junkiness = 25 - foodtype = JUNKFOOD - w_class = WEIGHT_CLASS_SMALL - -/obj/item/reagent_containers/food/snacks/cnds/caramel - name = "caramel C&Ds" - desc = "Stuffed with sugary sweet caramel, making them a diabetic's worst nightmare." - list_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 1, /datum/reagent/consumable/caramel = 1) - tastes = list("chocolate candy" = 2, "caramel" = 1) - -/obj/item/reagent_containers/food/snacks/cnds/pretzel - name = "pretzel C&Ds" - desc = "Eine köstliche Begleitung zu Ihrem Lieblingsbier." - list_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/coco = 1) - tastes = list("chocolate candy" = 2, "pretzel" = 1) - foodtype = JUNKFOOD | GRAIN - -/obj/item/reagent_containers/food/snacks/cnds/peanut_butter - name = "peanut butter C&Ds" - desc = "Beloved by small children and aliens alike." - list_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 1, /datum/reagent/consumable/peanut_butter = 1) - tastes = list("chocolate candy" = 2, "peanut butter" = 1) - -/obj/item/reagent_containers/food/snacks/cnds/banana_honk - name = "banana honk C&Ds" - desc = "The official candy of clowns everywhere. Honk honk!" - list_reagents = list(/datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/coco = 1, /datum/reagent/consumable/banana = 1) - tastes = list("chocolate candy" = 2, "banana" = 1) - -/obj/item/reagent_containers/food/snacks/cnds/random - name = "mystery filled C&Ds" - desc = "Filled with one of four delicious flavours!" - -/obj/item/reagent_containers/food/snacks/cnds/random/Initialize() - var/random_flavour = pick(subtypesof(/obj/item/reagent_containers/food/snacks/cnds) - /obj/item/reagent_containers/food/snacks/cnds/random) - - var/obj/item/reagent_containers/food/snacks/sample = new random_flavour(loc) - - name = sample.name - desc = sample.desc - list_reagents = sample.list_reagents - tastes = sample.tastes - - qdel(sample) - - . = ..() diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 10a759ac849c..781e6f360dc5 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -147,12 +147,6 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S box = /obj/item/storage/box/survival/engineer/radio backpack_contents = null -/datum/outfit/job/security/minutemen/bard - name = "Biohazard Removal Specialist (Colonial Minutemen)" - head = /obj/item/clothing/head/helmet/riot/minutemen - suit = /obj/item/clothing/suit/armor/riot/minutemen - belt = /obj/item/storage/belt/military/assault - /datum/outfit/job/security/minutemen/naked name = "Minuteman (Colonial Minutemen) (Naked)" @@ -168,6 +162,12 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S l_pocket = null r_pocket = null +/datum/outfit/job/security/minutemen/armed + name = "Minuteman (Colonial Minutemen) (Armed)" + + suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen + belt = /obj/item/storage/belt/military/minutemen/loaded + /datum/outfit/job/security/minutemen/mechpilot name = "Mech Pilot (Colonial Minutemen)" diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index b1ed971658eb..073fef3baed1 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/pizzaspaghetti.dmi b/icons/obj/food/pizzaspaghetti.dmi index e9857fc505f2..60fa3ccf4ae9 100644 Binary files a/icons/obj/food/pizzaspaghetti.dmi and b/icons/obj/food/pizzaspaghetti.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index e7788fd594bd..65e2d2be503d 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ