cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-30 08:38:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various cig-related tweaks

Browse Source
This commit is contained in:
Cerebulon
2022-10-18 00:34:55 +01:00
parent 9be056c8bf
commit e7a9d286b9
10 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_smoking.dm
+5 -1
View File
@@ -55,7 +55,11 @@
display_name = "electronic cigarette"
path = /obj/item/clothing/mask/smokable/ecig/util
/datum/gear/ecig/deluxe
/datum/gear/ecig_simple
display_name = "electronic cigarette, simple"
path = /obj/item/clothing/mask/smokable/ecig/simple
/datum/gear/ecig_deluxe
display_name = "electronic cigarette, deluxe"
path = /obj/item/clothing/mask/smokable/ecig/deluxe
cost = 2
code/modules/economy/vending_machines.dm
+6 -6
View File
@@ -313,7 +313,6 @@
/obj/item/storage/box/matches = 10,
/obj/item/flame/lighter/random = 4,
/obj/item/clothing/mask/smokable/ecig/util = 2,
///obj/item/clothing/mask/smokable/ecig/deluxe = 2,
/obj/item/clothing/mask/smokable/ecig/simple = 2,
/obj/item/reagent_containers/ecig_cartridge/med_nicotine = 10,
/obj/item/reagent_containers/ecig_cartridge/high_nicotine = 5,
@@ -325,10 +324,12 @@
/obj/item/reagent_containers/ecig_cartridge/coffee = 5,
/obj/item/reagent_containers/ecig_cartridge/blanknico = 2,
/obj/item/storage/box/fancy/chewables/tobacco/nico = 5)
contraband = list(/obj/item/flame/lighter/zippo = 4)
contraband = list(/obj/item/flame/lighter/zippo = 4,
/obj/item/reagent_containers/ecig_cartridge/ambrosia = 5)
premium = list(/obj/item/storage/fancy/cigar = 5,
/obj/item/storage/fancy/cigarettes/carcinomas = 5,
/obj/item/storage/fancy/cigarettes/professionals = 5)
/obj/item/storage/fancy/cigarettes/professionals = 5,
/obj/item/clothing/mask/smokable/ecig/deluxe = 2)
prices = list(/obj/item/storage/fancy/cigarettes = 12,
/obj/item/storage/fancy/cigarettes/dromedaryco = 20,
/obj/item/storage/fancy/cigarettes/killthroat = 14,
@@ -341,9 +342,8 @@
/obj/item/storage/chewables/tobacco/fine = 20,
/obj/item/storage/box/matches = 1,
/obj/item/flame/lighter/random = 2,
/obj/item/clothing/mask/smokable/ecig/util = 100,
///obj/item/clothing/mask/smokable/ecig/deluxe = 300,
/obj/item/clothing/mask/smokable/ecig/simple = 150,
/obj/item/clothing/mask/smokable/ecig/util = 150,
/obj/item/clothing/mask/smokable/ecig/simple = 100,
/obj/item/reagent_containers/ecig_cartridge/med_nicotine = 10,
/obj/item/reagent_containers/ecig_cartridge/high_nicotine = 15,
/obj/item/reagent_containers/ecig_cartridge/orange = 15,