From 3178450c76a10fc372ec18926fe2f1977be0e120 Mon Sep 17 00:00:00 2001
From: Aboshedab <58318297+Aboshedab@users.noreply.github.com>
Date: Wed, 2 Sep 2020 08:19:45 +0400
Subject: [PATCH] Two bug fixes: Eldritch voidsuit proper display + leftover
 lucky strike on the loadout  (#9854)

---
 .../loadout/loadout_smoking.dm                |   2 +-
 html/changelogs/Aboshehab - twobugfixes.yml   |  42 ++++++++++++++++++
 icons/mob/suit.dmi                            | Bin 440353 -> 440350 bytes
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/Aboshehab - twobugfixes.yml

diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm
index 3a05671ee33..44e97219b42 100644
--- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm
@@ -41,7 +41,7 @@
 /datum/gear/smoking/cigarettes/New()
 	..()
 	var/cigarettes = list()
-	cigarettes["Lucky Strike cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/rugged
+	cigarettes["Laissez-Faires cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/rugged
 	cigarettes["Trans-Stellar Duty Free cigarette packet"] = /obj/item/storage/box/fancy/cigarettes
 	cigarettes["DromedaryCo cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/dromedaryco
 	cigarettes["Nico-Tine cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/nicotine
diff --git a/html/changelogs/Aboshehab - twobugfixes.yml b/html/changelogs/Aboshehab - twobugfixes.yml
new file mode 100644
index 00000000000..33467eef8f6
--- /dev/null
+++ b/html/changelogs/Aboshehab - twobugfixes.yml	
@@ -0,0 +1,42 @@
+################################
+# 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: Aboshehab
+
+# 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: 
+  - bugfix: "Eldritch voidsuit will now properly display the sprite when worn."
+  - bugfix: "Updated Lucky Strike to Laissez-Faires for loadout selection."
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index b225ed764762b474f4c31c018f1fdfbe6903a7ce..7a1bdca5d64ea73b04910e05f8d41e0da7b71c23 100644
GIT binary patch
delta 1835
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
ZhXo1(hXo1)hXo1*hXo1+w*?9Y9Im+Ui);V@

delta 1839
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