From ab0238293c03016f75767a577a899d8975dbbd40 Mon Sep 17 00:00:00 2001
From: Jaraci <57604458+Jaraci@users.noreply.github.com>
Date: Fri, 23 Apr 2021 11:54:23 +0100
Subject: [PATCH] Longer-lasting cigarettes (#11708)
---
.../objects/items/weapons/cigs_lighters.dm | 6 +--
html/changelogs/omicega-fdfdsfsd.yml | 41 +++++++++++++++++++
2 files changed, 44 insertions(+), 3 deletions(-)
create mode 100644 html/changelogs/omicega-fdfdsfsd.yml
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index e952da9391b..a711fd24442 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -298,7 +298,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_off = "cigoff"
type_butt = /obj/item/trash/cigbutt
chem_volume = 30
- burn_rate = 0.012 //Lasts ~83 seconds)
+ burn_rate = 0.006 //Lasts ~166 seconds)
matchmes = "USER lights their NAME with their FLAME."
lightermes = "USER manages to light their NAME with FLAME."
zippomes = "With a flick of their wrist, USER lights their NAME with their FLAME."
@@ -335,7 +335,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
last_drag = world.time
H.visible_message("[H.name] takes a drag of their [name].")
playsound(H, 'sound/items/cigs_lighters/inhale.ogg', 50, 0, -1)
- reagents.trans_to_mob(H, (rand(10,20)/10), CHEM_BREATHE) //Smokes it faster. Slightly random amount.
+ reagents.trans_to_mob(H, (rand(5,10)/10), CHEM_BREATHE) //Smokes it faster. Slightly random amount.
return 1
return ..()
@@ -754,7 +754,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/flame/lighter/zippo/europa
name = "\improper Europan Zippo lighter"
- desc = "A smokeless electrical coil lighter in the style of a zippo with the tricolour of the Jovian moon Europa on the side. It even its outside feels somewhat hot to the touch when it is turned on."
+ desc = "A smokeless electrical coil lighter in the style of a zippo with the tricolour of the Jovian moon Europa on the side. Even its outside feels somewhat hot to the touch when it is turned on."
desc_fluff = "Traditional lighters are often frowned upon in the various submarines and underwater bases of Europa for the fumes their open flames produce. As a result, flameless lighters using heated metal coils that ignite flammable material upon contact are employed instead. These lighters are often prized personal possessions of those who own them, as with living space, privacy and individual possessions are a luxury in the cramped quarters of Europan vessels and stations. A side effect of having lighters that use electrically heated metal coils as opposed to flames however, is that the exteriors of the lighters themselves can become heated to a point of inflicting superficial burns if left on for relatively short periods of time."
icon_state = "europazippo"
item_state = "europazippo"
diff --git a/html/changelogs/omicega-fdfdsfsd.yml b/html/changelogs/omicega-fdfdsfsd.yml
new file mode 100644
index 00000000000..9c09a8261b3
--- /dev/null
+++ b/html/changelogs/omicega-fdfdsfsd.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: Omicega
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - tweak: "Doubled the 'durability' of most cigarettes. You can now smoke them for about twice as long as before."
\ No newline at end of file