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

midori-san (#16856)

Browse Source
This commit is contained in:
Mieszko Jędrzejczak
2021-10-09 18:06:43 +02:00
committed by GitHub
parent 2908f321be
commit 7c39eafafe
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/game/machinery/vending.dm
View File

@@ -1120,10 +1120,26 @@
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.")
vend_delay = 34
icon_state = "cigs"
products = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 12, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 6, /obj/item/storage/fancy/cigarettes/cigpack_random = 6, /obj/item/reagent_containers/food/pill/patch/nicotine = 10, /obj/item/storage/box/matches = 10,/obj/item/lighter/random = 4,/obj/item/storage/fancy/rollingpapers = 5)
products = list(
/obj/item/storage/fancy/cigarettes/cigpack_robust = 12,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 6,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 6,
/obj/item/storage/fancy/cigarettes/cigpack_random = 6,
/obj/item/reagent_containers/food/pill/patch/nicotine = 10,
/obj/item/storage/box/matches = 10,
/obj/item/lighter/random = 4,
/obj/item/storage/fancy/rollingpapers = 5)
contraband = list(/obj/item/lighter/zippo = 4)
premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2, /obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1)
prices = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 60, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 80, /obj/item/storage/fancy/cigarettes/cigpack_random = 120, /obj/item/reagent_containers/food/pill/patch/nicotine = 70, /obj/item/storage/box/matches = 10,/obj/item/lighter/random = 60, /obj/item/storage/fancy/rollingpapers = 20)
premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2,
/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 1)
prices = list(/obj/item/storage/fancy/cigarettes/cigpack_robust = 60,
/obj/item/storage/fancy/cigarettes/cigpack_uplift = 80,
/obj/item/storage/fancy/cigarettes/cigpack_midori = 100,
/obj/item/storage/fancy/cigarettes/cigpack_random = 120,
/obj/item/reagent_containers/food/pill/patch/nicotine = 70,
/obj/item/storage/box/matches = 10,
/obj/item/lighter/random = 60,
/obj/item/storage/fancy/rollingpapers = 20)
refill_canister = /obj/item/vending_refill/cigarette
/obj/machinery/vending/cigarette/free

3
code/game/objects/items/weapons/cigs.dm
View File

@@ -262,6 +262,9 @@ LIGHTERS ARE IN LIGHTERS.DM
pixel_x = rand(-5, 5)
pixel_y = rand(-5, 5)
/obj/item/clothing/mask/cigarette/rollie/nicotine
list_reagents = list("nicotine" = 40)
/obj/item/cigbutt/roach
name = "roach"

1
code/game/objects/items/weapons/storage/fancy.dm
View File

@@ -293,6 +293,7 @@
desc = "You can't understand the runes, but the packet smells funny."
icon_state = "midoripacket"
item_state = "midoripacket"
cigarette_type = /obj/item/clothing/mask/cigarette/rollie/nicotine
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims
name ="\improper Shady Jim's Super Slims"