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,