Merge pull request #15256 from keronshb/fatdart

no idea what this thing even is but he's chuffin back a fat dart and that's all that matters
This commit is contained in:
silicons
2021-10-15 00:18:39 -07:00
committed by GitHub
5 changed files with 13 additions and 1 deletions
+11
View File
@@ -300,6 +300,17 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A Xeno Filtered brand cigarette."
list_reagents = list (/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15, /datum/reagent/drug/krokodil = 4)
/obj/item/clothing/mask/cigarette/dart
name = "fat dart"
desc = "Chuff back this fat dart"
icon_state = "bigoff"
icon_on = "bigon"
icon_off = "bigoff"
w_class = WEIGHT_CLASS_BULKY
smoketime = 10000
chem_volume = 50
list_reagents = list(/datum/reagent/drug/nicotine = 15)
// Rollies.
/obj/item/clothing/mask/cigarette/rollie
+2 -1
View File
@@ -14,7 +14,8 @@
/obj/item/storage/fancy/rollingpapers = 5)
contraband = list(/obj/item/lighter = 3,
/obj/item/clothing/mask/vape = 5,
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 1)
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 1,
/obj/item/clothing/mask/cigarette/dart = 3)
premium = list(/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3,
/obj/item/storage/fancy/cigarettes/cigars = 1,
/obj/item/storage/fancy/cigarettes/cigars/havana = 1,