From db5a0109d66bcebfcdd4fbb21ac6e5c637d3d161 Mon Sep 17 00:00:00 2001 From: Dorsisdwarf Date: Sat, 27 Jun 2015 18:04:43 +0100 Subject: [PATCH 1/3] Buffs capacity of cigars to be greater than cigarettes, removes fucking stupid messages from nicotine, buffs nicotine slightly. --- code/game/objects/items/weapons/cigs_lighters.dm | 11 +++++++---- .../reagents/Chemistry-Reagents/Drug-Reagents.dm | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 99bde856d35..4d2f4c64684 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -284,7 +284,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/weapon/cigbutt/roach name = "roach" - desc = "A manky old roach." + desc = "A manky old roach, or for non-stoners, a used rollup." icon_state = "roach" /obj/item/weapon/cigbutt/roach/New() @@ -306,7 +306,7 @@ 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/cohiba name = "\improper Cohiba Robusto cigar" @@ -314,15 +314,18 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon_state = "cigar2off" icon_on = "cigar2on" icon_off = "cigar2off" + smoketime = 2000 + chem_volume = 80 + /obj/item/clothing/mask/cigarette/cigar/havana name = "premium Havanian cigar" - desc = "A cigar fit for only the best for the best." + desc = "A cigar fit for only the best of the best." icon_state = "cigar2off" icon_on = "cigar2on" icon_off = "cigar2off" smoketime = 7200 - chem_volume = 30 + chem_volume = 50 /obj/item/weapon/cigbutt name = "cigarette butt" diff --git a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm index 579caddc98a..c3d0c98b597 100644 --- a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm @@ -39,8 +39,8 @@ addiction_threshold = 30 /datum/reagent/drug/nicotine/on_mob_life(var/mob/living/M as mob) - var/smoke_message = pick("You can just feel your lungs dying!", "You feel relaxed.", "You feel calmed.", "You feel the lung cancer forming.", "You feel the money you wasted.", "You feel like a space cowboy.", "You feel rugged.") - if(prob(5)) + var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel the need to slap Goofball six kinds of shit.") + if(prob(1)) M << "[smoke_message]" M.AdjustStunned(-1) M.adjustStaminaLoss(-0.5*REM) From e12bc89fb05978e82193c708a03338c29258d353 Mon Sep 17 00:00:00 2001 From: Dorsisdwarf Date: Sat, 27 Jun 2015 19:06:38 +0100 Subject: [PATCH 2/3] Un-bashes goofball --- code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm index c3d0c98b597..b6f6e26127d 100644 --- a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm @@ -39,8 +39,8 @@ addiction_threshold = 30 /datum/reagent/drug/nicotine/on_mob_life(var/mob/living/M as mob) - var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel the need to slap Goofball six kinds of shit.") if(prob(1)) + var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert") M << "[smoke_message]" M.AdjustStunned(-1) M.adjustStaminaLoss(-0.5*REM) From 1f2e672f246daa4f357fa3f3debf167954465272 Mon Sep 17 00:00:00 2001 From: Dorsisdwarf Date: Mon, 29 Jun 2015 21:36:16 +0100 Subject: [PATCH 3/3] Remember kids: Smoking makes you RUGGED --- code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm index b6f6e26127d..33c742d825b 100644 --- a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm @@ -40,7 +40,7 @@ /datum/reagent/drug/nicotine/on_mob_life(var/mob/living/M as mob) if(prob(1)) - var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert") + var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.") M << "[smoke_message]" M.AdjustStunned(-1) M.adjustStaminaLoss(-0.5*REM)