From bd30b449191164b0eb500867deca858fdd5b8d92 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sat, 18 Jan 2020 21:59:03 -0500 Subject: [PATCH 1/5] Bounty Reorganisation and Rebalance Reorganises several bounties. Rebalances or Buffs Skateboard, Stunprod, Shady Jims, Gas Mask, Soup, Ice Cream Sandwiches, Popcorn, Onion Rings, Night Vision Goggles, Tool Belts, possibly others. Moves: Khinkali to Chef Bounties Super Bite to Chef Bounties Poppy Pretzels to Chef Bounties Adds: Fiesta Skewer Bounty Pneumatic Cannon Bounty BBQ Ribs Bounty Add's Trillby's Toy Sword Bounty Fix: Shady Jims were unobtainable, they are now obtainable. --- code/modules/cargo/bounties/assistant.dm | 19 +- code/modules/cargo/bounties/botany.dm | 272 ++++++++++++---------- code/modules/cargo/bounties/chef.dm | 36 +-- code/modules/cargo/bounties/gardencook.dm | 32 ++- code/modules/cargo/bounties/medical.dm | 2 +- code/modules/cargo/bounties/science.dm | 6 +- code/modules/cargo/bounties/silly.dm | 15 +- code/modules/vending/cigarette.dm | 3 +- 8 files changed, 228 insertions(+), 157 deletions(-) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index 9e26cd25fc..84d3fd3626 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -10,13 +10,13 @@ /datum/bounty/item/assistant/skateboard name = "Skateboard" description = "Nanotrasen has determined walking to be wasteful. Ship a skateboard to CentCom to speed operations up." - reward = 750 // the tony hawk + reward = 800 // the tony hawk wanted_types = list(/obj/vehicle/ridden/scooter/skateboard) /datum/bounty/item/assistant/stunprod name = "Stunprod" description = "CentCom demands a stunprod to use against dissidents. Craft one, then ship it." - reward = 800 + reward = 950 wanted_types = list(/obj/item/melee/baton/cattleprod) /datum/bounty/item/assistant/soap @@ -126,7 +126,7 @@ /datum/bounty/item/assistant/shadyjims name = "Shady Jim's" description = "There's an irate officer at CentCom demanding that he receive a box of Shady Jim's cigarettes. Please ship one. He's starting to make threats." - reward = 750 + reward = 1150 wanted_types = list(/obj/item/storage/fancy/cigarettes/cigpack_shadyjims) /datum/bounty/item/assistant/potted_plants @@ -208,15 +208,22 @@ wanted_types = list(/obj/item/shield/makeshift) /datum/bounty/item/assistant/toolbelts - name = "Tool Belts" + name = "Tool Belts" //Made it 4 so you can't just buy one set of toolbelts to finish the bounty. description = "These things always seem to go missing. Ship us a few to help us restock." reward = 1350 - required_count = 3 + required_count = 5 wanted_types = list(/obj/item/storage/belt/utility) /datum/bounty/item/assistant/gasmasks name = "Gas Masks" description = "The good news is that we have more miasma than we'll ever need. The bad news is, somone opened the release valve on the canisters. Ship us some gas masks!" - reward = 1100 + reward = 1250 required_count = 4 wanted_types = list(/obj/item/clothing/mask/gas) + +/datum/bounty/item/assistant/pneumatic_cannon + name = "Pneumatic Cannons" + description = "Have you ever launched a tennis ball, newspaper, or ***** at someones head from across the room? No? We haven't either. Help us rectify this." + reward = "2000" + required_count = 2 + wanted_types = list(/obj/item/pneumatic_cannon/ghetto) \ No newline at end of file diff --git a/code/modules/cargo/bounties/botany.dm b/code/modules/cargo/bounties/botany.dm index 98d7765002..43ce48503e 100644 --- a/code/modules/cargo/bounties/botany.dm +++ b/code/modules/cargo/bounties/botany.dm @@ -10,22 +10,23 @@ reward += multiplier * 1000 required_count = rand(5, 10) +//Easy Stuff (1200) + /datum/bounty/item/botany/ambrosia_vulgaris name = "Ambrosia Vulgaris Leaves" wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris) foodtype = "stew" -/datum/bounty/item/botany/ambrosia_gaia - name = "Ambrosia Gaia Leaves" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia) - multiplier = 4 - foodtype = "stew" +/datum/bounty/item/botany/pineapples + name = "Pineapples" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/pineapple) + bonus_desc = "Not for human consumption." + foodtype = "ashtray" -/datum/bounty/item/botany/apple_golden - name = "Golden Apples" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/apple/gold) - multiplier = 4 - foodtype = "dessert" +/datum/bounty/item/botany/tomato + name = "Tomatoes" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/tomato) + exclude_types = list(/obj/item/reagent_containers/food/snacks/grown/tomato/blue) /datum/bounty/item/botany/banana name = "Bananas" @@ -33,6 +34,66 @@ exclude_types = list(/obj/item/reagent_containers/food/snacks/grown/banana/bluespace) foodtype = "banana split" +/datum/bounty/item/botany/coconuts + name = "Coconuts" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/coconut) + +/datum/bounty/item/botany/wheat + name = "Wheat Grains" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/wheat) + +/datum/bounty/item/botany/rice + name = "Rice Grains" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/rice) + +/datum/bounty/item/botany/chili + name = "Chili Peppers" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/chili) + +/datum/bounty/item/botany/citrus_lime + name = "Limes" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lime) + foodtype = "sorbet" + +/datum/bounty/item/botany/citrus_lemon + name = "Lemons" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lemon) + foodtype = "sorbet" + +/datum/bounty/item/botany/citrus_oranges + name = "Oranges" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/citrus/orange) + bonus_desc = "Do not ship lemons or limes." //I vanted orahnge! + foodtype = "sorbet" + +/datum/bounty/item/botany/eggplant + name = "Eggplants" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/eggplant) + bonus_desc = "Not to be confused with egg-plants." + +/datum/bounty/item/botany/watermelon + name = "Watermelons" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/watermelon) + foodtype = "dessert" + +/datum/bounty/item/botany/glowshroom + name = "Glowshrooms" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom) + exclude_types = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap, /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom) + foodtype = "omelet" + +//Medium Stuff (2400) + +/datum/bounty/item/botany/moonflower + name = "Moonflowers" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/moonflower) + multiplier = 2 + +/datum/bounty/item/botany/novaflower + name = "Novaflowers" + wanted_types = list(/obj/item/grown/novaflower) + multiplier = 2 + /datum/bounty/item/botany/banana_bluespace name = "Bluespace Bananas" wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/banana/bluespace) @@ -44,6 +105,16 @@ wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/koibeans) multiplier = 2 +/datum/bounty/item/botany/coffee_robusta + name = "Coffee Robusta Beans" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/coffee/robusta) + multiplier = 2 + +/datum/bounty/item/botany/steelcaps + name = "Steelcap Logs" + wanted_types = list(/obj/item/grown/log/steel) + multiplier = 2 + /datum/bounty/item/botany/berries_death name = "Death Berries" wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/berries/death) @@ -57,6 +128,78 @@ multiplier = 2 foodtype = "sorbet" +/datum/bounty/item/botany/chili + name = "Ice Chili Peppers" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/icepepper) + multiplier = 2 + +/datum/bounty/item/botany/chili + name = "Ghost Chili Peppers" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/ghost_chili) + multiplier = 2 + +/datum/bounty/item/botany/eggplant_eggy + name = "Egg-plants" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/shell/eggy) + bonus_desc = "Not to be confused with eggplants." + multiplier = 2 + +/datum/bounty/item/botany/watermelon_holy + name = "Holy Melons" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/holymelon) + multiplier = 2 + foodtype = "dessert" + +/datum/bounty/item/botany/glowshroom_cap + name = "Glowcaps" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap) + multiplier = 2 + foodtype = "omelet" + +/datum/bounty/item/botany/glowshroom_shadow + name = "Shadowshrooms" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom) + multiplier = 2 + foodtype = "omelet" + +/datum/bounty/item/botany/nettles_death + name = "Death Nettles" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/nettle/death) + multiplier = 2 + bonus_desc = "Wear protection when handling them." + foodtype = "cheese" + +//Harder Stuff (3600-7200) + +// /datum/bounty/item/botany/kudzu +// name = "Kudzu Pods" +// wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/kudzupod) +// bonus_desc = "Store in a dry, dark place." +// multiplier = 4 + +/datum/bounty/item/botany/bungopit + name = "Bungo Pits" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/bungopit) + bonus_desc = "Heartbreaker." + multiplier = 4 + +/datum/bounty/item/botany/ambrosia_gaia + name = "Ambrosia Gaia Leaves" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia) + multiplier = 4 + foodtype = "stew" + +/datum/bounty/item/botany/apple_golden + name = "Golden Apples" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/apple/gold) + multiplier = 4 + foodtype = "dessert" + +/datum/bounty/item/botany/tomato_bluespace + name = "Bluespace Tomatoes" + wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/tomato/blue/bluespace) + multiplier = 4 + /datum/bounty/item/botany/cannabis name = "Cannabis Leaves" wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/cannabis) @@ -84,111 +227,4 @@ wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate) multiplier = 6 bonus_desc = "Under no circumstances mention this shipment to security." - foodtype = "\"meal\"" - -/datum/bounty/item/botany/wheat - name = "Wheat Grains" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/wheat) - -/datum/bounty/item/botany/rice - name = "Rice Grains" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/rice) - -/datum/bounty/item/botany/chili - name = "Chili Peppers" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/chili) - -/datum/bounty/item/botany/chili - name = "Ice Chili Peppers" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/icepepper) - multiplier = 2 - -/datum/bounty/item/botany/chili - name = "Ghost Chili Peppers" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/ghost_chili) - multiplier = 2 - -/datum/bounty/item/botany/citrus_lime - name = "Limes" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lime) - foodtype = "sorbet" - -/datum/bounty/item/botany/citrus_lemon - name = "Lemons" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lemon) - foodtype = "sorbet" - -/datum/bounty/item/botany/citrus_oranges - name = "Oranges" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/citrus/orange) - bonus_desc = "Do not ship lemons or limes." //I vanted orahnge! - foodtype = "sorbet" - -/datum/bounty/item/botany/eggplant - name = "Eggplants" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/eggplant) - bonus_desc = "Not to be confused with egg-plants." - -/datum/bounty/item/botany/eggplant_eggy - name = "Egg-plants" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/shell/eggy) - bonus_desc = "Not to be confused with eggplants." - multiplier = 2 - -// /datum/bounty/item/botany/kudzu -// name = "Kudzu Pods" -// wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/kudzupod) -// bonus_desc = "Store in a dry, dark place." -// multiplier = 4 - -/datum/bounty/item/botany/watermelon - name = "Watermelons" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/watermelon) - foodtype = "dessert" - -/datum/bounty/item/botany/watermelon_holy - name = "Holy Melons" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/holymelon) - multiplier = 2 - foodtype = "dessert" - -/datum/bounty/item/botany/glowshroom - name = "Glowshrooms" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom) - exclude_types = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap, /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom) - foodtype = "omelet" - -/datum/bounty/item/botany/glowshroom_cap - name = "Glowcaps" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap) - multiplier = 2 - foodtype = "omelet" - -/datum/bounty/item/botany/glowshroom_shadow - name = "Shadowshrooms" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom) - multiplier = 2 - foodtype = "omelet" - -/datum/bounty/item/botany/nettles_death - name = "Death Nettles" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/nettle/death) - multiplier = 2 - bonus_desc = "Wear protection when handling them." - foodtype = "cheese" - -/datum/bounty/item/botany/pineapples - name = "Pineapples" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/pineapple) - bonus_desc = "Not for human consumption." - foodtype = "ashtray" - -/datum/bounty/item/botany/tomato - name = "Tomatoes" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/tomato) - exclude_types = list(/obj/item/reagent_containers/food/snacks/grown/tomato/blue) - -/datum/bounty/item/botany/tomato_bluespace - name = "Bluespace Tomatoes" - wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/tomato/blue/bluespace) - multiplier = 4 + foodtype = "\"meal\"" \ No newline at end of file diff --git a/code/modules/cargo/bounties/chef.dm b/code/modules/cargo/bounties/chef.dm index 64e1710461..7f7f0b86e2 100644 --- a/code/modules/cargo/bounties/chef.dm +++ b/code/modules/cargo/bounties/chef.dm @@ -2,16 +2,17 @@ /datum/bounty/item/chef/soup name = "Soup" - description = "To quell the homeless uprising, Nanotrasen will be serving soup to all underpaid workers. Ship any type of soup." - reward = 700 - required_count = 3 + description = "To quell the homeless uprising, Nanotrasen will be serving soup to all underpaid workers. Ship any type of soup. Do NOT ship bowls of water." + reward = 1200 + required_count = 4 wanted_types = list(/obj/item/reagent_containers/food/snacks/soup) + exclude_types = list(/obj/item/reagent_containers/food/snacks/soup/wish) /datum/bounty/item/chef/icecreamsandwich name = "Ice Cream Sandwiches" description = "Upper management has been screaming non-stop for ice cream. Please send some." - reward = 800 - required_count = 3 + reward = 1200 + required_count = 5 wanted_types = list(/obj/item/reagent_containers/food/snacks/icecreamsandwich) /datum/bounty/item/chef/bread @@ -26,6 +27,13 @@ reward = 3142 wanted_types = list(/obj/item/reagent_containers/food/snacks/pie) +/datum/bounty/item/gardencook/khinkali + name = "Khinkali" + description = "Requesting -some khinki stuff- for a private staff party at Centcom." + reward = 2400 + required_count = 6 + wanted_types = list(/obj/item/reagent_containers/food/snacks/khinkali) + /datum/bounty/item/chef/salad name = "Salad or Rice Bowls" description = "CentCom management is going on a health binge. Your order is to ship salad or rice bowls." @@ -33,18 +41,6 @@ required_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/salad) -/datum/bounty/item/chef/superbite - name = "Super Bite Burger" - description = "Commander Tubbs thinks he can set a competitive eating world record. All he needs is a super bite burger shipped to him." - reward = 1800 - wanted_types = list(/obj/item/reagent_containers/food/snacks/burger/superbite) - -/datum/bounty/item/chef/poppypretzel - name = "Poppy Pretzel" - description = "Central Command needs a reason to fire their HR head. Send over a poppy pretzel to force a failed drug test." - reward = 3000 - wanted_types = list(/obj/item/reagent_containers/food/snacks/poppypretzel) - // /datum/bounty/item/chef/cubancarp // name = "Cuban Carp" // description = "To celebrate the birth of Castro XXVII, ship one cuban carp to CentCom." @@ -135,3 +131,9 @@ reward = 1200 required_count = 6 wanted_types = list(/obj/item/reagent_containers/food/snacks/sugarcookie) + +/datum/bounty/item/chef/bbqribs + description = "There's a debate around command as to weather or not ribs should be considered finger food, and we need a few delicious racks to process." + reward = 2250 + required_count = 3 + wanted_types = list(/obj/item/reagent_containers/food/snacks/bbqribs) \ No newline at end of file diff --git a/code/modules/cargo/bounties/gardencook.dm b/code/modules/cargo/bounties/gardencook.dm index b73cc2f9f8..6fdd9b2a3f 100644 --- a/code/modules/cargo/bounties/gardencook.dm +++ b/code/modules/cargo/bounties/gardencook.dm @@ -1,7 +1,7 @@ /datum/bounty/item/chef/birthday_cake name = "Birthday Cake" description = "Nanotrasen's birthday is coming up! Ship them a birthday cake to celebrate!" - reward = 1000 + reward = 1800 wanted_types = list(/obj/item/reagent_containers/food/snacks/store/cake/birthday, /obj/item/reagent_containers/food/snacks/cakeslice/birthday) /datum/bounty/item/gardencook/carrotfries @@ -21,24 +21,17 @@ /datum/bounty/item/gardencook/popcorn name = "Popcorn Bags" description = "Upper management wants to host a movie night. Ship bags of popcorn for the occasion." - reward = 800 + reward = 1200 required_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/popcorn) /datum/bounty/item/gardencook/onionrings name = "Onion Rings" description = "Nanotrasen is remembering Saturn day. Ship onion rings to show the station's support." - reward = 800 + reward = 1200 required_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/onionrings) -/datum/bounty/item/gardencook/khinkali - name = "Khinkali" - description = "Requesting -some khinki stuff- for a private staff party at Centcom" - reward = 2400 - required_count = 6 - wanted_types = list(/obj/item/reagent_containers/food/snacks/khinkali) - /datum/bounty/item/gardencook/bakedbeans name = "Beans" description = "Management wants to make sure we have a fallback shelter to rely on. Prepare some beans to stock it with." @@ -51,3 +44,22 @@ description = "Something sticky, something fun, ship us a honeybun." reward = 3500 wanted_types = list(/obj/item/reagent_containers/food/snacks/honeybun) + +/datum/bounty/item/chef/superbite + name = "Super Bite Burger" //Salt, Pepper, Boiled Egg, 5 Steak, 4 Tomato, 3 Cheese, Bacon, and a Bun. Should be more than 1800. + description = "Commander Tubbs thinks he can set a competitive eating world record. All he needs is a super bite burger shipped to him." + reward = 2750 + wanted_types = list(/obj/item/reagent_containers/food/snacks/burger/superbite) + +/datum/bounty/item/chef/poppypretzel + name = "Poppy Pretzel" + description = "Central Command needs a reason to fire their HR head. Send over a poppy pretzel to force a failed drug test." + reward = 1800 + wanted_types = list(/obj/item/reagent_containers/food/snacks/poppypretzel) + +/datum/bounty/item/chef/fiestaskewer + name = "Fiesta Skewer" + description = "Apparently people are putting vegetables on kebabs now. Central Command has taken an interest in this turn of events and would like to know more." + reward = 2600 + required_count = 3 + wanted_types = list(/obj/item/reagent_containers/food/snacks/kebab/fiesta) \ No newline at end of file diff --git a/code/modules/cargo/bounties/medical.dm b/code/modules/cargo/bounties/medical.dm index 22964e1fb7..7afc0d8786 100644 --- a/code/modules/cargo/bounties/medical.dm +++ b/code/modules/cargo/bounties/medical.dm @@ -121,7 +121,7 @@ /datum/bounty/item/medical/defibrillator name = "New defibillators" - description = "After years of storge are defibrillator units have become more liabilities then we want. Please send us some new ones to replace these old ones." + description = "After years of storge our defib units have become liabilities. Please send us some new ones." reward = 2250 required_count = 5 wanted_types = list(/obj/item/defibrillator) diff --git a/code/modules/cargo/bounties/science.dm b/code/modules/cargo/bounties/science.dm index 6102d8d685..c543872565 100644 --- a/code/modules/cargo/bounties/science.dm +++ b/code/modules/cargo/bounties/science.dm @@ -25,7 +25,7 @@ /datum/bounty/item/science/nightvision_goggles name = "Night Vision Goggles" description = "An electrical storm has busted all the lights at CentCom. While management is waiting for replacements, perhaps some night vision goggles can be shipped?" - reward = 1000 + reward = 1250 wanted_types = list(/obj/item/clothing/glasses/night, /obj/item/clothing/glasses/meson/night, /obj/item/clothing/glasses/hud/health/night, /obj/item/clothing/glasses/hud/security/night, /obj/item/clothing/glasses/hud/diagnostic/night) /datum/bounty/item/science/experimental_welding_tool @@ -55,7 +55,7 @@ /datum/bounty/item/science/advanced_mop name = "Advanced Mop" - description = "Excuse me. I'd like to request $17 for a push broom rebristling. Either that, or an advanced mop." + description = "Excuse me. I'd like to request 17 credits for a push broom rebristling. Either that, or an advanced mop." reward = 3000 wanted_types = list(/obj/item/mop/advanced) @@ -108,7 +108,7 @@ wanted_types = list(/obj/item/stock_parts/micro_laser/quadultra) /datum/bounty/item/science/fakecrystals - name = "synthetic bluespace crystals" + name = "Synthetic Bluespace Crystals" description = "Don't, uh, tell anyone, but one of our BSA arrays might have had a little... accident. Send us some bluespace crystals so we can recalibrate it before anyone realizes. The whole set uses artificial bluespace crystals, so we need and not any other type of bluespace crystals..." reward = 8000 required_count = 5 diff --git a/code/modules/cargo/bounties/silly.dm b/code/modules/cargo/bounties/silly.dm index b88ec9f192..4add4e86e7 100644 --- a/code/modules/cargo/bounties/silly.dm +++ b/code/modules/cargo/bounties/silly.dm @@ -51,4 +51,17 @@ name = "Strange Object" description = "Nanotrasen has taken an interest in strange objects. Find one in maint, and ship it off to CentCom right away." reward = 1000 - wanted_types = list(/obj/item/relic) \ No newline at end of file + wanted_types = list(/obj/item/relic) + +/datum/bounty/item/silly/coconut_bong + name = "Coconut Bong" + description = "Duuuude, what if we like, carved out a coconut, and smoked some stuff in it. It'd be like, coconut flavored maaaaaan." + reward = 2750 + wanted_types = list(obj/item/bong/coconut) + +/datum/bounty/item/silly/toy_swords + name = "Toy Swords" + description = "Nanotrasen has secured a contract in a reenactment of a famous movie, but we only have lethal energy based swords. Send us some convincing replicas so we save on medical costs." + reward = 1200 + required_count = 3 + wanted_types = list(/obj/item/toy/sword, /obj/item/toy/sword/cx) \ No newline at end of file diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index ce5f0bf03a..b3c544bbfa 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -13,7 +13,8 @@ /obj/item/lighter/greyscale = 4, /obj/item/storage/fancy/rollingpapers = 5) contraband = list(/obj/item/lighter = 3, - /obj/item/clothing/mask/vape = 5) + /obj/item/clothing/mask/vape = 5, + /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 3) premium = list(/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3, /obj/item/storage/fancy/cigarettes/cigars = 1, /obj/item/storage/fancy/cigarettes/cigars/havana = 1, From 703fe9399a2acbf4e645972299d99ea204fc1455 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sat, 18 Jan 2020 22:29:21 -0500 Subject: [PATCH 2/5] Some more balance and a fix. --- code/modules/cargo/bounties/engineering.dm | 8 ++++---- code/modules/cargo/bounties/silly.dm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/cargo/bounties/engineering.dm b/code/modules/cargo/bounties/engineering.dm index 1f16788c4d..99e6aa2bdc 100644 --- a/code/modules/cargo/bounties/engineering.dm +++ b/code/modules/cargo/bounties/engineering.dm @@ -40,14 +40,14 @@ /datum/bounty/item/engineering/microwave name = "Microwaves" description = "Due to a shortage of microwaves, our chefs are incapable of keeping up with our sheer volume of orders. We need at least three microwaves to keep up with our crew's dietary habits." - reward = 1000 + reward = 2000 required_count = 3 wanted_types = list(/obj/machinery/microwave) /datum/bounty/item/engineering/hydroponicstrays name = "Hydroponics Tray" description = "The garden has become a hot spot of late, they need a few more hydroponics tray to grow more flowers." - reward = 1500 + reward = 2500 required_count = 5 wanted_types = list(/obj/machinery/hydroponics) @@ -75,14 +75,14 @@ /datum/bounty/item/engineering/arcadetrail name = "Orion Trail Arcade Games" description = "The staff have nothing to do when off-work. Can you send us some Orion Trail games to play?" - reward = 1500 + reward = 2500 required_count = 5 wanted_types = list(/obj/machinery/computer/arcade/orion_trail) /datum/bounty/item/engineering/arcadebattle name = "Battle Arcade Games" description = "The staff have nothing to do when off-work. Can you send us some Battle Arcade games to play?" - reward = 1500 + reward = 2500 required_count = 5 wanted_types = list(/obj/machinery/computer/arcade/battle) diff --git a/code/modules/cargo/bounties/silly.dm b/code/modules/cargo/bounties/silly.dm index 4add4e86e7..f790126cf2 100644 --- a/code/modules/cargo/bounties/silly.dm +++ b/code/modules/cargo/bounties/silly.dm @@ -57,7 +57,7 @@ name = "Coconut Bong" description = "Duuuude, what if we like, carved out a coconut, and smoked some stuff in it. It'd be like, coconut flavored maaaaaan." reward = 2750 - wanted_types = list(obj/item/bong/coconut) + wanted_types = list(/obj/item/bong/coconut) /datum/bounty/item/silly/toy_swords name = "Toy Swords" From 5d4732ed30ddc901f72bd354714a45a76027f2f4 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sat, 18 Jan 2020 22:36:20 -0500 Subject: [PATCH 3/5] Update assistant.dm --- code/modules/cargo/bounties/assistant.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index 84d3fd3626..2e53d29001 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -208,7 +208,7 @@ wanted_types = list(/obj/item/shield/makeshift) /datum/bounty/item/assistant/toolbelts - name = "Tool Belts" //Made it 4 so you can't just buy one set of toolbelts to finish the bounty. + name = "Tool Belts" //Made it 5 so you can't just buy one set of toolbelts to finish the bounty. description = "These things always seem to go missing. Ship us a few to help us restock." reward = 1350 required_count = 5 @@ -226,4 +226,4 @@ description = "Have you ever launched a tennis ball, newspaper, or ***** at someones head from across the room? No? We haven't either. Help us rectify this." reward = "2000" required_count = 2 - wanted_types = list(/obj/item/pneumatic_cannon/ghetto) \ No newline at end of file + wanted_types = list(/obj/item/pneumatic_cannon/ghetto) From cf9d3977b88c2467fcf9e339c3dc5714a62037f6 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sun, 19 Jan 2020 15:25:20 -0500 Subject: [PATCH 4/5] Reward Fix --- code/modules/cargo/bounties/assistant.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index 84d3fd3626..0db021ac42 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -224,6 +224,6 @@ /datum/bounty/item/assistant/pneumatic_cannon name = "Pneumatic Cannons" description = "Have you ever launched a tennis ball, newspaper, or ***** at someones head from across the room? No? We haven't either. Help us rectify this." - reward = "2000" + reward = 2000 required_count = 2 wanted_types = list(/obj/item/pneumatic_cannon/ghetto) \ No newline at end of file From 3d85499919fd1f2b8988f8921266f99fc1674005 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Thu, 23 Jan 2020 07:20:22 -0500 Subject: [PATCH 5/5] Requested Changes + Nerf Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims. --- code/modules/cargo/bounties/assistant.dm | 4 ++-- code/modules/cargo/bounties/botany.dm | 6 +++--- code/modules/vending/cigarette.dm | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm index c3abade0f4..4af28d78cc 100644 --- a/code/modules/cargo/bounties/assistant.dm +++ b/code/modules/cargo/bounties/assistant.dm @@ -148,14 +148,14 @@ reward = 1000 required_count = 5 wanted_types = list(/obj/item/restraints/handcuffs) - +/* I don't like that you can just buy a box of monkey cubes and finish this for -half- of them. /datum/bounty/item/assistant/monkey_cubes name = "Monkey Cubes" description = "Due to a recent genetics accident, Central Command is in serious need of monkeys. Your mission is to ship monkey cubes." reward = 2000 required_count = 3 wanted_types = list(/obj/item/reagent_containers/food/snacks/monkeycube) - +*/ /datum/bounty/item/assistant/chainsaw name = "Chainsaw" description = "The chef at CentCom is having trouble butchering her animals. She requests one chainsaw, please." diff --git a/code/modules/cargo/bounties/botany.dm b/code/modules/cargo/bounties/botany.dm index 43ce48503e..654bcfe74b 100644 --- a/code/modules/cargo/bounties/botany.dm +++ b/code/modules/cargo/bounties/botany.dm @@ -204,21 +204,21 @@ name = "Cannabis Leaves" wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/cannabis) exclude_types = list(/obj/item/reagent_containers/food/snacks/grown/cannabis/white, /obj/item/reagent_containers/food/snacks/grown/cannabis/death, /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate) - multiplier = 4 //hush money + multiplier = 3 //hush money bonus_desc = "Do not mention this shipment to security." foodtype = "\"meal\"" /datum/bounty/item/botany/cannabis_white name = "Lifeweed Leaves" wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/cannabis/white) - multiplier = 6 + multiplier = 5 bonus_desc = "Do not mention this shipment to security." foodtype = "\"meal\"" /datum/bounty/item/botany/cannabis_death name = "Deathweed Leaves" wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/cannabis/death) - multiplier = 6 + multiplier = 5 bonus_desc = "Do not mention this shipment to security." foodtype = "\"meal\"" diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index b3c544bbfa..f567c9765e 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -14,7 +14,7 @@ /obj/item/storage/fancy/rollingpapers = 5) contraband = list(/obj/item/lighter = 3, /obj/item/clothing/mask/vape = 5, - /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 3) + /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 1) premium = list(/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3, /obj/item/storage/fancy/cigarettes/cigars = 1, /obj/item/storage/fancy/cigarettes/cigars/havana = 1,