From 9bb6b54e1f1b0eb5d44c52652fc0bee0b906dfda Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Sun, 2 Jun 2024 08:31:17 +0200 Subject: [PATCH] Moves most vendor items out of contraband. (#3007) ## About The Pull Request Moves a shit ton of vendor items out of contraband alongside a bunch of misc tweaks. ## Why It's Good For The Game Hacking kinda sucks as a mechanic. It brings nothing interesting and kinda just locks some perfectly normal items behind a pointless roadblock. ## Changelog :cl: tweak: Moved most of contraband items out of vendor contraband. add: Added DromaderyCo packets to the cigarette vendors. tweak: Increased nicotine amount to three in the cigarette vendors. /:cl: --- code/modules/vending/assist.dm | 3 +-- code/modules/vending/autodrobe.dm | 3 +-- code/modules/vending/cigarette.dm | 10 +++++----- code/modules/vending/clothesmate.dm | 11 ++++------- code/modules/vending/coffee.dm | 4 ++-- code/modules/vending/cola.dm | 3 +-- code/modules/vending/drinnerware.dm | 7 ++----- code/modules/vending/engivend.dm | 4 ++-- code/modules/vending/games.dm | 1 - code/modules/vending/medical.dm | 9 +++------ code/modules/vending/medical_wall.dm | 4 ++-- code/modules/vending/megaseed.dm | 4 ++-- code/modules/vending/nutrimax.dm | 3 +-- code/modules/vending/plasmaresearch.dm | 4 ++-- code/modules/vending/security.dm | 3 +-- code/modules/vending/snack.dm | 3 +-- code/modules/vending/sovietsoda.dm | 5 +++-- code/modules/vending/toys.dm | 7 +++---- code/modules/vending/youtool.dm | 5 +++-- 19 files changed, 39 insertions(+), 54 deletions(-) diff --git a/code/modules/vending/assist.dm b/code/modules/vending/assist.dm index 8a1c86cc9536..cb3cd0053d8a 100644 --- a/code/modules/vending/assist.dm +++ b/code/modules/vending/assist.dm @@ -10,8 +10,7 @@ /obj/item/stock_parts/manipulator = 3, /obj/item/stock_parts/micro_laser = 3, /obj/item/stock_parts/scanning_module = 3, - /obj/item/stock_parts/capacitor = 3) - contraband = list( + /obj/item/stock_parts/capacitor = 3, /obj/item/assembly/timer = 2, /obj/item/assembly/voice = 2, /obj/item/assembly/health = 2, diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index c1bbe7c2d337..04ae257730f2 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -109,8 +109,7 @@ /obj/item/clothing/suit/changshan_blue = 1, /obj/item/clothing/suit/cheongsam_red = 1, /obj/item/clothing/suit/cheongsam_blue = 1, - /obj/item/gohei = 1) - contraband = list( + /obj/item/gohei = 1, /obj/item/clothing/suit/judgerobe = 1, /obj/item/clothing/head/powdered_wig = 1, /obj/item/gun/magic/wand/nothing = 2, diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index 7dd0b6004ea7..3cff7d3c361d 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -11,19 +11,19 @@ /obj/item/storage/fancy/cigarettes/cigpack_robust = 3, /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/storage/fancy/cigarettes/cigpack_midori = 3, + /obj/item/storage/fancy/cigarettes/dromedaryco = 3, + /obj/item/clothing/mask/vape = 5, /obj/item/storage/box/matches = 10, /obj/item/lighter/greyscale = 4, /obj/item/storage/fancy/rollingpapers = 5) - contraband = list( - /obj/item/clothing/mask/vape = 5, - /obj/item/clothing/mask/vape/cigar = 3) //WS edit - E-Cigars premium = list( /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3, - /obj/item/storage/box/gum/nicotine = 2, + /obj/item/storage/box/gum/nicotine = 3, /obj/item/lighter = 3, /obj/item/storage/fancy/cigarettes/cigars = 1, /obj/item/storage/fancy/cigarettes/cigars/havana = 1, - /obj/item/storage/fancy/cigarettes/cigars/cohiba = 1) + /obj/item/storage/fancy/cigarettes/cigars/cohiba = 1, + /obj/item/clothing/mask/vape/cigar = 3) refill_canister = /obj/item/vending_refill/cigarette default_price = 75 extra_price = 250 diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 8a7199968774..e9eef49a0e3a 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -104,19 +104,16 @@ /obj/item/clothing/suit/apron/purple_bartender = 2, /obj/item/clothing/under/rank/civilian/bartender/purple = 2, /obj/item/clothing/suit/toggle/suspenders/blue = 2, - /obj/item/clothing/suit/toggle/suspenders/gray = 2) - contraband = list( - /obj/item/clothing/under/syndicate/tacticool = 1, - /obj/item/clothing/under/syndicate/tacticool/skirt = 1, + /obj/item/clothing/suit/toggle/suspenders/gray = 2, + /obj/item/clothing/under/syndicate/tacticool = 2, + /obj/item/clothing/under/syndicate/tacticool/skirt = 2, /obj/item/clothing/mask/balaclava = 1, /obj/item/clothing/head/trapper = 1, /obj/item/storage/belt/fannypack/black = 2, /obj/item/clothing/suit/jacket/letterman_syndie = 1, /obj/item/clothing/under/costume/jabroni = 1, /obj/item/clothing/suit/vapeshirt = 1, - /obj/item/clothing/under/costume/geisha = 1, - /obj/item/clothing/under/rank/centcom/officer/replica = 1, - /obj/item/clothing/under/rank/centcom/officer_skirt/replica = 1) + /obj/item/clothing/under/costume/geisha = 1) premium = list( /obj/item/clothing/under/suit/checkered = 1, /obj/item/clothing/suit/jacket/leather = 1, diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm index 3e45b431b16d..9c4851c134a5 100644 --- a/code/modules/vending/coffee.dm +++ b/code/modules/vending/coffee.dm @@ -7,11 +7,11 @@ products = list( /obj/item/reagent_containers/food/drinks/coffee = 6, /obj/item/reagent_containers/food/drinks/mug/tea = 6, - /obj/item/reagent_containers/food/drinks/mug/coco = 3) + /obj/item/reagent_containers/food/drinks/mug/coco = 3, + /obj/item/reagent_containers/food/drinks/ice = 6) premium = list( /obj/item/reagent_containers/food/drinks/cafelatte = 3, /obj/item/reagent_containers/food/drinks/soylatte = 3) - contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12) refill_canister = /obj/item/vending_refill/coffee default_price = 45 extra_price = 150 diff --git a/code/modules/vending/cola.dm b/code/modules/vending/cola.dm index 2ce937979e74..4a9f4a456eee 100644 --- a/code/modules/vending/cola.dm +++ b/code/modules/vending/cola.dm @@ -15,8 +15,7 @@ /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 10, /obj/item/reagent_containers/food/drinks/waterbottle = 10, - /obj/item/reagent_containers/food/drinks/soda_cans/efuel = 5) - contraband = list( + /obj/item/reagent_containers/food/drinks/soda_cans/efuel = 5, /obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) premium = list( diff --git a/code/modules/vending/drinnerware.dm b/code/modules/vending/drinnerware.dm index 7ff7d80ddccd..5dbd8ea733db 100644 --- a/code/modules/vending/drinnerware.dm +++ b/code/modules/vending/drinnerware.dm @@ -17,11 +17,8 @@ /obj/item/kitchen/rollingpin = 2, /obj/item/kitchen/knife = 2, /obj/item/kitchen/knife/pizza_cutter = 2, - /obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 2) - contraband = list( - /obj/item/kitchen/rollingpin = 2, - /obj/item/kitchen/knife/butcher = 2, - /obj/item/shovel/spoon = 2) // ST - Only a spoonfull + /obj/item/book/granter/crafting_recipe/cooking_sweets_101 = 2, + /obj/item/kitchen/knife/butcher = 1) refill_canister = /obj/item/vending_refill/dinnerware default_price = 50 extra_price = 250 diff --git a/code/modules/vending/engivend.dm b/code/modules/vending/engivend.dm index 096bffb1adf7..fb096656c1c3 100644 --- a/code/modules/vending/engivend.dm +++ b/code/modules/vending/engivend.dm @@ -16,8 +16,8 @@ /obj/item/electronics/airalarm = 10, /obj/item/electronics/advanced_airlock_controller = 10, /obj/item/electronics/firealarm = 10, - /obj/item/electronics/firelock = 10) - contraband = list(/obj/item/stock_parts/cell/potato = 3) + /obj/item/electronics/firelock = 10, + /obj/item/stock_parts/cell/potato = 3) premium = list(/obj/item/storage/belt/utility = 3, /obj/item/construction/rcd/loaded = 2, /obj/item/storage/box/smart_metal_foam = 1) diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index d209c93eae8e..d27a1f6ffe6e 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -14,7 +14,6 @@ /obj/item/instrument/piano_synth/headphones = 4, /obj/item/camera = 3, /obj/item/dyespray = 3) - contraband = list(/obj/item/dice/fudge = 9) premium = list( /obj/item/melee/skateboard/pro = 3, /obj/item/melee/skateboard/hoverboard = 1) diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm index 1fff1bd03398..5a35a75a4495 100644 --- a/code/modules/vending/medical.dm +++ b/code/modules/vending/medical.dm @@ -27,15 +27,12 @@ /obj/item/reagent_containers/medigel/sterilizine = 1, /obj/item/sensor_device = 1, /obj/item/pinpointer/crew = 1) - contraband = list( - /obj/item/reagent_containers/pill/tox = 2, - /obj/item/reagent_containers/pill/morphine = 2, - /obj/item/reagent_containers/pill/charcoal = 4, - /obj/item/storage/box/hug/medical = 1) + contraband = list(/obj/item/reagent_containers/pill/tox = 2) premium = list( /obj/item/clothing/glasses/hud/health = 1, /obj/item/clothing/glasses/hud/health/prescription = 1, - /obj/item/shears = 1) + /obj/item/shears = 1, + /obj/item/storage/box/hug/medical = 1) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/medical diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index cf0bca7c3bdb..dd498ffded07 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -11,11 +11,11 @@ /obj/item/reagent_containers/pill/charcoal = 1, /obj/item/reagent_containers/medigel/styptic = 1, /obj/item/reagent_containers/medigel/silver_sulf = 1, - /obj/item/reagent_containers/medigel/sterilizine = 1 + /obj/item/reagent_containers/medigel/sterilizine = 1, + /obj/item/reagent_containers/pill/morphine = 1 ) contraband = list( /obj/item/reagent_containers/pill/tox = 1, - /obj/item/reagent_containers/pill/morphine = 1, /obj/item/storage/box/gum/happiness = 1 ) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index 899bbac5ea87..4d59628f5fd2 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -42,12 +42,12 @@ /obj/item/seeds/tower = 3, /obj/item/seeds/watermelon = 3, /obj/item/seeds/wheat = 3, - /obj/item/seeds/whitebeet = 3) + /obj/item/seeds/whitebeet = 3, + /obj/item/seeds/plump = 3) contraband = list(/obj/item/seeds/amanita = 2, /obj/item/seeds/glowshroom = 2, /obj/item/seeds/liberty = 2, /obj/item/seeds/nettle = 2, - /obj/item/seeds/plump = 2, /obj/item/seeds/reishi = 2, /obj/item/seeds/cannabis = 3, /obj/item/seeds/starthistle = 2, diff --git a/code/modules/vending/nutrimax.dm b/code/modules/vending/nutrimax.dm index 1849750d3fce..0aaa47461406 100644 --- a/code/modules/vending/nutrimax.dm +++ b/code/modules/vending/nutrimax.dm @@ -15,8 +15,7 @@ /obj/item/storage/bag/plants = 5, /obj/item/cultivator = 3, /obj/item/shovel/spade = 3, - /obj/item/plant_analyzer = 4) - contraband = list( + /obj/item/plant_analyzer = 4, /obj/item/reagent_containers/glass/bottle/ammonia = 10, /obj/item/reagent_containers/glass/bottle/diethylamine = 5) refill_canister = /obj/item/vending_refill/hydronutrients diff --git a/code/modules/vending/plasmaresearch.dm b/code/modules/vending/plasmaresearch.dm index 650d9878ad36..a638bfc81d8a 100644 --- a/code/modules/vending/plasmaresearch.dm +++ b/code/modules/vending/plasmaresearch.dm @@ -10,7 +10,7 @@ /obj/item/assembly/timer = 6, /obj/item/assembly/signaler = 6, /obj/item/assembly/prox_sensor = 6, - /obj/item/assembly/igniter = 6) - contraband = list(/obj/item/assembly/health = 3) + /obj/item/assembly/igniter = 6, + /obj/item/assembly/health = 3) default_price = 400 extra_price = 600 diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 0141967beff3..95afc6f2eb92 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -14,8 +14,7 @@ /obj/item/flashlight/seclite = 4, /obj/item/ammo_box/c9mm/rubbershot = 3, /obj/item/ammo_box/c9mm = 1, - /obj/item/stock_parts/cell/gun = 3) - contraband = list( + /obj/item/stock_parts/cell/gun = 3, /obj/item/clothing/glasses/sunglasses = 2) premium = list( /obj/item/storage/belt/security/webbing = 5, diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 0785df82f14d..d0130d7358fc 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -14,8 +14,7 @@ /obj/item/reagent_containers/food/snacks/no_raisin = 6, /obj/item/reagent_containers/food/drinks/dry_ramen = 3, /obj/item/storage/box/gum = 3, - /obj/item/reagent_containers/food/snacks/energybar = 6) - contraband = list( + /obj/item/reagent_containers/food/snacks/energybar = 6, /obj/item/reagent_containers/food/snacks/syndicake = 6, /obj/item/reagent_containers/food/snacks/candy/bronx = 1) refill_canister = /obj/item/vending_refill/snack diff --git a/code/modules/vending/sovietsoda.dm b/code/modules/vending/sovietsoda.dm index f9eff36e5e6c..213a3d01df0a 100644 --- a/code/modules/vending/sovietsoda.dm +++ b/code/modules/vending/sovietsoda.dm @@ -4,8 +4,9 @@ icon_state = "sovietsoda" light_mask = "soviet-light-mask" product_ads = "Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." - products = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30) - contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20) + products = list( + /obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30, + /obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/sovietsoda default_price = 1 diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index c86049ab75ef..8fefa1015536 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -16,11 +16,10 @@ /obj/item/toy/foamblade = 10, /obj/item/toy/balloon/syndicate = 10, /obj/item/clothing/suit/syndicatefake = 5, - /obj/item/clothing/head/syndicatefake = 5) - contraband = list( + /obj/item/clothing/head/syndicatefake = 5, /obj/item/gun/ballistic/shotgun/toy/crossbow = 10, - /obj/item/gun/ballistic/automatic/smg/c20r/toy = 10, - /obj/item/gun/ballistic/automatic/hmg/l6_saw/toy = 10, + /obj/item/gun/ballistic/automatic/smg/c20r/toy = 5, + /obj/item/gun/ballistic/automatic/hmg/l6_saw/toy = 5, /obj/item/toy/katana = 10, /obj/item/dualsaber/toy = 5) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm index 6e75c75c7eae..98a5331b2744 100644 --- a/code/modules/vending/youtool.dm +++ b/code/modules/vending/youtool.dm @@ -15,8 +15,9 @@ /obj/item/flashlight/glowstick = 3, /obj/item/flashlight/glowstick/red = 3, /obj/item/flashlight = 3, - /obj/item/clothing/ears/earmuffs = 1) - contraband = list(/obj/item/clothing/gloves/color/fyellow = 2) + /obj/item/clothing/ears/earmuffs = 1, + /obj/item/clothing/gloves/color/fyellow = 2 + ) premium = list(/obj/item/storage/belt/utility = 2, /obj/item/multitool = 2, /obj/item/weldingtool/hugetank = 1,