cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expands the Cigarette Vendor Inventory (#25925)

Browse Source 
* Cig Shopping Enhancement

* Yes

* I missed one.

Didn't realise that these cigs do actually spawn in maints and are thus in the game.
This commit is contained in:
CRUNCH
2024-06-28 03:16:42 +00:00
committed by GitHub
parent 882deeff51
commit add100e4d5
2 changed files with 60 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/generic/centcomm.dmm
+1 -1
View File
@@ -10672,7 +10672,7 @@
},
/area/ghost_bar)
"LH" = (
/obj/machinery/economy/vending/cigarette/free,
/obj/machinery/economy/vending/cigarette/beach/centcomm,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "green"
code/game/machinery/vendors/generic_vendors.dm
Vendored
+59 -24
View File
@@ -1185,13 +1185,16 @@
icon_state = "cigs"
icon_lightmask = "cigs"
category = VENDOR_TYPE_RECREATION
products = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 6,
products = list(/obj/item/clothing/mask/cigarette/cigar = 2,
/obj/item/storage/fancy/cigarettes = 6,
/obj/item/storage/fancy/cigarettes/cigpack_carp = 6,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 6,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 6,
/obj/item/storage/fancy/cigarettes/dromedaryco = 6,
/obj/item/storage/fancy/cigarettes/cigpack_random = 6,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 6,
/obj/item/storage/fancy/cigarettes/cigpack_robust = 6,
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1,
/obj/item/clothing/mask/cigarette/cigar/havana = 2,
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 6,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 6,
/obj/item/reagent_containers/patch/nicotine = 10,
/obj/item/storage/fancy/matches = 10,
/obj/item/lighter/random = 4,
@@ -1199,39 +1202,50 @@
contraband = list(/obj/item/storage/fancy/rollingpapers = 5)
prices = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 25,
prices = list(/obj/item/clothing/mask/cigarette/cigar = 100,
/obj/item/storage/fancy/cigarettes = 25,
/obj/item/storage/fancy/cigarettes/cigpack_carp = 25,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 35,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 60,
/obj/item/storage/fancy/cigarettes/dromedaryco = 25,
/obj/item/storage/fancy/cigarettes/cigpack_random = 80,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 60,
/obj/item/storage/fancy/cigarettes/cigpack_robust = 25,
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 120,
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 50,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 35,
/obj/item/reagent_containers/patch/nicotine = 70,
/obj/item/storage/fancy/matches = 20,
/obj/item/lighter/random = 40,
/obj/item/lighter/zippo = 80,
/obj/item/storage/fancy/rollingpapers = 30,
/obj/item/clothing/mask/cigarette/cigar/havana = 80)
)
refill_canister = /obj/item/vending_refill/cigarette
/obj/machinery/economy/vending/cigarette/free
prices = list()
// The Syndicate version doesn't sell Robust because that is a Nanotrasen-owned brand. It *does* have its special own-brand replacement.
/obj/machinery/economy/vending/cigarette/syndicate
products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
/obj/item/storage/fancy/cigarettes/cigpack_robust = 2,
/obj/item/storage/fancy/cigarettes/cigpack_carp = 3,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 1,
products = list(/obj/item/clothing/mask/cigarette/cigar = 6,
/obj/item/storage/fancy/cigarettes = 6,
/obj/item/storage/fancy/cigarettes/cigpack_carp = 6,
/obj/item/storage/fancy/cigarettes/dromedaryco = 6,
/obj/item/storage/fancy/cigarettes/cigpack_random = 6,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 6,
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 6,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 10,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 6,
/obj/item/reagent_containers/patch/nicotine = 10,
/obj/item/storage/fancy/matches = 10,
/obj/item/lighter/zippo = 6,
/obj/item/storage/fancy/rollingpapers = 5)
contraband = list(/obj/item/lighter/zippo = 4)
contraband = list()
/obj/machinery/economy/vending/cigarette/syndicate/free
prices = list()
/// Used in the lavaland_biodome_beach.dmm ruin
/// Used in the lavaland_biodome_beach.dmm ruin. As the ultimate in smokable vending, it sells the widest range in the grestest quantity.
/obj/machinery/economy/vending/cigarette/beach
name = "\improper ShadyCigs Ultra"
desc = "Now with extra premium products!"
@@ -1244,20 +1258,41 @@
"Dope will get you through times of no money better than money will get you through times of no dope!",
"It's good for you!")
products = list(/obj/item/storage/fancy/cigarettes = 5,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 3,
/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/cigpack_robustgold = 1,
/obj/item/clothing/mask/cigarette/cigar/havana = 2,
products = list(/obj/item/clothing/mask/cigarette/cigar = 6,
/obj/item/clothing/mask/cigarette/cigar/cohiba = 6,
/obj/item/clothing/mask/cigarette/cigar/havana = 6,
/obj/item/storage/fancy/cigarettes = 10,
/obj/item/storage/fancy/cigarettes/cigpack_carp = 10,
/obj/item/storage/fancy/cigarettes/cigpack_random = 10,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 10,
/obj/item/storage/fancy/cigarettes/cigpack_robust = 10,
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 10,
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 10,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 10,
/obj/item/reagent_containers/patch/nicotine = 20,
/obj/item/storage/fancy/matches = 10,
/obj/item/lighter/zippo = 4,
/obj/item/storage/fancy/rollingpapers = 5)
/obj/item/lighter/zippo = 10,
/obj/item/storage/fancy/rollingpapers = 10)
contraband = list()
prices = list()
// The finest cigs, available at centcomm for the crew to enjoy after a long, hard day of being brutalized.
/obj/machinery/economy/vending/cigarette/beach/centcomm
slogan_list = list("Space cigs taste good like a cigarette should.",
"I'd rather toolbox than switch.",
"Smoke!",
"Don't believe the reports - smoke today!")
ads_list = list("Probably not bad for you!",
"Don't believe the scientists!",
"It's good for you!",
"Don't quit, buy more!",
"Smoke!",
"Nicotine heaven.",
"Best cigarettes since 2150.",
"Award-winning cigs.")
/obj/machinery/economy/vending/wallmed
name = "\improper NanoMed"
desc = "Wall-mounted Medical Equipment dispenser."