diff --git a/code/datums/outfits/event/outfit_nanotrasen.dm b/code/datums/outfits/event/outfit_nanotrasen.dm
index 7970e252fa1..b70ef29fe1a 100644
--- a/code/datums/outfits/event/outfit_nanotrasen.dm
+++ b/code/datums/outfits/event/outfit_nanotrasen.dm
@@ -92,7 +92,7 @@
head = /obj/item/clothing/head/beret/centcom/commander
backpack_contents = list(
- /obj/item/storage/fancy/cigar = 1,
+ /obj/item/storage/fancy/cigarettes/cigar = 1,
/obj/item/flame/lighter/zippo = 1,
/obj/item/clothing/accessory/medal/gold/heroism = 1
)
@@ -216,4 +216,4 @@
/obj/item/storage/box/engineer = 1,
/obj/item/storage/box/zipties = 1,
/obj/item/clothing/head/helmet = 1
- )
\ No newline at end of file
+ )
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 45cf693fd4b..c51340e0d88 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -53,7 +53,7 @@
var/path = pick(list(
/obj/item/clothing/mask/smokable/pipe,
/obj/item/clothing/mask/smokable/pipe/cobpipe,
- /obj/item/storage/fancy/cigar,
+ /obj/item/storage/fancy/cigarettes/cigar,
/obj/item/storage/fancy/cigarettes
))
H.equip_or_collect(new path(), slot_wear_mask)
diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm
index a940fc6cbd0..185c983cd6a 100644
--- a/code/game/machinery/vending_types.dm
+++ b/code/game/machinery/vending_types.dm
@@ -357,7 +357,7 @@
)
premium = list(
/obj/item/flame/lighter/zippo = 4,
- /obj/item/storage/fancy/cigar = 5
+ /obj/item/storage/fancy/cigarettes/cigar = 5
)
prices = list(
/obj/item/storage/fancy/cigarettes/rugged = 67,
@@ -402,7 +402,7 @@
/obj/item/reagent_containers/glass/beaker = 4,
/obj/item/reagent_containers/dropper = 2,
/obj/item/stack/medical/bruise_pack = 5,
- /obj/item/stack/medical/ointment = 5,
+ /obj/item/stack/medical/ointment = 5,
/obj/item/stack/medical/advanced/bruise_pack = 3,
/obj/item/stack/medical/advanced/ointment = 3,
/obj/item/stack/medical/splint = 2,
@@ -1060,4 +1060,4 @@
/obj/item/coin/battlemonsters = 10
)
restock_items = 0
- light_color = COLOR_BABY_BLUE
\ No newline at end of file
+ light_color = COLOR_BABY_BLUE
diff --git a/code/game/objects/items/tajara.dm b/code/game/objects/items/tajara.dm
index b01611ea0c8..50461784940 100644
--- a/code/game/objects/items/tajara.dm
+++ b/code/game/objects/items/tajara.dm
@@ -1,8 +1,40 @@
+/obj/item/storage/fancy/cigarettes/pra
+ name = "\improper Labourer's Choice cigarette packet"
+ desc = "Jokingly referred to an essential part of a working class citizen's breakfast, beside state-provided provisions."
+ desc_fluff = "Imported from the People's Republic of Adhomai."
+ icon_state = "prapacket"
+ item_state = "Dpacket"
+ storage_slots = 7
+ cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai
+ can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt, /obj/item/tajcard)
+
+/obj/item/storage/fancy/cigarettes/pra/fill()
+ ..()
+ new /obj/item/tajcard(src)
+
+/obj/item/storage/fancy/cigarettes/dpra
+ name = "\improper Shastar List'ya cigarette packet"
+ desc = "Rumored to be a de-facto currency for Adhominian knuckles off-planet."
+ desc_fluff = "Imported from the Democratic People's Republic of Adhomai."
+ icon_state = "dprapacket"
+ item_state = "Bpacket"
+ cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai
+
+/obj/item/storage/fancy/cigarettes/nka
+ name = "\improper Gato Royales cigarette packet"
+ desc = "Popular with the aristocrats of the New Kingdom of Adhomai for its mild menthol flavor."
+ desc_fluff = "Imported from the New Kingdom of Adhomai."
+ icon_state = "nkapacket"
+ item_state = "Fpacket"
+ cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai
+
/obj/item/tajcard
name = "collectable tajaran card"
- desc = "A collectable card, usually found inside cigarette packs, with the illustration of a famous Tajara."
+ desc = "A collectable card with an illustration of a famous Tajaran figure, usually found inside cigarette packets."
icon = 'icons/obj/playing_cards.dmi'
icon_state = "tajcig"
+ drop_sound = 'sound/items/drop/paper.ogg'
+ pickup_sound = 'sound/items/pickup/paper.ogg'
w_class = ITEMSIZE_SMALL
var/list/figures = list("hadii", "tesla", "headmaster", "commissar", "almanq", "yasmin", "andrey", "paratrooper", "scout")
@@ -155,7 +187,7 @@
/obj/item/flame/lighter/adhomai
name = "adhomian lighter"
- desc = "An adhomian lighter, it is designated to protect the flame from the strong winds of the Tajaran homeworld."
+ desc = "An adhomian lighter, designed to protect the flame from the strong winds of the Tajaran homeworld."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "trenchlighter"
item_state = "trenchlighter"
@@ -234,4 +266,4 @@
starts_with = list(
/obj/item/dice/tajara = 3,
/obj/item/dice/tajara/alt = 3
- )
\ No newline at end of file
+ )
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index b6c33599f14..b3835b173d4 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -167,7 +167,7 @@ obj/item/clothing/mask/chewable/Destroy()
starts_with = list(/obj/item/clothing/mask/chewable/candy/gum = 5)
can_hold = list(/obj/item/clothing/mask/chewable/candy/gum,
/obj/item/trash/spitgum)
- use_sound = 'sound/items/drop/paper.ogg'
+ use_sound = 'sound/items/drop/wrapper.ogg'
drop_sound = 'sound/items/drop/wrapper.ogg'
pickup_sound = 'sound/items/pickup/wrapper.ogg'
max_storage_space = 5
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 0dec98b7225..c965609a4ff 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -608,7 +608,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
item_state = icon_state
base_state = icon_state
-/obj/item/flame/lighter/zippo/update_icon()
+/obj/item/flame/lighter/update_icon()
if(lit)
icon_state = "[base_state]on"
item_state = "[base_state]on"
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 80bc3db6592..7ec18566802 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -114,7 +114,7 @@
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonbox"
icon_type = "crayon"
- w_class = 2.0
+ w_class = ITEMSIZE_SMALL
can_hold = list(
/obj/item/pen/crayon
)
@@ -152,8 +152,9 @@
//CIG PACK//
////////////
/obj/item/storage/fancy/cigarettes
- name = "Trans-Stellar Duty Free cigarette packet"
+ name = "Trans-Stellar Duty Frees cigarette packet"
desc = "A ubiquitous brand of cigarettes, found in the facilities of every major spacefaring corporation in the universe. As mild and flavorless as it gets."
+ desc_info = "You can put a cigarette directly in your mouth by selecting the mouth region and clicking on yourself with a cigarette packet in hand."
icon = 'icons/obj/cigs_lighters.dmi'
icon_state = "cigpacket"
item_state = "cigpacket"
@@ -164,8 +165,8 @@
)
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/gloves.ogg'
- use_sound = 'sound/items/drop/paper.ogg'
- w_class = 1
+ use_sound = 'sound/items/drop/wrapper.ogg'
+ w_class = ITEMSIZE_TINY
throwforce = 2
slot_flags = SLOT_BELT
storage_slots = 6
@@ -197,7 +198,7 @@
if(M == user && target_zone == BP_MOUTH && contents.len > 0 && !user.wear_mask)
var/obj/item/clothing/mask/smokable/cigarette/W = new cigarette_to_spawn(user)
if(!istype(W))
- to_chat(user, "The [W] is blocking the cigarettes.")
+ to_chat(user, SPAN_NOTICE("The [W] is in the way."))
return
//Checking contents of packet so lighters won't be cigarettes.
for (var/i = contents.len; i > 0; i--)
@@ -211,7 +212,7 @@
reagents.trans_to_obj(W, (reagents.total_volume/contents.len))
user.equip_to_slot_if_possible(W, slot_wear_mask)
reagents.maximum_volume = 15 * contents.len
- to_chat(user, "You take a cigarette out of the pack.")
+ user.visible_message("[user] casually pulls out a [cigarette_to_spawn] from \the [src] with their mouth.", range = 3)
update_icon()
else
..()
@@ -220,120 +221,52 @@
/obj/item/storage/fancy/cigarettes/acmeco
name = "\improper AcmeCo cigarette packet"
- desc = "A packet of six AcmeCo cigarettes. For those who somehow want to obtain the record for the most amount of cancerous tumors."
+ desc = "For those who somehow want to obtain the record for the most amount of cancerous tumors."
icon_state = "Apacket"
item_state = "Apacket"
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/acmeco
/obj/item/storage/fancy/cigarettes/blank
name = "\improper blank cigarette packet"
- desc = "A packet of six blank cigarettes. The healthiest cigarettes on the market!"
+ desc = "The healthiest cigarettes on the market! Wait, isn't this just a roll of paper?"
icon_state = "Bpacket"
item_state = "Bpacket"
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/blank
+/obj/item/storage/fancy/cigarettes/cigar
+ name = "cigar case"
+ desc = "A luxurious tote for your fat tokes."
+ icon_state = "cigarcase"
+ item_state = "cigarcase"
+ icon_type = "cigar"
+ drop_sound = 'sound/items/drop/weldingtool.ogg'
+ pickup_sound = 'sound/items/pickup/weldingtool.ogg'
+ use_sound = 'sound/items/storage/briefcase.ogg'
+ storage_slots = 8
+ can_hold = list(/obj/item/clothing/mask/smokable/cigarette/cigar)
+ cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/cigar
+
/obj/item/storage/fancy/cigarettes/dromedaryco
name = "\improper DromedaryCo cigarette packet"
- desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
+ desc = "A label on the packaging reads, \"Wouldn't a slow death make a change?\""
icon_state = "Dpacket"
item_state = "Dpacket"
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/dromedaryco
-/obj/item/storage/fancy/cigar
- name = "cigar case"
- desc = "A case for holding your cigars when you are not smoking them."
- icon_state = "cigarcase"
- item_state = "cigarcase"
- icon = 'icons/obj/cigs_lighters.dmi'
- drop_sound = 'sound/items/drop/shovel.ogg'
- pickup_sound = 'sound/items/pickup/shovel.ogg'
- use_sound = 'sound/items/storage/briefcase.ogg'
- item_icons = list(
- slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
- slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
- )
- w_class = 1
- throwforce = 2
- slot_flags = SLOT_BELT
- storage_slots = 8
- can_hold = list(/obj/item/clothing/mask/smokable/cigarette/cigar)
- icon_type = "cigar"
-
-/obj/item/storage/fancy/cigar/Initialize()
- . = ..()
- flags |= NOREACT
- create_reagents(15 * storage_slots)
-
-/obj/item/storage/fancy/cigar/fill()
- ..()
- for(var/i = 1 to storage_slots)
- new /obj/item/clothing/mask/smokable/cigarette/cigar(src)
-
-/obj/item/storage/fancy/cigar/update_icon()
- icon_state = "[initial(icon_state)][contents.len]"
- return
-
-/obj/item/storage/fancy/cigar/remove_from_storage(obj/item/W as obj, atom/new_location)
- var/obj/item/clothing/mask/smokable/cigarette/cigar/C = W
- if(!istype(C)) return
- reagents.trans_to_obj(C, (reagents.total_volume/contents.len))
- ..()
-
-/obj/item/storage/fancy/cigar/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob, var/target_zone)
- if(!istype(M, /mob))
- return
-
- if(M == user && target_zone == BP_MOUTH && contents.len > 0 && !user.wear_mask)
- var/obj/item/clothing/mask/smokable/cigarette/cigar/W = new /obj/item/clothing/mask/smokable/cigarette/cigar(user)
- reagents.trans_to_obj(W, (reagents.total_volume/contents.len))
- user.equip_to_slot_if_possible(W, slot_wear_mask)
- reagents.maximum_volume = 15 * contents.len
- contents.len--
- to_chat(user, "You take a cigar out of the case.")
- update_icon()
- else
- ..()
-
/obj/item/storage/fancy/cigarettes/nicotine
name = "\improper Nico-Tine cigarette packet"
- desc = "A packet of six Nico-Tine cigarettes. Allegedly advertised as the most enviromentally friendly cigarettes in the market. It doesn't specify how, but it definitely isn't your body."
+ desc = "An Eridani marketing triumph - the jingle still torments people to this day."
icon_state = "Epacket"
item_state = "Epacket"
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/nicotine
/obj/item/storage/fancy/cigarettes/rugged
- name = "\improper Lucky Strike cigarette packet"
- desc = "A packet of six Lucky Strike cigarettes. Rumored to be part of an Idris money laundering scheme, its original purpose long forgotten."
+ name = "\improper Laissez-Faires cigarette packet"
+ desc = "Rumored to have outlived its original purpose as part of an Idris money laundering scheme."
icon_state = "Fpacket"
item_state = "Fpacket"
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/rugged
-/obj/item/storage/fancy/cigarettes/pra
- name = "\improper Working Tajara cigarette packet"
- desc = "A packet of six adhomian \"Working Tajara\" cigarettes, imported straight from the People's Republic of Adhomai."
- icon_state = "prapacket"
- item_state = "prapacket"
- cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai
- can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt, /obj/item/tajcard)
-
-/obj/item/storage/fancy/cigarettes/pra/fill()
- ..()
- new /obj/item/tajcard(src)
-
-/obj/item/storage/fancy/cigarettes/dpra
- name = "\improper Shastar Leaves cigarette packet"
- desc = "A packet of six adhomian \"Shastar Leaves\" cigarettes, imported straight from the Democratic People's Republic of Adhomai."
- icon_state = "dprapacket"
- item_state = "dprapacket"
- cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai
-
-/obj/item/storage/fancy/cigarettes/nka
- name = "\improper Royal Choice cigarette packet"
- desc = "A packet of six adhomian \"Royal Choice\" cigarettes, imported straight from the New Kingdom of Adhomai."
- icon_state = "nkapacket"
- item_state = "nkapacket"
- cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai
-
/*
* Vial Box
*/
@@ -359,7 +292,7 @@
use_sound = 'sound/items/drop/glass.ogg'
drop_sound = 'sound/items/drop/toolbox.ogg'
pickup_sound = 'sound/items/pickup/toolbox.ogg'
- max_w_class = 2
+ max_w_class = ITEMSIZE_SMALL
can_hold = list(/obj/item/reagent_containers/glass/beaker/vial)
max_storage_space = 12 //The sum of the w_classes of all the items in this storage item.
storage_slots = 6
diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index e1133044359..8990aa892f4 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -59,7 +59,7 @@
item_state = "cigpacket"
drop_sound = 'sound/items/drop/wrapper.ogg'
pickup_sound = 'sound/items/pickup/wrapper.ogg'
- use_sound = 'sound/items/drop/paper.ogg'
+ use_sound = 'sound/items/drop/wrapper.ogg'
item_icons = list(
slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
@@ -93,7 +93,7 @@
make_exact_fit()
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/gloves.ogg'
- use_sound = 'sound/items/drop/paper.ogg'
+ use_sound = 'sound/items/drop/wrapper.ogg'
/obj/item/storage/fancy/cigpaper/fine
name = "\improper Trident cigarette paper"
diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm
index 41e16845179..08765df7893 100644
--- a/code/modules/cargo/random_stock/t1_common.dm
+++ b/code/modules/cargo/random_stock/t1_common.dm
@@ -115,8 +115,8 @@ STOCK_ITEM_COMMON(tech, 5)
STOCK_ITEM_COMMON(smokes, 2)
new /obj/item/flame/lighter/random(L)
if (prob(20))
- new /obj/item/storage/fancy/cigar(L)
- new /obj/item/storage/fancy/cigar(L)
+ new /obj/item/storage/fancy/cigarettes/cigar(L)
+ new /obj/item/storage/fancy/cigarettes/cigar(L)
else
new /obj/item/storage/fancy/cigarettes/blank(L)
new /obj/item/storage/fancy/cigarettes/blank(L)
diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm
index 65dcc6b239f..ac6c9670ffa 100644
--- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm
@@ -13,7 +13,7 @@
/datum/gear/smoking/cigarcase
display_name = "cigar case"
- path = /obj/item/storage/fancy/cigar
+ path = /obj/item/storage/fancy/cigarettes/cigar
cost = 2
/datum/gear/smoking/cigarettes
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 2bfb162fbed..54f2abc16a0 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -2027,7 +2027,7 @@ All custom items with worn sprites must follow the contained sprite system: http
contained_sprite = TRUE
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/gloves.ogg'
- use_sound = 'sound/items/drop/paper.ogg'
+ use_sound = 'sound/items/drop/wrapper.ogg'
/obj/item/storage/fancy/fluff/sentiment_bouquet/fill()
. = ..()
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index d362e618d44..72545180af8 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -2482,7 +2482,7 @@
w_class = 1
starts_with = list(/obj/item/reagent_containers/food/snacks/mint/admints = 6)
can_hold = list(/obj/item/reagent_containers/food/snacks/mint/admints)
- use_sound = 'sound/items/drop/paper.ogg'
+ use_sound = 'sound/items/drop/wrapper.ogg'
drop_sound = 'sound/items/drop/wrapper.ogg'
pickup_sound = 'sound/items/pickup/wrapper.ogg'
max_storage_space = 6
diff --git a/html/changelogs/wezzy_cigar_onehand.yml b/html/changelogs/wezzy_cigar_onehand.yml
new file mode 100644
index 00000000000..a163b4fc61f
--- /dev/null
+++ b/html/changelogs/wezzy_cigar_onehand.yml
@@ -0,0 +1,44 @@
+################################
+# 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: Wowzewow (Wezzy)
+
+# 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:
+ - rscadd: "Adds a information description to to cigarette packets on how to give yourself a cigarette with one hand."
+ - tweak: "Tweaks the names of some cigarette packets to be (debatably) more witty and on the nose."
+ - imageadd: "Improves the sprites of some tajaran cigarette packets."
+ - bugfix: "Fixes cheap lighters not showing their flames properly."
diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi
index 0980ba8e6da..9713051d960 100644
Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index dc7583b8bf0..dd6dad9d15f 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -15685,7 +15685,7 @@
/obj/item/clothing/mask/smokable/pipe/cobpipe,
/obj/item/clothing/mask/smokable/pipe,
/obj/item/flame/lighter/zippo,
-/obj/item/storage/fancy/cigar,
+/obj/item/storage/fancy/cigarettes/cigar,
/turf/unsimulated/floor{
name = "plating";
icon_state = "cult"
@@ -17556,7 +17556,7 @@
pixel_x = 2;
premium = list();
prices = list();
- products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/random = 4, /obj/item/storage/fancy/cigar = 5, /obj/item/storage/fancy/cigarettes/acmeco = 5)
+ products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/random = 4, /obj/item/storage/fancy/cigarettes/cigar = 5, /obj/item/storage/fancy/cigarettes/acmeco = 5)
},
/turf/simulated/floor/lino/grey,
/area/merchant_station)
@@ -19903,7 +19903,7 @@
},
/area/shuttle/distress/centcom)
"dNm" = (
-/obj/item/storage/fancy/cigar{
+/obj/item/storage/fancy/cigarettes/cigar{
layer = 3.01;
pixel_x = -5;
pixel_y = 6
@@ -24196,7 +24196,7 @@
/obj/item/melee/energy/sword/knife,
/obj/item/melee/telebaton,
/obj/item/device/megaphone,
-/obj/item/storage/fancy/cigar,
+/obj/item/storage/fancy/cigarettes/cigar,
/obj/item/flame/lighter/zippo,
/obj/item/reagent_containers/food/drinks/bottle/victorygin,
/obj/item/reagent_containers/food/drinks/bottle/whiskey,
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index 82e59762e60..8a2b8dbfc33 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -19005,7 +19005,7 @@
/area/crew_quarters/captain)
"aHf" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/cigar,
+/obj/item/storage/fancy/cigarettes/cigar,
/obj/item/flame/lighter/zippo,
/obj/item/hand_tele,
/obj/item/device/radio/intercom{
@@ -47686,7 +47686,7 @@
},
/obj/machinery/door/firedoor,
/obj/structure/table/reinforced,
-/obj/item/storage/fancy/cigar,
+/obj/item/storage/fancy/cigarettes/cigar,
/turf/simulated/floor/lino/grey,
/area/crew_quarters/bar)
"bIv" = (
diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm
index 23d52e77570..b5a2c393289 100644
--- a/maps/exodus/exodus-2_centcomm.dmm
+++ b/maps/exodus/exodus-2_centcomm.dmm
@@ -10913,7 +10913,7 @@
/area/centcom/test)
"aMc" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/cigar,
+/obj/item/storage/fancy/cigarettes/cigar,
/obj/item/flame/lighter/zippo,
/turf/simulated/floor/wood,
/area/merchant_station)
diff --git a/maps/templates/pra.dmm b/maps/templates/pra.dmm
index 094d8a26fe7..7d724108707 100644
--- a/maps/templates/pra.dmm
+++ b/maps/templates/pra.dmm
@@ -324,7 +324,7 @@
"aU" = (
/obj/effect/floor_decal/spline/fancy/wood,
/obj/structure/table/wood,
-/obj/item/storage/fancy/cigar,
+/obj/item/storage/fancy/cigarettes/cigar,
/obj/item/flame/lighter/zippo,
/turf/simulated/floor/wood,
/area/derelict/ship)
diff --git a/sound/items/storage/wrapper.ogg b/sound/items/storage/wrapper.ogg
new file mode 100644
index 00000000000..50ef078a140
Binary files /dev/null and b/sound/items/storage/wrapper.ogg differ