Skip to content

Commit

Permalink
Moves most vendor items out of contraband. (#3007)
Browse files Browse the repository at this point in the history 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Moves a shit ton of vendor items out of contraband alongside a bunch of
misc tweaks.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## 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.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## 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:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
@Sadhorizon
Sadhorizon authored Jun 2, 2024
1 parent c8ef93c commit 9bb6b54
Show file tree
Hide file tree
Showing 19 changed files with 39 additions and 54 deletions.
3 changes: 1 addition & 2 deletions code/modules/vending/assist.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions code/modules/vending/autodrobe.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions code/modules/vending/cigarette.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 4 additions & 7 deletions code/modules/vending/clothesmate.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vending/coffee.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions code/modules/vending/cola.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
7 changes: 2 additions & 5 deletions code/modules/vending/drinnerware.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vending/engivend.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion code/modules/vending/games.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 3 additions & 6 deletions code/modules/vending/medical.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vending/medical_wall.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vending/megaseed.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions code/modules/vending/nutrimax.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vending/plasmaresearch.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions code/modules/vending/security.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions code/modules/vending/snack.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions code/modules/vending/sovietsoda.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions code/modules/vending/toys.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions code/modules/vending/youtool.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 9bb6b54

Please sign in to comment.