From c000cb4c78a072835e0552daedd97d082ce6a3ce Mon Sep 17 00:00:00 2001 From: Krausus Date: Sat, 2 May 2015 23:08:17 -0400 Subject: [PATCH] Doubles cigar(ette) capacity, tweaks base nicotine --- code/game/objects/items/weapons/cigs_lighters.dm | 10 +++++----- code/game/objects/items/weapons/storage/fancy.dm | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 5f6b1f0aae4..aacdc9c6e37 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -67,12 +67,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/type_butt = /obj/item/weapon/cigbutt var/lastHolder = null var/smoketime = 300 - var/chem_volume = 15 + var/chem_volume = 30 /obj/item/clothing/mask/cigarette/New() ..() flags |= NOREACT // so it doesn't react until you light it - create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15 + create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 30 /obj/item/clothing/mask/cigarette/Destroy() ..() @@ -258,11 +258,11 @@ CIGARETTE PACKETS ARE IN FANCY.DM throw_speed = 0.5 item_state = "cigaroff" smoketime = 1500 - chem_volume = 20 + chem_volume = 40 /obj/item/clothing/mask/cigarette/cigar/New() ..() - reagents.add_reagent("nicotine", chem_volume) + reagents.add_reagent("nicotine", chem_volume/2) /obj/item/clothing/mask/cigarette/cigar/cohiba name = "Cohiba Robusto Cigar" @@ -278,7 +278,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_on = "cigar2on" icon_off = "cigar2off" smoketime = 7200 - chem_volume = 30 + chem_volume = 60 /obj/item/weapon/cigbutt name = "cigarette butt" diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index dbf10425c42..94db07084a2 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -163,7 +163,7 @@ /obj/item/weapon/storage/fancy/cigarettes/New() ..() flags |= NOREACT - create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one + create_reagents(30 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one for(var/i = 1 to storage_slots) var/obj/item/clothing/mask/cigarette/C = new /obj/item/clothing/mask/cigarette(src) unlaced_cigarettes += C @@ -185,7 +185,7 @@ if(istype(C) && (C in unlaced_cigarettes)) // Only transfer reagents to each cigarette once reagents.trans_to(C, (reagents.total_volume/unlaced_cigarettes.len)) unlaced_cigarettes -= C - reagents.maximum_volume = 15 * unlaced_cigarettes.len + reagents.maximum_volume = 30 * unlaced_cigarettes.len /obj/item/weapon/storage/fancy/cigarettes/remove_from_storage(obj/item/W as obj, atom/new_location) lace_cigarette(W) @@ -228,7 +228,7 @@ desc = "An obscure brand of cigarettes." icon_state = "syndiepacket" item_state = "cigpacket" - default_reagents = list("omnizine" = 15) + default_reagents = list("nicotine" = 15, "omnizine" = 15) /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift name = "\improper Uplift Smooth packet" @@ -247,7 +247,7 @@ desc = "Smoked by the truly robust." icon_state = "robustgpacket" item_state = "cigpacket" - default_reagents = list("nicotine" = 14, "gold" = 1) + default_reagents = list("nicotine" = 15, "gold" = 1) /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp name = "\improper Carp Classic packet" @@ -266,8 +266,8 @@ desc = "Is your weight slowing you down? Having trouble running away from gravitational singularities? Can't stop stuffing your mouth? Smoke Shady Jim's Super Slims and watch all that fat burn away. Guaranteed results!" icon_state = "shadyjimpacket" item_state = "cigpacket" - default_reagents = list("nicotine" = 6.5, - "lipolicide" = 4, + default_reagents = list("nicotine" = 15, + "lipolicide" = 7.5, "ammonia" = 2, "atrazine" = 1, "toxin" = 1.5)