diff --git a/code/datums/outfits/event/outfit_nanotrasen.dm b/code/datums/outfits/event/outfit_nanotrasen.dm
index b70ef29fe1a..0c0fccfc792 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/cigarettes/cigar = 1,
+ /obj/item/storage/box/fancy/cigarettes/cigar = 1,
/obj/item/flame/lighter/zippo = 1,
/obj/item/clothing/accessory/medal/gold/heroism = 1
)
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index c51340e0d88..bc3cfaba6af 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -53,8 +53,8 @@
var/path = pick(list(
/obj/item/clothing/mask/smokable/pipe,
/obj/item/clothing/mask/smokable/pipe/cobpipe,
- /obj/item/storage/fancy/cigarettes/cigar,
- /obj/item/storage/fancy/cigarettes
+ /obj/item/storage/box/fancy/cigarettes/cigar,
+ /obj/item/storage/box/fancy/cigarettes
))
H.equip_or_collect(new path(), slot_wear_mask)
diff --git a/code/datums/trading/ai.dm b/code/datums/trading/ai.dm
index eafde4e8b34..0198f384892 100644
--- a/code/datums/trading/ai.dm
+++ b/code/datums/trading/ai.dm
@@ -88,7 +88,7 @@ They sell generic supplies and ask for generic supplies.
/obj/item/storage/backpack/fluff = TRADER_BLACKLIST_ALL, // Custom items, let's not
/obj/item/storage/belt/champion = TRADER_THIS_TYPE,
/obj/item/storage/briefcase = TRADER_THIS_TYPE,
- /obj/item/storage/fancy = TRADER_SUBTYPES_ONLY,
+ /obj/item/storage/box/fancy = TRADER_SUBTYPES_ONLY,
/obj/item/storage/laundry_basket = TRADER_THIS_TYPE,
/obj/item/storage/secure/briefcase = TRADER_THIS_TYPE,
/obj/item/storage/bag/plants = TRADER_THIS_TYPE,
@@ -186,4 +186,4 @@ They sell generic supplies and ask for generic supplies.
/obj/item/reagent_containers/glass/bottle/antitoxin = TRADER_THIS_TYPE,
/obj/item/device/handheld_medical = TRADER_THIS_TYPE,
/obj/item/stack/medical/advanced/bruise_pack/spaceklot = TRADER_THIS_TYPE
- )
\ No newline at end of file
+ )
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index ea6b3133904..da1665a5b64 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -105,7 +105,7 @@
"custom_cigarettes" = list(
name = "Empty Cigarettes (x6)",
class = "Items",
- object = /obj/item/storage/fancy/cigarettes/blank,
+ object = /obj/item/storage/box/fancy/cigarettes/blank,
cost = 500,
amount = list(1,2,3,4,5),
emag = 0
@@ -185,7 +185,7 @@
"crayon_box" = list(
name = "Crayon Box",
class = "Items",
- object = /obj/item/storage/fancy/crayons,
+ object = /obj/item/storage/box/fancy/crayons,
cost = 600,
amount = list(1,2,3,4,5),
emag = 0
diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm
index 2a6f1d1bdae..53a362f1539 100644
--- a/code/game/machinery/vending_types.dm
+++ b/code/game/machinery/vending_types.dm
@@ -199,10 +199,10 @@
/obj/item/reagent_containers/food/snacks/spacetwinkie = 6,
/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6,
/obj/item/reagent_containers/food/snacks/tastybread = 6,
- /obj/item/reagent_containers/food/snacks/cookiesnack = 6,
- /obj/item/storage/box/gum = 4,
+ /obj/item/storage/box/fancy/cookiesnack = 6,
+ /obj/item/storage/box/fancy/gum = 4,
/obj/item/clothing/mask/chewable/candy/lolli = 8,
- /obj/item/storage/box/admints = 4,
+ /obj/item/storage/box/fancy/admints = 4,
/obj/item/reagent_containers/food/snacks/skrellsnacks = 3,
/obj/item/reagent_containers/food/snacks/meatsnack = 2,
/obj/item/reagent_containers/food/snacks/maps = 2,
@@ -227,10 +227,10 @@
/obj/item/reagent_containers/food/snacks/spacetwinkie = 15,
/obj/item/reagent_containers/food/snacks/cheesiehonkers = 15,
/obj/item/reagent_containers/food/snacks/tastybread = 18,
- /obj/item/storage/box/gum = 15,
+ /obj/item/storage/box/fancy/gum = 15,
/obj/item/clothing/mask/chewable/candy/lolli = 2,
- /obj/item/storage/box/admints = 12,
- /obj/item/reagent_containers/food/snacks/cookiesnack = 20,
+ /obj/item/storage/box/fancy/admints = 12,
+ /obj/item/storage/box/fancy/cookiesnack = 20,
/obj/item/reagent_containers/food/snacks/skrellsnacks = 40,
/obj/item/reagent_containers/food/snacks/meatsnack = 22,
/obj/item/reagent_containers/food/snacks/maps = 23,
@@ -330,11 +330,11 @@
icon_state = "cigs"
vend_id = "smokes"
products = list(
- /obj/item/storage/fancy/cigarettes/rugged = 6,
- /obj/item/storage/fancy/cigarettes = 8,
- /obj/item/storage/fancy/cigarettes/dromedaryco = 5,
- /obj/item/storage/fancy/cigarettes/nicotine = 3,
- /obj/item/storage/fancy/cigarettes/pra = 6,
+ /obj/item/storage/box/fancy/cigarettes/rugged = 6,
+ /obj/item/storage/box/fancy/cigarettes = 8,
+ /obj/item/storage/box/fancy/cigarettes/dromedaryco = 5,
+ /obj/item/storage/box/fancy/cigarettes/nicotine = 3,
+ /obj/item/storage/box/fancy/cigarettes/pra = 6,
/obj/item/storage/chewables/rollable/bad = 6,
/obj/item/storage/chewables/rollable = 8,
/obj/item/storage/chewables/rollable/fine = 5,
@@ -342,29 +342,29 @@
/obj/item/storage/chewables/tobacco/bad = 6,
/obj/item/storage/chewables/tobacco = 8,
/obj/item/storage/chewables/tobacco/fine = 5,
- /obj/item/storage/fancy/chewables/tobacco/nico = 3,
+ /obj/item/storage/box/fancy/chewables/tobacco/nico = 3,
/obj/item/storage/cigfilters = 6,
- /obj/item/storage/fancy/cigpaper = 6,
- /obj/item/storage/fancy/cigpaper/fine = 4,
- /obj/item/storage/box/matches = 10,
+ /obj/item/storage/box/fancy/cigpaper = 6,
+ /obj/item/storage/box/fancy/cigpaper/fine = 4,
+ /obj/item/storage/box/fancy/matches = 10,
/obj/item/flame/lighter/random = 4,
/obj/item/spacecash/ewallet/lotto = 30
)
contraband = list(
- /obj/item/storage/fancy/cigarettes/blank = 5,
- /obj/item/storage/fancy/cigarettes/acmeco = 5,
+ /obj/item/storage/box/fancy/cigarettes/blank = 5,
+ /obj/item/storage/box/fancy/cigarettes/acmeco = 5,
/obj/item/clothing/mask/smokable/cigarette/rolled/sausage = 3
)
premium = list(
/obj/item/flame/lighter/zippo = 4,
- /obj/item/storage/fancy/cigarettes/cigar = 5
+ /obj/item/storage/box/fancy/cigarettes/cigar = 5
)
prices = list(
- /obj/item/storage/fancy/cigarettes/rugged = 67,
- /obj/item/storage/fancy/cigarettes = 76,
- /obj/item/storage/fancy/cigarettes/dromedaryco = 82,
- /obj/item/storage/fancy/cigarettes/nicotine = 89,
- /obj/item/storage/fancy/cigarettes/pra = 79,
+ /obj/item/storage/box/fancy/cigarettes/rugged = 67,
+ /obj/item/storage/box/fancy/cigarettes = 76,
+ /obj/item/storage/box/fancy/cigarettes/dromedaryco = 82,
+ /obj/item/storage/box/fancy/cigarettes/nicotine = 89,
+ /obj/item/storage/box/fancy/cigarettes/pra = 79,
/obj/item/storage/chewables/rollable/bad = 56,
/obj/item/storage/chewables/rollable = 63,
/obj/item/storage/chewables/rollable/fine = 69,
@@ -372,12 +372,12 @@
/obj/item/storage/chewables/tobacco/bad = 55,
/obj/item/storage/chewables/tobacco = 74,
/obj/item/storage/chewables/tobacco/fine = 86,
- /obj/item/storage/fancy/chewables/tobacco/nico = 91,
- /obj/item/storage/box/matches = 12,
+ /obj/item/storage/box/fancy/chewables/tobacco/nico = 91,
+ /obj/item/storage/box/fancy/matches = 12,
/obj/item/flame/lighter/random = 12,
/obj/item/storage/cigfilters = 28,
- /obj/item/storage/fancy/cigpaper = 35,
- /obj/item/storage/fancy/cigpaper/fine = 42,
+ /obj/item/storage/box/fancy/cigpaper = 35,
+ /obj/item/storage/box/fancy/cigpaper/fine = 42,
/obj/item/spacecash/ewallet/lotto = 200
)
light_color = COLOR_BLUE_GRAY
@@ -521,14 +521,14 @@
/obj/item/device/holowarrant = 5
)
premium = list(
- /obj/item/storage/fancy/donut = 2
+ /obj/item/storage/box/fancy/donut = 2
)
contraband = list(
/obj/item/clothing/glasses/sunglasses = 2,
/obj/item/grenade/flashbang = 4
)
restock_blocked_items = list(
- /obj/item/storage/fancy/donut,
+ /obj/item/storage/box/fancy/donut,
/obj/item/storage/box/evidence,
/obj/item/device/flash,
/obj/item/reagent_containers/spray/pepper
diff --git a/code/game/objects/items/draftingchalk.dm b/code/game/objects/items/draftingchalk.dm
index c2c9cbb0043..a17e5372edb 100644
--- a/code/game/objects/items/draftingchalk.dm
+++ b/code/game/objects/items/draftingchalk.dm
@@ -96,7 +96,7 @@
desc = "A line drawn in a purple chalk."
color = "#a489c2"
-/obj/item/storage/fancy/crayons/chalkbox
+/obj/item/storage/box/fancy/crayons/chalkbox
name = "box of drafting chalk"
desc = "A box of drafting chalk for drafting floor plans."
icon_state = "chalkbox"
@@ -105,7 +105,7 @@
/obj/item/pen/drafting
)
-/obj/item/storage/fancy/crayons/chalkbox/fill()
+/obj/item/storage/box/fancy/crayons/chalkbox/fill()
new /obj/item/pen/drafting/red(src)
new /obj/item/pen/drafting(src)
new /obj/item/pen/drafting/yellow(src)
@@ -114,7 +114,7 @@
new /obj/item/pen/drafting/purple(src)
update_icon()
-/obj/item/storage/fancy/crayons/chalkbox/update_icon()
+/obj/item/storage/box/fancy/crayons/chalkbox/update_icon()
cut_overlays()
for(var/obj/item/pen/drafting/chalk in contents)
- add_overlay("[chalk.colorName]")
\ No newline at end of file
+ add_overlay("[chalk.colorName]")
diff --git a/code/game/objects/items/tajara.dm b/code/game/objects/items/tajara.dm
index 50461784940..0f4be8a5149 100644
--- a/code/game/objects/items/tajara.dm
+++ b/code/game/objects/items/tajara.dm
@@ -1,4 +1,4 @@
-/obj/item/storage/fancy/cigarettes/pra
+/obj/item/storage/box/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."
@@ -8,11 +8,11 @@
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()
+/obj/item/storage/box/fancy/cigarettes/pra/fill()
..()
new /obj/item/tajcard(src)
-/obj/item/storage/fancy/cigarettes/dpra
+/obj/item/storage/box/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."
@@ -20,7 +20,7 @@
item_state = "Bpacket"
cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette/adhomai
-/obj/item/storage/fancy/cigarettes/nka
+/obj/item/storage/box/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."
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 6d20d0d86f7..9169a2e3af1 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -164,6 +164,14 @@
name = "\improper Carps Ahoy! miniature cookies"
icon_state = "cookiesnack"
+/obj/item/trash/admints
+ name = "\improper Ad-mints"
+ icon_state = "admint_pack"
+
+/obj/item/trash/gum
+ name = "\improper Chewy Fruit flavored gum"
+ icon_state = "gum_pack"
+
/obj/item/trash/stew
name = "empty pot"
icon = 'icons/obj/food.dmi'
diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm
index e80c91b609a..469403ab8d7 100644
--- a/code/game/objects/items/weapons/chewables.dm
+++ b/code/game/objects/items/weapons/chewables.dm
@@ -162,22 +162,27 @@ obj/item/clothing/mask/chewable/Destroy()
color = reagents.get_color()
update_icon()
-/obj/item/storage/box/gum
+/obj/item/storage/box/fancy/gum
name = "\improper Chewy Fruit flavored gum"
desc = "A small pack of chewing gum in various flavors."
icon = 'icons/obj/food.dmi'
icon_state = "gum_pack"
item_state = "candy"
+ icon_type = "gum stick"
+ storage_type = "packaging"
slot_flags = SLOT_EARS
w_class = 1
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/wrapper.ogg'
+ can_hold = list(/obj/item/clothing/mask/chewable/candy/gum, /obj/item/trash/spitgum)
+ max_storage_space = 5
+
+ use_sound = 'sound/items/storage/wrapper.ogg'
drop_sound = 'sound/items/drop/wrapper.ogg'
pickup_sound = 'sound/items/pickup/wrapper.ogg'
- max_storage_space = 5
- foldable = null
+
+ trash = /obj/item/trash/gum
+ closable = FALSE
+ icon_overlays = FALSE
/obj/item/clothing/mask/chewable/candy/lolli
name = "lollipop"
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 2c0bc9772a8..436f5108d93 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -68,7 +68,7 @@
/obj/item/storage/wallet,
/obj/item/storage/photo_album,
/obj/item/storage/box/snappops,
- /obj/item/storage/fancy/crayons,
+ /obj/item/storage/box/fancy/crayons,
/obj/item/storage/backpack/holding,
/obj/item/storage/belt/champion,
/obj/item/soap/deluxe,
@@ -164,7 +164,7 @@
/obj/item/storage/wallet,
/obj/item/storage/photo_album,
/obj/item/storage/box/snappops,
- /obj/item/storage/fancy/crayons,
+ /obj/item/storage/box/fancy/crayons,
/obj/item/soap/deluxe,
/obj/item/pen/invisible,
/obj/item/clothing/gloves/watch,
@@ -191,7 +191,7 @@
/obj/item/bluespace_crystal,
/obj/item/flame/lighter/zippo,
/obj/item/device/taperecorder,
- /obj/item/storage/fancy/cigarettes/dromedaryco,
+ /obj/item/storage/box/fancy/cigarettes/dromedaryco,
/obj/item/toy/bosunwhistle,
/obj/item/clothing/mask/fakemoustache,
/obj/item/clothing/mask/gas/clown_hat,
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 52de158129d..a4e8c989790 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -18,7 +18,6 @@
slot_l_hand_str = "backpack",
slot_r_hand_str = "backpack"
)
-
w_class = 4
slot_flags = SLOT_BACK
max_w_class = 3
@@ -56,11 +55,6 @@
return 0
return 1
-/obj/item/storage/backpack/equipped(var/mob/user, var/slot)
- if (slot == slot_back && src.use_sound)
- playsound(src.loc, src.use_sound, 50, 1, -5)
- ..(user, slot)
-
/*
/obj/item/storage/backpack/dropped(mob/user as mob)
if (loc == user && src.use_sound)
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 974565c0be5..fb76c9675f7 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -118,7 +118,7 @@
/obj/item/reagent_containers/personal_inhaler_cartridge,
/obj/item/personal_inhaler,
/obj/item/flame/lighter/zippo,
- /obj/item/storage/fancy/cigarettes,
+ /obj/item/storage/box/fancy/cigarettes,
/obj/item/storage/pill_bottle,
/obj/item/stack/medical,
/obj/item/device/flashlight/pen,
@@ -327,7 +327,7 @@
/obj/item/shovel,
/obj/item/stack/material/animalhide,
/obj/item/flame/lighter,
- /obj/item/storage/fancy/cigarettes,
+ /obj/item/storage/box/fancy/cigarettes,
/obj/item/reagent_containers/food/drinks/bottle,
/obj/item/stack/medical,
/obj/item/reagent_containers/hypospray,
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 64b1651203c..c73c1cfbe31 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -13,7 +13,7 @@
* Donkpocket and monkeycube boxes,
* ID and security PDA cart boxes,
* Handcuff, mousetrap, and pillbottle boxes,
- * Snap-pops and matchboxes,
+ * Snap-pops,
* Replacement light boxes.
* Kitchen utensil box
* Random preserved snack box
@@ -28,6 +28,7 @@
item_state = "box"
center_of_mass = list("x" = 13,"y" = 10)
var/foldable = /obj/item/stack/material/cardboard // BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
+ var/trash = null // if set, can be crushed into a trash item when empty
var/maxHealth = 20 //health is already defined
use_sound = 'sound/items/storage/box.ogg'
drop_sound = 'sound/items/drop/cardboardbox.ogg'
@@ -37,6 +38,10 @@
/obj/item/storage/box/Initialize()
. = ..()
health = maxHealth
+ if(foldable)
+ desc_info += "You can fold this into a sheet. "
+ if(ispath(src.trash))
+ desc_info += "This can be crumpled up into a trash item when empty, or forcibly crumpled on harm intent. "
/obj/item/storage/box/proc/damage(var/severity)
health -= severity
@@ -49,7 +54,7 @@
/obj/item/storage/box/attack_generic(var/mob/user)
if(!chewable)
return
- if (istype(user, /mob/living))
+ if(istype(user, /mob/living))
var/mob/living/L = user
if (istype(L, /mob/living/carbon/alien/diona) || istype(L, /mob/living/simple_animal) || istype(L, /mob/living/carbon/human))//Monkey-like things do attack_generic, not crew
@@ -86,33 +91,36 @@
// BubbleWrap - A box can be folded up to make card
/obj/item/storage/box/attack_self(mob/user as mob)
- if(..()) return
-
- //try to fold it.
- if ( contents.len )
+ if(..())
return
- if ( !ispath(src.foldable) )
- return
- var/found = 0
- // Close any open UI windows first
- for(var/mob/M in range(1))
- if (M.s_active == src)
- src.close(M)
- if ( M == user )
- found = 1
- if ( !found ) // User is too far away
- return
- // Now make the cardboard
- to_chat(user, "You fold [src] flat.")
- playsound(src.loc, 'sound/items/storage/boxfold.ogg', 30, 1)
- new src.foldable(get_turf(src))
- qdel(src)
-
-/obj/item/storage/backpack/attackby(obj/item/W as obj, mob/user as mob)
- if (src.use_sound)
- playsound(src.loc, src.use_sound, 50, 1, -5)
- ..()
+ if(ispath(src.foldable) || ispath(src.trash))
+ var/found = 0
+ for(var/mob/M in range(1))
+ if(M.s_active == src)
+ src.close(M) // Close any open UI windows first
+ if(M == user)
+ found = 1
+ if(!found) // User is too far away
+ return
+ if(ispath(src.foldable))
+ if(contents.len)
+ return
+ to_chat(user, SPAN_NOTICE("You fold \the [src] flat.")) //make cardboard
+ playsound(src.loc, 'sound/items/storage/boxfold.ogg', 30, 1)
+ var/obj/item/foldable = new src.foldable()
+ qdel(src)
+ user.put_in_hands(foldable) //try to put it inhands if possible
+ if(ispath(src.trash))
+ if(contents.len && user.a_intent == I_HURT) // only crumple with things inside on harmintent.
+ user.visible_message(SPAN_DANGER("You crush \the [src], spilling its contents everywhere!"), SPAN_DANGER("[user] crushes \the [src], spilling its contents everywhere!"))
+ spill()
+ else
+ to_chat(user, SPAN_NOTICE("You crumple up \the [src].")) //make trash
+ playsound(src.loc, 'sound/items/pickup/wrapper.ogg', 30, 1)
+ var/obj/item/trash = new src.trash()
+ qdel(src)
+ user.put_in_hands(trash)
/obj/item/storage/box/survival
name = "emergency survival box"
@@ -490,30 +498,6 @@
desc_antag = "These snap pops have an extra compound added that will deploy a tiny smokescreen when snapped."
starts_with = list(/obj/item/toy/snappop/syndi = 8)
-/obj/item/storage/box/matches
- name = "safety match box"
- desc = "A small box of 'Space-Proof' premium safety matches." //can't strike these anywhere other than matchboxes, so they're safety matches
- icon = 'icons/obj/cigs_lighters.dmi'
- icon_state = "matchbox"
- item_state = "box"
- w_class = ITEMSIZE_TINY
- drop_sound = 'sound/items/drop/matchbox.ogg'
- pickup_sound = 'sound/items/pickup/matchbox.ogg'
- slot_flags = SLOT_BELT
- can_hold = list(/obj/item/flame/match)
- starts_with = list(/obj/item/flame/match = 10)
-
-/obj/item/storage/box/matches/attackby(obj/item/flame/match/W, mob/user)
- if(istype(W) && !W.lit)
- if(prob(25))
- playsound(src.loc, 'sound/items/cigs_lighters/matchstick_lit.ogg', 25, 0, -1)
- user.visible_message("[user] manages to light \the [W] by striking it on \the [src].", range = 3)
- W.light()
- else
- playsound(src.loc, 'sound/items/cigs_lighters/matchstick_hit.ogg', 25, 0, -1)
- W.update_icon()
- return
-
/obj/item/storage/box/autoinjectors
name = "box of empty injectors"
desc = "Contains empty autoinjectors."
@@ -663,6 +647,7 @@
var/list/snacks = list(
/obj/item/reagent_containers/food/snacks/koisbar_clean,
/obj/item/reagent_containers/food/snacks/candy,
+ /obj/item/reagent_containers/food/snacks/candy/koko,
/obj/item/reagent_containers/food/snacks/candy_corn,
/obj/item/reagent_containers/food/snacks/chips,
/obj/item/reagent_containers/food/snacks/chocolatebar,
@@ -683,7 +668,10 @@
/obj/item/reagent_containers/food/snacks/maps,
/obj/item/reagent_containers/food/snacks/nathisnack,
/obj/item/reagent_containers/food/snacks/adhomian_can,
- /obj/item/reagent_containers/food/snacks/tuna
+ /obj/item/reagent_containers/food/snacks/tuna,
+ /obj/item/storage/box/fancy/gum,
+ /obj/item/storage/box/fancy/cookiesnack,
+ /obj/item/storage/box/fancy/admints
)
for (var/i = 0,i<7,i++)
var/type = pick(snacks)
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 0574bfc0862..a84b95a75fa 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -3,50 +3,69 @@
* .. Sorry for the shitty path name, I couldnt think of a better one.
*
* WARNING: var/icon_type is used for both examine text and sprite name. Please look at the procs below and adjust your sprite names accordingly
- * TODO: Cigarette boxes should be ported to this standard
+ *
*
* Contains:
* Donut Box
- * Egg Box
+ * Egg Carton
* Candle Box
* Crayon Box
* Cigarette Box
+ * Match Box
*/
+/obj/item/storage/box/fancy
+ var/icon_type = null // what's in the box. remember to keep it singular.
+ var/storage_type = "box" // what type of box it is.
+ var/opened = FALSE // handles open/closing icons. also a failsafe.
+ var/closable = TRUE // if you can close the icon after opening.
+ var/icon_overlays = TRUE // whether the icon uses the update_icon() or a unique one.
+ foldable = null // most of this stuff isn't foldable by default, e.g. cig packets and vial boxes
-/obj/item/storage/fancy
- item_state = "box" //placeholder, many of these don't have inhands
- var/icon_type = null
- var/storage_type = "box"
- drop_sound = 'sound/items/drop/cardboardbox.ogg'
- pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
- use_sound = 'sound/items/storage/box.ogg'
+/obj/item/storage/box/fancy/open(mob/user)
+ . = ..()
+ if(!opened)
+ opened = TRUE
+ update_icon() // the reason why this isn't a clean catch-all update_icon() for fancy boxes is because of cigarette packets and donut boxes being different.
-/obj/item/storage/fancy/update_icon(var/itemremoved = 0)
- var/total_contents = src.contents.len - itemremoved
- src.icon_state = "[src.icon_type]box[total_contents]"
- return
+/obj/item/storage/box/fancy/Initialize()
+ . = ..()
+ if(closable)
+ desc_info += "Alt-click to open and close the box. " //aka force override icon state. for you know, style.
-/obj/item/storage/fancy/examine(mob/user as mob)
- if(!..(user, 1))
- return
+/obj/item/storage/box/fancy/AltClick(mob/user)
+ opened = !opened
+ playsound(src.loc, src.use_sound, 50, 0, -5)
+ if(closable && !opened)
+ icon_state = "[initial(icon_state)]" // closed
+ cut_overlays()
+ close(user)
+ return 1
+ update_icon()
+/obj/item/storage/box/fancy/update_icon(var/itemremoved = 0)
+ if(opened) //use the open icon.
+ if(icon_overlays) //whether it uses the overlays/uses its own version.
+ var/total_contents = src.contents.len - itemremoved
+ src.icon_state = "[src.icon_type][src.storage_type][total_contents]"
+ else
+ icon_state = "[initial(icon_state)][src.opened]"
+
+/obj/item/storage/box/fancy/examine(mob/user)
+ ..()
if(contents.len <= 0)
to_chat(user, "There are no [src.icon_type]s left in the [src.storage_type].")
- else if(contents.len == 1)
- to_chat(user, "There is one [src.icon_type] left in the [src.storage_type].")
else
- to_chat(user, "There are [src.contents.len] [src.icon_type]s in the [src.storage_type].")
-
+ to_chat(user, "There [src.contents.len == 1 ? "is" : "are"] [src.contents.len] [src.icon_type]\s left in \the [src.storage_type].")
return
/*
* Donut Box
*/
-/obj/item/storage/fancy/donut
+/obj/item/storage/box/fancy/donut
name = "donut box"
- desc = "A box of half-a-dozen donuts."
+ desc = "A box of half-a-dozen donuts sponsored by GetMore Chocolate Corporation. Allegedly contentious with the psychiatrist unions for some reason."
icon = 'icons/obj/food.dmi'
icon_state = "donutbox"
icon_type = "donut"
@@ -54,31 +73,31 @@
can_hold = list(/obj/item/reagent_containers/food/snacks/donut)
starts_with = list(/obj/item/reagent_containers/food/snacks/donut/normal = 6)
storage_slots = 6
+ icon_overlays = FALSE
+ foldable = /obj/item/stack/material/cardboard
-/obj/item/storage/fancy/donut/fill()
- . = ..()
- update_icon()
+/obj/item/storage/box/fancy/donut/update_icon() // One of the few unique update_icon()s, due to having to store both regular and sprinkled donuts.
+ .=..()
+ if(opened)
+ cut_overlays()
+ var/i = 0
+ for(var/obj/item/reagent_containers/food/snacks/donut/D in contents)
+ add_overlay("[i][D.overlay_state]")
+ i++
-/obj/item/storage/fancy/donut/update_icon()
- cut_overlays()
- var/i = 0
- for(var/obj/item/reagent_containers/food/snacks/donut/D in contents)
- add_overlay("[i][D.overlay_state]")
- i++
-
-/obj/item/storage/fancy/donut/empty
+/obj/item/storage/box/fancy/donut/empty
starts_with = null
max_storage_space = 12
-
/*
* Egg Box
*/
-/obj/item/storage/fancy/egg_box
+
+/obj/item/storage/box/fancy/egg_box
name = "egg carton"
desc = "A carton of eggs."
icon = 'icons/obj/food.dmi'
- icon_state = "eggbox"
+ icon_state = "eggcarton"
icon_type = "egg"
storage_type = "carton"
center_of_mass = list("x" = 16,"y" = 7)
@@ -88,36 +107,46 @@
/obj/item/reagent_containers/food/snacks/boiledegg
)
starts_with = list(/obj/item/reagent_containers/food/snacks/egg = 12)
+ foldable = /obj/item/stack/material/cardboard
+
/*
* Candle Box
*/
-/obj/item/storage/fancy/candle_box
+/obj/item/storage/box/fancy/candle_box
name = "candle pack"
desc = "A pack of red candles."
icon = 'icons/obj/candle.dmi'
- icon_state = "candlebox5"
+ icon_state = "candlepack0"
+ item_state = "candlepack"
icon_type = "candle"
- item_state = "candlebox5"
+ storage_type = "pack"
throwforce = 2
slot_flags = SLOT_BELT
- max_storage_space = 5
+ storage_slots = 5
+ can_hold = list(/obj/item/flame/candle)
starts_with = list(/obj/item/flame/candle = 5)
+ opened = TRUE
+ closable = FALSE
+ foldable = /obj/item/stack/material/cardboard
+
+/obj/item/storage/box/fancy/candle_box/empty
+ starts_with = null
/*
* Crayon Box
*/
-/obj/item/storage/fancy/crayons
+/obj/item/storage/box/fancy/crayons
name = "box of crayons"
desc = "A box of crayons for all your rune drawing needs."
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonbox"
icon_type = "crayon"
w_class = ITEMSIZE_SMALL
- can_hold = list(
- /obj/item/pen/crayon
- )
+ slot_flags = SLOT_BELT
+ storage_slots = 6
+ can_hold = list(/obj/item/pen/crayon)
starts_with = list(
/obj/item/pen/crayon/red = 1,
/obj/item/pen/crayon/orange = 1,
@@ -126,18 +155,20 @@
/obj/item/pen/crayon/blue = 1,
/obj/item/pen/crayon/purple = 1
)
+ opened = TRUE
+ closable = FALSE
+ foldable = /obj/item/stack/material/cardboard
-/obj/item/storage/fancy/crayons/fill()
- . = ..()
- update_icon()
+/obj/item/storage/box/fancy/crayons/empty
+ starts_with = null
-/obj/item/storage/fancy/crayons/update_icon()
+/obj/item/storage/box/fancy/crayons/update_icon()
cut_overlays()
add_overlay("crayonbox")
for(var/obj/item/pen/crayon/crayon in contents)
add_overlay("[crayon.colourName]")
-/obj/item/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/storage/box/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/pen/crayon))
switch(W:colourName)
if("mime")
@@ -148,50 +179,91 @@
return
..()
+/*
+ * Matchbox
+ */
+
+/obj/item/storage/box/fancy/matches
+ name = "safety match box"
+ desc = "A small box of 'Space-Proof' premium safety matches." //can't strike these anywhere other than matchboxes, so they're safety matches
+ icon = 'icons/obj/cigs_lighters.dmi'
+ icon_state = "matchbox"
+ item_state = "box"
+ icon_type = "match"
+ w_class = ITEMSIZE_TINY
+ drop_sound = 'sound/items/drop/matchbox.ogg'
+ pickup_sound = 'sound/items/pickup/matchbox.ogg'
+ slot_flags = SLOT_BELT
+ can_hold = list(/obj/item/flame/match, /obj/item/trash/match)
+ starts_with = list(/obj/item/flame/match = 10)
+ icon_overlays = FALSE
+
+/obj/item/storage/box/fancy/matches/attackby(obj/item/flame/match/W, mob/user)
+ if(istype(W) && !W.lit)
+ if(prob(25))
+ playsound(src.loc, 'sound/items/cigs_lighters/matchstick_lit.ogg', 25, 0, -1)
+ user.visible_message("[user] manages to light \the [W] by striking it on \the [src].", range = 3)
+ W.light()
+ else
+ playsound(src.loc, 'sound/items/cigs_lighters/matchstick_hit.ogg', 25, 0, -1)
+ W.update_icon()
+ return
+
+/obj/item/storage/box/fancy/matches/update_icon()
+ .=..()
+ if(opened)
+ if(contents.len == 0)
+ icon_state = "matchbox_e"
+ else if(contents.len <= 3)
+ icon_state = "matchbox_almostempty"
+ else if(contents.len <= 6)
+ icon_state = "matchbox_almostfull"
+
////////////
//CIG PACK//
////////////
-/obj/item/storage/fancy/cigarettes
+/obj/item/storage/box/fancy/cigarettes
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."
+ 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"
icon_type = "cigarette"
+ storage_type = "packet"
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',
)
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/gloves.ogg'
- use_sound = 'sound/items/drop/wrapper.ogg'
+ use_sound = 'sound/items/storage/wrapper.ogg'
w_class = ITEMSIZE_TINY
throwforce = 2
slot_flags = SLOT_BELT
storage_slots = 6
- var/cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette
can_hold = list(/obj/item/clothing/mask/smokable/cigarette, /obj/item/flame/lighter, /obj/item/trash/cigbutt)
+ var/cigarette_to_spawn = /obj/item/clothing/mask/smokable/cigarette
-/obj/item/storage/fancy/cigarettes/Initialize()
+/obj/item/storage/box/fancy/cigarettes/Initialize()
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
. = ..()
-/obj/item/storage/fancy/cigarettes/fill()
+/obj/item/storage/box/fancy/cigarettes/fill()
for(var/i = 1 to storage_slots)
new cigarette_to_spawn(src)
-/obj/item/storage/fancy/cigarettes/update_icon()
+/obj/item/storage/box/fancy/cigarettes/update_icon()
icon_state = "[initial(icon_state)][contents.len]"
-/obj/item/storage/fancy/cigarettes/remove_from_storage(obj/item/W as obj, atom/new_location)
+/obj/item/storage/box/fancy/cigarettes/remove_from_storage(obj/item/W as obj, atom/new_location)
var/obj/item/clothing/mask/smokable/cigarette/C = W
if(!istype(C)) return // what
reagents.trans_to_obj(C, (reagents.total_volume/contents.len))
..()
-/obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob,var/target_zone)
+/obj/item/storage/box/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob,var/target_zone)
if(!istype(M, /mob))
return
@@ -219,48 +291,50 @@
// get it? A - AcmeCo, B - Blank, C - Cigar, D - DromedaryCo. How convenient is that? - Wezzy
-/obj/item/storage/fancy/cigarettes/acmeco
+/obj/item/storage/box/fancy/cigarettes/acmeco
name = "\improper AcmeCo cigarette packet"
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
+/obj/item/storage/box/fancy/cigarettes/blank
name = "\improper blank cigarette packet"
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
+/obj/item/storage/box/fancy/cigarettes/cigar
name = "cigar case"
desc = "A luxurious tote for your fat tokes."
icon_state = "cigarcase"
item_state = "cigarcase"
icon_type = "cigar"
+ storage_type = "case"
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
+ chewable = FALSE
-/obj/item/storage/fancy/cigarettes/dromedaryco
+/obj/item/storage/box/fancy/cigarettes/dromedaryco
name = "\improper DromedaryCo cigarette packet"
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/cigarettes/nicotine
+/obj/item/storage/box/fancy/cigarettes/nicotine
name = "\improper Nico-Tine cigarette packet"
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
+/obj/item/storage/box/fancy/cigarettes/rugged
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"
@@ -270,7 +344,7 @@
/*
* Vial Box
*/
-/obj/item/storage/fancy/vials
+/obj/item/storage/box/fancy/vials
name = "vial storage box"
desc = "A box of vials."
icon = 'icons/obj/vialbox.dmi'
@@ -282,6 +356,7 @@
storage_slots = 6
can_hold = list(/obj/item/reagent_containers/glass/beaker/vial)
starts_with = list(/obj/item/reagent_containers/glass/beaker/vial = 6)
+ chewable = FALSE
/obj/item/storage/lockbox/vials
name = "secure vial storage box"
@@ -317,7 +392,7 @@
..()
update_icon()
-/obj/item/storage/fancy/chocolate_box
+/obj/item/storage/box/fancy/chocolate_box
name = "chocolate box"
desc = "A lot like life, you never know what you're going to get."
icon = 'icons/obj/chocolate.dmi'
@@ -328,7 +403,8 @@
/obj/item/reagent_containers/food/snacks/truffle/random
)
starts_with = list(/obj/item/reagent_containers/food/snacks/truffle/random = 8)
+ maxHealth = 40
-/obj/item/storage/fancy/chocolate_box/fill()
+/obj/item/storage/box/fancy/chocolate_box/fill()
for(var/i=1; i <= storage_slots; i++)
new /obj/item/reagent_containers/food/snacks/truffle/random(src)
diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index 8990aa892f4..61c16bdf226 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -51,7 +51,7 @@
update_icon()
//cigarette papers
-/obj/item/storage/fancy/cigpaper
+/obj/item/storage/box/fancy/cigpaper
name = "\improper Gen. Eric cigarette paper"
desc = "A ubiquitous brand of cigarette paper, allegedly endorsed by 24th century war hero General Eric Osmundsun for rolling your own cigarettes. Osmundsun died in a freak kayak accident. As it ate him alive during his last campaign. It was pretty freaky."
icon = 'icons/obj/cigs_lighters.dmi'
@@ -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/wrapper.ogg'
+ use_sound = 'sound/items/storage/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',
@@ -71,7 +71,7 @@
starts_with = list(/obj/item/paper/cig = 10)
make_exact_fit()
-/obj/item/storage/fancy/cigpaper/update_icon()
+/obj/item/storage/box/fancy/cigpaper/update_icon()
. = ..()
if(contents.len)
icon_state = "[initial(icon_state)]"
@@ -93,9 +93,9 @@
make_exact_fit()
drop_sound = 'sound/items/drop/gloves.ogg'
pickup_sound = 'sound/items/pickup/gloves.ogg'
- use_sound = 'sound/items/drop/wrapper.ogg'
+ use_sound = 'sound/items/storage/wrapper.ogg'
-/obj/item/storage/fancy/cigpaper/fine
+/obj/item/storage/box/fancy/cigpaper/fine
name = "\improper Trident cigarette paper"
desc = "A fancy brand of Trident cigarette paper, for rolling your own cigarettes. Like a person who appreciates the finer things in life."
icon = 'icons/obj/cigs_lighters.dmi'
@@ -149,12 +149,13 @@
item_state = "Dpacket"
starts_with = list(/obj/item/clothing/mask/chewable/tobacco/fine = 6)
-/obj/item/storage/fancy/chewables/tobacco/nico
+/obj/item/storage/box/fancy/chewables/tobacco/nico
name = "box of Nico-Tine gum"
desc = "A Sol-approved brand of nicotine gum. Cut out the middleman for your addiction fix."
icon = 'icons/obj/cigs_lighters.dmi'
icon_state = "chew_nico"
item_state = "Epacket"
+ icon_type = "gum stick"
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',
@@ -165,7 +166,7 @@
pickup_sound = 'sound/items/pickup/cardboardbox.ogg'
use_sound = 'sound/items/storage/box.ogg'
-/obj/item/storage/fancy/chewables/tobacco/update_icon()
+/obj/item/storage/box/fancy/chewables/tobacco/update_icon()
icon_state = "[initial(icon_state)][contents.len]"
//loose leaf
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 7180600b3a5..3c11d87519a 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -362,6 +362,8 @@
user.prepare_for_slotmove(W)
W.forceMove(src)
W.on_enter_storage(src)
+ if(use_sound)
+ playsound(src.loc, src.use_sound, 50, 0, -5)
if(user)
W.dropped(user)
if(!istype(W, /obj/item/forensics))
@@ -408,8 +410,8 @@
if(!istype(W))
return FALSE
- if(istype(src, /obj/item/storage/fancy))
- var/obj/item/storage/fancy/F = src
+ if(istype(src, /obj/item/storage/box/fancy))
+ var/obj/item/storage/box/fancy/F = src
F.update_icon(TRUE)
for(var/mob/M in range(1, get_turf(src)))
@@ -472,7 +474,7 @@
user.s_active.show_to(user)
// who knows what the fuck this does
- if (istype(src, /obj/item/storage/fancy))
+ if (istype(src, /obj/item/storage/box/fancy))
update_icon(1)
else
update_icon()
@@ -485,7 +487,6 @@
return handle_item_insertion(W, prevent_messages)
-
/obj/item/storage/attackby(obj/item/W as obj, mob/user as mob)
..()
@@ -749,4 +750,4 @@
//return 2**(w_class-1) //1,2,4,8,16,...
-#undef STORAGE_SPACE_CAP
\ No newline at end of file
+#undef STORAGE_SPACE_CAP
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index e1da38f277e..aa7c3db9602 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -168,24 +168,24 @@
/obj/item/storage/box/syndie_kit/cigarette/fill()
..()
- var/obj/item/storage/fancy/cigarettes/pack
- pack = new /obj/item/storage/fancy/cigarettes(src)
+ var/obj/item/storage/box/fancy/cigarettes/pack
+ pack = new /obj/item/storage/box/fancy/cigarettes(src)
fill_cigarre_package(pack, list(/datum/reagent/aluminum = 5, /datum/reagent/potassium = 5, /datum/reagent/sulfur = 5))
pack.desc += " 'F' has been scribbled on it."
- pack = new /obj/item/storage/fancy/cigarettes(src)
+ pack = new /obj/item/storage/box/fancy/cigarettes(src)
fill_cigarre_package(pack, list(/datum/reagent/aluminum = 5, /datum/reagent/potassium = 5, /datum/reagent/sulfur = 5))
pack.desc += " 'F' has been scribbled on it."
- pack = new /obj/item/storage/fancy/cigarettes(src)
+ pack = new /obj/item/storage/box/fancy/cigarettes(src)
fill_cigarre_package(pack, list(/datum/reagent/potassium = 5, /datum/reagent/sugar = 5, /datum/reagent/phosphorus = 5))
pack.desc += " 'S' has been scribbled on it."
- pack = new /obj/item/storage/fancy/cigarettes(src)
+ pack = new /obj/item/storage/box/fancy/cigarettes(src)
fill_cigarre_package(pack, list(/datum/reagent/potassium = 5, /datum/reagent/sugar = 5, /datum/reagent/phosphorus = 5))
pack.desc += " 'S' has been scribbled on it."
- pack = new /obj/item/storage/fancy/cigarettes(src)
+ pack = new /obj/item/storage/box/fancy/cigarettes(src)
// Dylovene. Going with 1.5 rather than 1.6666666...
fill_cigarre_package(pack, list(/datum/reagent/potassium = 1.5, /datum/reagent/ammonia = 1.5, /datum/reagent/silicon = 1.5))
// Mindbreaker
@@ -193,13 +193,13 @@
pack.desc += " 'MB' has been scribbled on it."
- pack = new /obj/item/storage/fancy/cigarettes(src)
+ pack = new /obj/item/storage/box/fancy/cigarettes(src)
pack.reagents.add_reagent(/datum/reagent/tricordrazine, 15 * pack.storage_slots)
pack.desc += " 'T' has been scribbled on it."
new /obj/item/flame/lighter/zippo(src)
-/proc/fill_cigarre_package(var/obj/item/storage/fancy/cigarettes/C, var/list/reagents)
+/proc/fill_cigarre_package(var/obj/item/storage/box/fancy/cigarettes/C, var/list/reagents)
for(var/reagent in reagents)
C.reagents.add_reagent(reagent, reagents[reagent] * C.storage_slots)
@@ -236,4 +236,4 @@
/obj/item/storage/box/syndie_kit/random_weapon/Initialize()
.=..()
- desc = "A sleek, sturdy box"
\ No newline at end of file
+ desc = "A sleek, sturdy box"
diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm
index 9d64b4bb351..0a79ba8c9e1 100644
--- a/code/game/objects/items/weapons/surgery_tools.dm
+++ b/code/game/objects/items/weapons/surgery_tools.dm
@@ -182,7 +182,7 @@
throw_range = 5
attack_verb = list("attacked", "hit", "bludgeoned")
-/obj/item/storage/fancy/tray
+/obj/item/storage/box/fancy/tray
name = "surgery tray"
desc = "A tray of surgical tools."
icon = 'icons/obj/surgery.dmi'
@@ -223,7 +223,7 @@
/obj/item/stack/medical/advanced/bruise_pack = 1,
)
-/obj/item/storage/fancy/tray/update_icon()
+/obj/item/storage/box/fancy/tray/update_icon()
cut_overlays()
var/list/types_and_overlays = list(
@@ -247,19 +247,19 @@
add_overlay(types_and_overlays[W.type])
types_and_overlays -= W.type
-/obj/item/storage/fancy/tray/fill()
+/obj/item/storage/box/fancy/tray/fill()
. = ..()
update_icon()
-/obj/item/storage/fancy/tray/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/storage/box/fancy/tray/attackby(obj/item/W as obj, mob/user as mob)
..()
update_icon()
-/obj/item/storage/fancy/tray/attack_hand(mob/user as mob)
+/obj/item/storage/box/fancy/tray/attack_hand(mob/user as mob)
if(ishuman(user))
src.open(user)
-/obj/item/storage/fancy/tray/MouseDrop(mob/user as mob)
+/obj/item/storage/box/fancy/tray/MouseDrop(mob/user as mob)
if((user && (!use_check(user))) && (user.contents.Find(src) || in_range(src, user)))
if(ishuman(user) && !user.get_active_hand())
var/mob/living/carbon/human/H = user
@@ -279,12 +279,12 @@
return
-/obj/item/storage/fancy/tray/attack(mob/living/M as mob, mob/user as mob, var/target_zone)
+/obj/item/storage/box/fancy/tray/attack(mob/living/M as mob, mob/user as mob, var/target_zone)
if(..() && contents.len)
spill(3, get_turf(M))
playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again
user.visible_message(SPAN_DANGER("[user] smashes \the [src] into [M], causing it to spill its contents across the area!"))
-/obj/item/storage/fancy/tray/throw_impact(atom/hit_atom)
+/obj/item/storage/box/fancy/tray/throw_impact(atom/hit_atom)
..()
spill(3, src.loc)
diff --git a/code/game/objects/items/weapons/trays.dm b/code/game/objects/items/weapons/trays.dm
index bd4953ddca7..a886e0594b9 100644
--- a/code/game/objects/items/weapons/trays.dm
+++ b/code/game/objects/items/weapons/trays.dm
@@ -28,9 +28,9 @@
var/list/valid = list(
/obj/item/reagent_containers,
/obj/item/material/kitchen/utensil,
- /obj/item/storage/fancy/cigarettes,
+ /obj/item/storage/box/fancy/cigarettes,
/obj/item/clothing/mask/smokable,
- /obj/item/storage/box/matches,
+ /obj/item/storage/box/fancy/matches,
/obj/item/flame/match,
/obj/item/material/ashtray
)
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index b4678cb106f..da08ee2c0ee 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -212,16 +212,16 @@
icon = 'icons/obj/cigs_lighters.dmi'
icon_state = "cigpacket"
problist = list(
- /obj/item/storage/fancy/cigarettes = 30,
- /obj/item/storage/fancy/cigarettes/blank = 5,
- /obj/item/storage/fancy/cigarettes/acmeco = 2,
- /obj/item/storage/fancy/cigarettes/dromedaryco = 10,
- /obj/item/storage/fancy/cigarettes/cigar = 9,
- /obj/item/storage/fancy/cigarettes/nicotine = 10,
- /obj/item/storage/fancy/cigarettes/rugged = 10,
- /obj/item/storage/fancy/cigarettes/pra = 5,
- /obj/item/storage/fancy/cigarettes/dpra = 2,
- /obj/item/storage/fancy/cigarettes/nka = 2
+ /obj/item/storage/box/fancy/cigarettes = 30,
+ /obj/item/storage/box/fancy/cigarettes/blank = 5,
+ /obj/item/storage/box/fancy/cigarettes/acmeco = 2,
+ /obj/item/storage/box/fancy/cigarettes/dromedaryco = 10,
+ /obj/item/storage/box/fancy/cigarettes/cigar = 9,
+ /obj/item/storage/box/fancy/cigarettes/nicotine = 10,
+ /obj/item/storage/box/fancy/cigarettes/rugged = 10,
+ /obj/item/storage/box/fancy/cigarettes/pra = 5,
+ /obj/item/storage/box/fancy/cigarettes/dpra = 2,
+ /obj/item/storage/box/fancy/cigarettes/nka = 2
)
/obj/random/energy
@@ -866,11 +866,11 @@
/obj/item/storage/box/pineapple = 0.1,
/obj/item/storage/box/smokebombs = 0.1,
/obj/item/storage/box/syringes = 0.3,
- /obj/item/storage/fancy/cigarettes = 1.2,
- /obj/item/storage/fancy/cigarettes/acmeco = 0.3,
- /obj/item/storage/fancy/cigarettes/blank = 1,
- /obj/item/storage/fancy/cigarettes/dromedaryco = 0.8,
- /obj/item/storage/fancy/crayons = 0.5,
+ /obj/item/storage/box/fancy/cigarettes = 1.2,
+ /obj/item/storage/box/fancy/cigarettes/acmeco = 0.3,
+ /obj/item/storage/box/fancy/cigarettes/blank = 1,
+ /obj/item/storage/box/fancy/cigarettes/dromedaryco = 0.8,
+ /obj/item/storage/box/fancy/crayons = 0.5,
/obj/item/storage/wallet/random/ = 0.1,
/obj/item/trap/animal = 0.8,
/obj/random/arcade = 0.25,
@@ -1114,7 +1114,7 @@
/obj/item/toy/sword = 22,
/obj/item/gun/projectile/revolver/capgun = 11,
/obj/item/toy/crossbow = 11,
- /obj/item/storage/fancy/crayons = 11,
+ /obj/item/storage/box/fancy/crayons = 11,
/obj/item/toy/spinningtoy = 11,
/obj/item/toy/prize/ripley = 1,
/obj/item/toy/prize/fireripley = 1,
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index 85963f56d80..6c8385593c4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -55,7 +55,7 @@
for(var/i = 0, i < 2, i++)
new /obj/item/reagent_containers/food/drinks/soymilk(src)
for(var/i = 0, i < 2, i++)
- new /obj/item/storage/fancy/egg_box(src)
+ new /obj/item/storage/box/fancy/egg_box(src)
/obj/structure/closet/secure_closet/freezer/money
@@ -74,4 +74,4 @@
new /obj/random/spacecash(src)
for(var/i = 0, i < rand(6,9), i++)
- new /obj/random/coin(src)
\ No newline at end of file
+ new /obj/random/coin(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 605352bc1f6..663ce617d93 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -86,8 +86,8 @@
new /obj/item/clothing/suit/nun(src)
new /obj/item/clothing/head/nun_hood(src)
new /obj/item/clothing/suit/holidaypriest(src)
- new /obj/item/storage/fancy/candle_box(src)
- new /obj/item/storage/fancy/candle_box(src)
+ new /obj/item/storage/box/fancy/candle_box(src)
+ new /obj/item/storage/box/fancy/candle_box(src)
new /obj/item/deck/tarot(src)
new /obj/item/device/radio/headset/headset_service(src)
new /obj/item/spirit_board(src)
diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm
index 7d44cc88647..a23ae41ca47 100644
--- a/code/modules/cargo/random_stock/t1_common.dm
+++ b/code/modules/cargo/random_stock/t1_common.dm
@@ -89,16 +89,16 @@ STOCK_ITEM_COMMON(aid, 4)
new /obj/random/firstaid(L)
STOCK_ITEM_COMMON(flame, 2)
- new /obj/item/storage/box/matches(L)
+ new /obj/item/storage/box/fancy/matches(L)
new /obj/item/flame/lighter/random(L)
STOCK_ITEM_COMMON(candles, 1.5)
- new /obj/item/storage/fancy/candle_box(L)
+ new /obj/item/storage/box/fancy/candle_box(L)
if(prob(75))
- new /obj/item/storage/fancy/candle_box(L)
+ new /obj/item/storage/box/fancy/candle_box(L)
STOCK_ITEM_COMMON(crayons, 1.5)
- new /obj/item/storage/fancy/crayons(L)
+ new /obj/item/storage/box/fancy/crayons(L)
STOCK_ITEM_COMMON(figure, 1)
new /obj/random/action_figure(L)
@@ -121,7 +121,7 @@ STOCK_ITEM_COMMON(vials, 2)
if(prob(20))
new /obj/item/storage/lockbox/vials(L)
else
- new /obj/item/storage/fancy/vials(L)
+ new /obj/item/storage/box/fancy/vials(L)
STOCK_ITEM_COMMON(smallcell, 4)
for(var/i in 1 to rand(1, 2))
@@ -547,4 +547,4 @@ STOCK_ITEM_COMMON(towel, 1)
new /obj/item/towel(L)
STOCK_ITEM_COMMON(nothing, 0)
- // do nothing
\ No newline at end of file
+ // do nothing
diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm
index 11df1522a41..ad6784220d7 100644
--- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm
@@ -1,6 +1,6 @@
/datum/gear/smoking
- display_name = "matchbook"
- path = /obj/item/storage/box/matches
+ display_name = "matchbox"
+ path = /obj/item/storage/box/fancy/matches
sort_category = "Smoking"
/datum/gear/smoking/zippo
@@ -13,26 +13,26 @@
/datum/gear/smoking/cigarcase
display_name = "cigar case"
- path = /obj/item/storage/fancy/cigarettes/cigar
+ path = /obj/item/storage/box/fancy/cigarettes/cigar
cost = 2
/datum/gear/smoking/cigarettes
display_name = "cigarette packet selection"
description = "A selection of cigarette packets."
- path = /obj/item/storage/fancy/cigarettes
+ path = /obj/item/storage/box/fancy/cigarettes
cost = 2
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/smoking/cigarettes/New()
..()
var/cigarettes = list()
- cigarettes["Lucky Strike cigarette packet"] = /obj/item/storage/fancy/cigarettes/rugged
- cigarettes["Trans-Stellar Duty Free cigarette packet"] = /obj/item/storage/fancy/cigarettes
- cigarettes["DromedaryCo cigarette packet"] = /obj/item/storage/fancy/cigarettes/dromedaryco
- cigarettes["Nico-Tine cigarette packet"] = /obj/item/storage/fancy/cigarettes/nicotine
- cigarettes["Working Tajara cigarette packet"] = /obj/item/storage/fancy/cigarettes/pra
- cigarettes["Shastar Leaves cigarette packet"] = /obj/item/storage/fancy/cigarettes/dpra
- cigarettes["Royal Choice cigarette packet"] = /obj/item/storage/fancy/cigarettes/nka
+ cigarettes["Lucky Strike 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
+ cigarettes["Working Tajara cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/pra
+ cigarettes["Shastar Leaves cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/dpra
+ cigarettes["Royal Choice cigarette packet"] = /obj/item/storage/box/fancy/cigarettes/nka
gear_tweaks += new/datum/gear_tweak/path(cigarettes)
/datum/gear/smoking/chew
@@ -48,7 +48,7 @@
chews["Rredouane Cuts chewing tobacco"] = /obj/item/storage/chewables/tobacco/bad
chews["Mendell Smooth chewing tobacco"] = /obj/item/storage/chewables/tobacco
chews["Taba-Kamu chewing tobacco"] = /obj/item/storage/chewables/tobacco/fine
- chews["box of Nico-Tine gum"] = /obj/item/storage/fancy/chewables/tobacco/nico
+ chews["box of Nico-Tine gum"] = /obj/item/storage/box/fancy/chewables/tobacco/nico
gear_tweaks += new/datum/gear_tweak/path(chews)
/datum/gear/smoking/leaves
@@ -85,11 +85,11 @@
/datum/gear/smoking/cigpaper
display_name = "cigarette paper selection"
description = "A selection of cigarette papers."
- path = /obj/item/storage/fancy/cigpaper
+ path = /obj/item/storage/box/fancy/cigpaper
/datum/gear/smoking/cigpaper/New()
..()
var/cigpaper = list()
- cigpaper["Gen. Eric cigarette paper"] = /obj/item/storage/fancy/cigpaper
- cigpaper["Trident cigarette paper"] = /obj/item/storage/fancy/cigpaper/fine
+ cigpaper["Gen. Eric cigarette paper"] = /obj/item/storage/box/fancy/cigpaper
+ cigpaper["Trident cigarette paper"] = /obj/item/storage/box/fancy/cigpaper/fine
gear_tweaks += new/datum/gear_tweak/path(cigpaper)
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 877c38f6598..6758099ae4d 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -128,7 +128,7 @@ obj/item/clothing/suit/apron/overalls/blue
blood_overlay_type = "coat"
contained_sprite = TRUE
body_parts_covered = UPPER_TORSO|ARMS
- allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder)
+ allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder)
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.7
@@ -141,7 +141,7 @@ obj/item/clothing/suit/apron/overalls/blue
icon_open = "detective_open"
icon_closed = "detective"
body_parts_covered = UPPER_TORSO|ARMS
- allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder)
+ allowed = list(/obj/item/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/gun/energy,/obj/item/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/handcuffs,/obj/item/storage/box/fancy/cigarettes,/obj/item/flame/lighter,/obj/item/device/taperecorder)
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
sprite_sheets = list("Vox" = 'icons/mob/species/vox/suit.dmi')
siemens_coefficient = 0.7
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 2ba0d303773..c39e5746d96 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -78,7 +78,7 @@
icon_state = "judge"
item_state = "judge"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
- allowed = list(/obj/item/storage/fancy/cigarettes,/obj/item/spacecash)
+ allowed = list(/obj/item/storage/box/fancy/cigarettes,/obj/item/spacecash)
flags_inv = HIDEJUMPSUIT
/obj/item/clothing/suit/wcoat
@@ -314,7 +314,7 @@
item_state = "mgreen"
icon_open = "mgreen_open"
icon_closed = "mgreen"
- allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/fancy/matches, /obj/item/reagent_containers/food/drinks/flask)
/obj/item/clothing/suit/storage/toggle/leather_jacket/military/tan
icon_state = "mtan"
@@ -443,7 +443,7 @@
item_state = "trackjacket"
icon_open = "trackjacket_open"
icon_closed = "trackjacket"
- allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/fancy/cigarettes, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/fancy/cigarettes, /obj/item/storage/box/fancy/matches, /obj/item/reagent_containers/food/drinks/flask)
contained_sprite = 1
/obj/item/clothing/suit/storage/toggle/track/blue
@@ -489,7 +489,7 @@
item_state = "varsity"
icon_open = "varsity_open"
icon_closed = "varsity"
- allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/matches, /obj/item/reagent_containers/food/drinks/flask)
+ allowed = list (/obj/item/pen, /obj/item/paper, /obj/item/device/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/storage/box/fancy/matches, /obj/item/reagent_containers/food/drinks/flask)
/obj/item/clothing/suit/storage/toggle/varsity/red
name = "red varsity jacket"
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 54f2abc16a0..c5e0f360043 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -2015,7 +2015,7 @@ All custom items with worn sprites must follow the contained sprite system: http
item_state = initial(item_state)
-/obj/item/storage/fancy/fluff/sentiment_bouquet //Bouquet of Chrysanthemums - IRU-Sentiment - niennab
+/obj/item/storage/box/fancy/fluff/sentiment_bouquet //Bouquet of Chrysanthemums - IRU-Sentiment - niennab
name = "bouquet of chrysanthemums"
desc = "A bouquet of white artificial chrysanthemum flowers wrapped in a sheet of newsprint."
icon = 'icons/obj/custom_items/sentiment_bouquet.dmi'
@@ -2027,13 +2027,13 @@ 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/wrapper.ogg'
+ use_sound = 'sound/items/storage/wrapper.ogg'
-/obj/item/storage/fancy/fluff/sentiment_bouquet/fill()
+/obj/item/storage/box/fancy/fluff/sentiment_bouquet/fill()
. = ..()
update_icon()
-/obj/item/storage/fancy/fluff/sentiment_bouquet/update_icon()
+/obj/item/storage/box/fancy/fluff/sentiment_bouquet/update_icon()
icon_state = "[initial(icon_state)]_[contents.len]"
if(contents.len)
item_state = initial(item_state)
diff --git a/code/modules/detectivework/tools/scene_cards.dm b/code/modules/detectivework/tools/scene_cards.dm
index 493ef62dbe3..1dc347d2f2e 100644
--- a/code/modules/detectivework/tools/scene_cards.dm
+++ b/code/modules/detectivework/tools/scene_cards.dm
@@ -1,4 +1,4 @@
-/obj/item/storage/fancy/csi_markers
+/obj/item/storage/box/fancy/csi_markers
name = "crime scene markers box"
desc = "A cardboard box for crime scene marker cards."
icon = 'icons/obj/forensics.dmi'
diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm
index 2cb5a863ca2..2f53df9c585 100644
--- a/code/modules/materials/material_recipes.dm
+++ b/code/modules/materials/material_recipes.dm
@@ -141,14 +141,13 @@
/material/cardboard/generate_recipes()
..()
recipes += new/datum/stack_recipe("box", /obj/item/storage/box)
- recipes += new/datum/stack_recipe("donut box", /obj/item/storage/fancy/donut/empty)
- recipes += new/datum/stack_recipe("egg box", /obj/item/storage/fancy/egg_box)
- recipes += new/datum/stack_recipe("light tubes box", /obj/item/storage/box/lights/tubes)
- recipes += new/datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs)
- recipes += new/datum/stack_recipe("mouse traps box", /obj/item/storage/box/mousetraps)
+ recipes += new/datum/stack_recipe("donut box", /obj/item/storage/box/fancy/donut/empty)
+ recipes += new/datum/stack_recipe("egg carton", /obj/item/storage/box/fancy/egg_box)
+ recipes += new/datum/stack_recipe("candle pack", /obj/item/storage/box/fancy/candle_box/empty)
+ recipes += new/datum/stack_recipe("crayon box", /obj/item/storage/box/fancy/crayons/empty)
+ recipes += new/datum/stack_recipe("pizza box", /obj/item/pizzabox)
recipes += new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3)
recipes += new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg)
- recipes += new/datum/stack_recipe("pizza box", /obj/item/pizzabox)
recipes += new/datum/stack_recipe_list("folders",list( \
new/datum/stack_recipe("blue folder", /obj/item/folder/blue), \
new/datum/stack_recipe("grey folder", /obj/item/folder), \
@@ -202,4 +201,4 @@
/material/diamond/generate_recipes()
..()
- recipes += new/datum/stack_recipe("diamond floor tile", /turf/simulated/floor/diamond, 1, 4, 20)
\ No newline at end of file
+ recipes += new/datum/stack_recipe("diamond floor tile", /turf/simulated/floor/diamond, 1, 4, 20)
diff --git a/code/modules/random_map/drop/drop_types.dm b/code/modules/random_map/drop/drop_types.dm
index f5720c445e2..e5ec711bef2 100644
--- a/code/modules/random_map/drop/drop_types.dm
+++ b/code/modules/random_map/drop/drop_types.dm
@@ -94,7 +94,7 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/reagent_containers/food/drinks/milk,
- /obj/item/storage/fancy/egg_box,
+ /obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/tofu,
/obj/item/reagent_containers/food/snacks/meat,
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index 4523da48b0a..fcf3337bc44 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -527,14 +527,34 @@
reagent_data = list(/datum/reagent/nutriment = list("cookie" = 2))
bitesize = 1
-/obj/item/reagent_containers/food/snacks/cookiesnack
+/obj/item/storage/box/fancy/cookiesnack
name = "Carps Ahoy! miniature cookies"
- desc = "Cap'n Carpie's miniature cookies! Now 100% carpotoxin free!"
+ desc = "A packet of Cap'n Carpie's miniature cookies! Now 100% carpotoxin free!"
+ icon = 'icons/obj/food.dmi'
icon_state = "cookiesnack"
+ icon_type = "cookie"
+ storage_type = "packaging"
+ starts_with = list(/obj/item/reagent_containers/food/snacks/cookiesnack = 6)
+ can_hold = list(/obj/item/reagent_containers/food/snacks/cookiesnack)
+ max_storage_space = 6
+
+ use_sound = 'sound/items/storage/wrapper.ogg'
+ drop_sound = 'sound/items/drop/wrapper.ogg'
+ pickup_sound = 'sound/items/pickup/wrapper.ogg'
+
trash = /obj/item/trash/cookiesnack
+ closable = FALSE
+ icon_overlays = FALSE
+
+/obj/item/reagent_containers/food/snacks/cookiesnack
+ name = "miniature cookie"
+ desc = "These are a lot smaller than you've imagined. They don't even deserve to be dunked in milk."
+ icon_state = "cookie_mini"
+ slot_flags = SLOT_EARS
filling_color = "#DBC94F"
- reagents_to_add = list(/datum/reagent/nutriment/synthetic = 2, /datum/reagent/sugar = 1)
- reagent_data = list(/datum/reagent/nutriment/synthetic = list("stale cookie" = 2))
+
+ reagents_to_add = list(/datum/reagent/nutriment = 0.5)
+ reagent_data = list(/datum/reagent/nutriment = list("sweetness" = 1, "stale cookie" = 2, "childhood disappointment" = 1))
bitesize = 1
/obj/item/reagent_containers/food/snacks/chocolatebar
@@ -2182,26 +2202,33 @@
bitesize = 1
reagents_to_add = list(/datum/reagent/nutriment/mint = 1)
+ reagent_data = list(/datum/reagent/nutriment/mint = list("sweetness" = 1, "menthol" = 1))
/obj/item/reagent_containers/food/snacks/mint/admints
desc = "Spearmint, peppermint's non-festive cousin."
icon_state = "admint"
-/obj/item/storage/box/admints
+/obj/item/storage/box/fancy/admints
name = "Ad-mints"
desc = "A pack of air fresheners for your mouth."
icon = 'icons/obj/food.dmi'
icon_state = "admint_pack"
item_state = "candy"
+ icon_type = "mint"
+ storage_type = "packaging"
slot_flags = SLOT_EARS
- w_class = 1
+ w_class = ITEMSIZE_TINY
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/wrapper.ogg'
+ max_storage_space = 6
+
+ use_sound = 'sound/items/storage/wrapper.ogg'
drop_sound = 'sound/items/drop/wrapper.ogg'
pickup_sound = 'sound/items/pickup/wrapper.ogg'
- max_storage_space = 6
- foldable = null
+
+ trash = /obj/item/trash/admints
+ closable = FALSE
+ icon_overlays = FALSE
/obj/item/reagent_containers/food/snacks/soup/mushroom
name = "chantrelle soup"
@@ -3341,7 +3368,7 @@
reagent_data = list(/datum/reagent/nutriment = list("pizza crust" = 5))
reagents_to_add = list(/datum/reagent/nutriment/coating/batter = 2, /datum/reagent/nutriment/triglyceride/oil = 1)
-
+
/obj/item/reagent_containers/food/snacks/sliceable/pizza/crunch/Initialize()
. = ..()
coating = reagents.get_reagent(/datum/reagent/nutriment/coating/batter)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 4892d28d10e..da33ef69221 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -209,7 +209,7 @@
if(istype(target, /obj/item/implantcase/chem))
return
- if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/smokable/cigarette) && !istype(target, /obj/item/storage/fancy/cigarettes))
+ if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/smokable/cigarette) && !istype(target, /obj/item/storage/box/fancy/cigarettes))
to_chat(user, SPAN_NOTICE("You cannot directly fill this object."))
return
if(!target.reagents.get_free_space())
@@ -448,4 +448,4 @@
/obj/item/reagent_containers/syringe/ld50_syringe/chloral/Initialize()
. = ..()
mode = SYRINGE_INJECT
- update_icon()
\ No newline at end of file
+ update_icon()
diff --git a/html/changelogs/wezzy_fancy_box_update.yml b/html/changelogs/wezzy_fancy_box_update.yml
new file mode 100644
index 00000000000..455b266caf1
--- /dev/null
+++ b/html/changelogs/wezzy_fancy_box_update.yml
@@ -0,0 +1,48 @@
+################################
+# 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: "The cookie snack now contains cookies, like the mint and gum packs. They've also been added to the rations box selection."
+ - rscadd: "Matchboxes, Gum packs, mint packs and the cookie snack from the vending machines visibly open when clicked on."
+ - rscadd: "Gum packs, mint packs and the cookie snack can be crumpled up when empty. If you really wanted to, you still can crumple it with things inside, so long as you're in harm intent."
+ - rscadd: "Odd boxes, such as candle boxes, donut boxes, crayon boxes and egg boxes can be folded and unfolded from cardboard sheets."
+ - rscadd: "Donut boxes, egg cartons and cigarette packets visibly open when clicked on. Alt-click to close."
+ - bugfix: "Mints actually have a proper taste description now."
+ - bugfix: "Burnt matches fit into matchboxes again."
+ - bugfix: "Fixes matchbox icon states."
\ No newline at end of file
diff --git a/icons/obj/candle.dmi b/icons/obj/candle.dmi
index 817d4b9af8c..698dc796598 100644
Binary files a/icons/obj/candle.dmi and b/icons/obj/candle.dmi differ
diff --git a/icons/obj/cigs_lighters.dmi b/icons/obj/cigs_lighters.dmi
index 073aad23113..a5fab861d6f 100644
Binary files a/icons/obj/cigs_lighters.dmi and b/icons/obj/cigs_lighters.dmi differ
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index e8ffe93eb51..714a7e4f50d 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ
diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi
index 085c00c2c38..b74a5f7b010 100644
Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ
diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm
index 855560b6544..c4f7d4e96bd 100644
--- a/maps/aurora/aurora-1_centcomm.dmm
+++ b/maps/aurora/aurora-1_centcomm.dmm
@@ -3271,7 +3271,7 @@
/obj/machinery/vending/cigarette{
name = "hacked cigarette machine";
prices = list();
- products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
+ products = list(/obj/item/storage/box/fancy/cigarettes = 10, /obj/item/storage/box/fancy/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
},
/turf/unsimulated/floor{
name = "plating";
@@ -4292,7 +4292,7 @@
dir = 4
},
/obj/structure/table/standard,
-/obj/item/storage/fancy/donut{
+/obj/item/storage/box/fancy/donut{
pixel_y = 8
},
/turf/simulated/floor/tiled,
@@ -6002,7 +6002,7 @@
"avJ" = (
/obj/structure/table/rack,
/obj/item/storage/secure/briefcase,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/item/flame/lighter/zippo,
/obj/item/storage/belt/utility,
/obj/item/storage/backpack/satchel,
@@ -7474,7 +7474,7 @@
/area/centcom/control)
"ayU" = (
/obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/turf/unsimulated/floor{
icon_state = "floor"
},
@@ -8164,7 +8164,7 @@
/area/centcom/specops)
"aAv" = (
/obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/turf/unsimulated/floor{
icon_state = "dark"
},
@@ -10223,7 +10223,7 @@
dir = 5
},
/obj/item/flame/lighter/zippo,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/item/material/ashtray/bronze{
pixel_x = -1;
pixel_y = 1
@@ -10241,7 +10241,7 @@
dir = 5
},
/obj/item/flame/lighter/zippo,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/item/material/ashtray/bronze{
pixel_x = -1;
pixel_y = 1
@@ -10577,7 +10577,7 @@
/obj/machinery/vending/cigarette{
name = "hacked cigarette machine";
prices = list();
- products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
+ products = list(/obj/item/storage/box/fancy/cigarettes = 10, /obj/item/storage/box/fancy/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
},
/obj/effect/decal/cleanable/dirt,
/turf/unsimulated/floor{
@@ -11693,7 +11693,7 @@
/area/centcom/holding)
"aIP" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/tray,
+/obj/item/storage/box/fancy/tray,
/turf/unsimulated/floor{
icon_state = "whitehall"
},
@@ -13680,7 +13680,7 @@
dir = 5
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/item/flame/lighter/zippo,
/turf/simulated/floor/tiled,
/area/skipjack_station/start)
@@ -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/cigarettes/cigar,
+/obj/item/storage/box/fancy/cigarettes/cigar,
/turf/unsimulated/floor{
name = "plating";
icon_state = "cult"
@@ -15952,7 +15952,7 @@
/area/tdome)
"aSY" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/candle_box,
+/obj/item/storage/box/fancy/candle_box,
/turf/unsimulated/floor{
icon_state = "carpet"
},
@@ -15979,7 +15979,7 @@
/area/wizard_station)
"aTb" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/crayons,
+/obj/item/storage/box/fancy/crayons,
/turf/unsimulated/floor{
icon_state = "carpetside"
},
@@ -16037,7 +16037,7 @@
"aTi" = (
/obj/structure/table/standard,
/obj/item/flame/lighter/zippo,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/turf/unsimulated/floor{
icon_state = "redbluefull";
dir = 8
@@ -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/cigarettes/cigar = 5, /obj/item/storage/fancy/cigarettes/acmeco = 5)
+ products = list(/obj/item/storage/box/fancy/cigarettes = 10, /obj/item/storage/box/fancy/matches = 10, /obj/item/flame/lighter/random = 4, /obj/item/storage/box/fancy/cigarettes/cigar = 5, /obj/item/storage/box/fancy/cigarettes/acmeco = 5)
},
/turf/simulated/floor/lino/grey,
/area/merchant_station)
@@ -18424,7 +18424,7 @@
"bPG" = (
/obj/structure/table/wood,
/obj/item/material/ashtray/glass,
-/obj/item/storage/fancy/cigarettes/dromedaryco,
+/obj/item/storage/box/fancy/cigarettes/dromedaryco,
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
/turf/unsimulated/floor{
icon_state = "floor"
@@ -18630,7 +18630,7 @@
pixel_x = 8;
pixel_y = 3
},
-/obj/item/storage/fancy/cigarettes/dromedaryco,
+/obj/item/storage/box/fancy/cigarettes/dromedaryco,
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
@@ -19733,7 +19733,7 @@
/area/shuttle/distress/centcom)
"dDK" = (
/obj/structure/table/reinforced/steel,
-/obj/item/storage/fancy/tray,
+/obj/item/storage/box/fancy/tray,
/turf/simulated/floor/carpet/rubber,
/area/burglar_base/pod)
"dEX" = (
@@ -19812,7 +19812,7 @@
/obj/item/trash/plate,
/obj/item/trash/cigbutt,
/obj/item/trash/cigbutt,
-/obj/item/storage/box/matches{
+/obj/item/storage/box/fancy/matches{
pixel_y = 12
},
/turf/unsimulated/floor{
@@ -19903,7 +19903,7 @@
},
/area/shuttle/distress/centcom)
"dNm" = (
-/obj/item/storage/fancy/cigarettes/cigar{
+/obj/item/storage/box/fancy/cigarettes/cigar{
layer = 3.01;
pixel_x = -5;
pixel_y = 6
@@ -21033,7 +21033,7 @@
/area/centcom/legion/hangar5)
"flZ" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/effect/floor_decal/corner/red{
dir = 6
},
@@ -22597,7 +22597,7 @@
/area/centcom/legion/hangar5)
"hiU" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/tray,
+/obj/item/storage/box/fancy/tray,
/turf/unsimulated/floor{
icon_state = "whitehall";
dir = 4
@@ -24196,7 +24196,7 @@
/obj/item/melee/energy/sword/knife,
/obj/item/melee/telebaton,
/obj/item/device/megaphone,
-/obj/item/storage/fancy/cigarettes/cigar,
+/obj/item/storage/box/fancy/cigarettes/cigar,
/obj/item/flame/lighter/zippo,
/obj/item/reagent_containers/food/drinks/bottle/victorygin,
/obj/item/reagent_containers/food/drinks/bottle/whiskey,
@@ -28072,7 +28072,7 @@
/area/centcom/legion)
"nZO" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
@@ -31791,7 +31791,7 @@
/obj/machinery/vending/cigarette{
name = "Syndicate-Sponsored cigarette machine";
prices = list();
- products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
+ products = list(/obj/item/storage/box/fancy/cigarettes = 10, /obj/item/storage/box/fancy/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
},
/turf/unsimulated/floor{
name = "plating";
@@ -33906,7 +33906,7 @@
/area/syndicate_station/start)
"vqM" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/tray,
+/obj/item/storage/box/fancy/tray,
/turf/simulated/floor/shuttle/white,
/area/syndicate_station/start)
"vre" = (
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index b5f956d0f01..873859b7d00 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -11852,7 +11852,7 @@
/obj/item/reagent_containers/chem_disp_cartridge,
/obj/item/reagent_containers/chem_disp_cartridge,
/obj/item/reagent_containers/chem_disp_cartridge,
-/obj/item/storage/fancy/vials{
+/obj/item/storage/box/fancy/vials{
pixel_x = -4;
pixel_y = 10
},
@@ -14780,7 +14780,7 @@
/obj/effect/floor_decal/corner/lime/full{
dir = 4
},
-/obj/item/storage/fancy/vials,
+/obj/item/storage/box/fancy/vials,
/obj/item/reagent_containers/dropper{
pixel_y = 9
},
@@ -16830,7 +16830,7 @@
/area/rnd/xenoarch_atrium)
"aGH" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/vials,
+/obj/item/storage/box/fancy/vials,
/turf/simulated/floor/tiled/white,
/area/rnd/xenobiology)
"aGI" = (
@@ -30992,7 +30992,7 @@
icon_state = "1-8"
},
/obj/structure/table/standard,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/obj/machinery/light{
icon_state = "tube1"
},
diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm
index ce9f10143d2..57de6fe1d53 100644
--- a/maps/aurora/aurora-4_mainlevel.dmm
+++ b/maps/aurora/aurora-4_mainlevel.dmm
@@ -929,7 +929,7 @@
/obj/machinery/vending/wallmed2{
pixel_y = 28
},
-/obj/item/storage/fancy/tray,
+/obj/item/storage/box/fancy/tray,
/obj/effect/floor_decal/corner_wide/paleblue{
dir = 5
},
@@ -1471,7 +1471,7 @@
/obj/machinery/vending/wallmed2{
pixel_y = -28
},
-/obj/item/storage/fancy/tray,
+/obj/item/storage/box/fancy/tray,
/obj/effect/floor_decal/corner_wide/paleblue{
dir = 10
},
@@ -6322,7 +6322,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/item/storage/fancy/cigarettes/dromedaryco,
+/obj/item/storage/box/fancy/cigarettes/dromedaryco,
/obj/item/clothing/glasses/sunglasses,
/turf/simulated/floor/tiled/dark,
/area/security/security_office)
@@ -8130,7 +8130,7 @@
/area/security/brig)
"apn" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/obj/machinery/newscaster{
pixel_x = -28
},
@@ -18767,7 +18767,7 @@
/area/server)
"aGI" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/donut{
+/obj/item/storage/box/fancy/donut{
pixel_y = 2
},
/obj/machinery/firealarm/west,
@@ -19008,7 +19008,7 @@
/area/crew_quarters/captain)
"aHf" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/cigarettes/cigar,
+/obj/item/storage/box/fancy/cigarettes/cigar,
/obj/item/flame/lighter/zippo,
/obj/item/hand_tele,
/obj/item/device/radio/intercom{
@@ -22166,7 +22166,7 @@
/area/crew_quarters/captain)
"aMp" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
"aMq" = (
@@ -29650,7 +29650,7 @@
/area/hallway/primary/port)
"aZn" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/vials,
+/obj/item/storage/box/fancy/vials,
/obj/machinery/alarm{
dir = 8;
pixel_x = 28
@@ -30769,7 +30769,7 @@
/area/maintenance/bar)
"bbx" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/tray,
+/obj/item/storage/box/fancy/tray,
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/alarm{
dir = 4;
@@ -30998,7 +30998,7 @@
/area/medical/pharmacy)
"bbQ" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/vials,
+/obj/item/storage/box/fancy/vials,
/obj/item/reagent_containers/dropper,
/obj/structure/sign/nosmoking_1{
pixel_y = 32
@@ -31010,7 +31010,7 @@
/area/medical/pharmacy)
"bbR" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/vials,
+/obj/item/storage/box/fancy/vials,
/obj/item/reagent_containers/dropper,
/obj/effect/floor_decal/corner/orange/full{
dir = 8
@@ -31259,7 +31259,7 @@
/area/crew_quarters/medbreak)
"bcn" = (
/obj/structure/table/glass,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/obj/effect/floor_decal/corner/white/diagonal,
/obj/machinery/newscaster{
pixel_y = 32
@@ -46610,7 +46610,7 @@
/area/crew_quarters/sleep/research)
"bGb" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/vials,
+/obj/item/storage/box/fancy/vials,
/obj/item/reagent_containers/dropper,
/obj/item/device/radio/intercom{
dir = 4;
@@ -47714,7 +47714,7 @@
},
/obj/machinery/door/firedoor,
/obj/structure/table/reinforced,
-/obj/item/storage/fancy/cigarettes/cigar,
+/obj/item/storage/box/fancy/cigarettes/cigar,
/turf/simulated/floor/lino/grey,
/area/crew_quarters/bar)
"bIv" = (
@@ -49602,7 +49602,7 @@
/obj/effect/floor_decal/corner/green{
dir = 6
},
-/obj/item/storage/fancy/vials,
+/obj/item/storage/box/fancy/vials,
/turf/simulated/floor/tiled,
/area/hydroponics)
"bMU" = (
@@ -51748,7 +51748,7 @@
},
/obj/machinery/door/firedoor,
/obj/structure/table/reinforced,
-/obj/item/storage/fancy/candle_box,
+/obj/item/storage/box/fancy/candle_box,
/turf/simulated/floor/lino/grey,
/area/crew_quarters/bar)
"bSR" = (
@@ -51938,12 +51938,12 @@
name = "Bar Requests Console";
pixel_y = 32
},
-/obj/item/storage/fancy/candle_box,
-/obj/item/storage/fancy/candle_box,
+/obj/item/storage/box/fancy/candle_box,
+/obj/item/storage/box/fancy/candle_box,
/obj/item/reagent_containers/toothpaste,
/obj/item/reagent_containers/toothpaste,
/obj/item/device/nanoquikpay,
-/obj/item/storage/box/matches,
+/obj/item/storage/box/fancy/matches,
/turf/simulated/floor/wood,
/area/crew_quarters/bar)
"bTq" = (
@@ -52979,7 +52979,7 @@
/area/maintenance/bar)
"bVK" = (
/obj/structure/closet/wardrobe/chaplain_black,
-/obj/item/storage/fancy/crayons,
+/obj/item/storage/box/fancy/crayons,
/turf/simulated/floor/wood,
/area/chapel/office)
"bVM" = (
@@ -61387,8 +61387,8 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
/obj/random/loot,
-/obj/item/storage/fancy/candle_box,
-/obj/item/storage/box/matches,
+/obj/item/storage/box/fancy/candle_box,
+/obj/item/storage/box/fancy/matches,
/turf/simulated/floor/wood,
/area/maintenance/vault)
"hKS" = (
@@ -64195,7 +64195,7 @@
/turf/simulated/floor/lino/grey,
/area/engineering/foyer)
"oMh" = (
-/obj/item/storage/fancy/crayons/chalkbox,
+/obj/item/storage/box/fancy/crayons/chalkbox,
/obj/structure/table/wood/gamblingtable,
/turf/simulated/floor/lino/grey,
/area/engineering/foyer)
@@ -67651,8 +67651,8 @@
/area/rnd/lab)
"wil" = (
/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/item/storage/fancy/egg_box,
-/obj/item/storage/fancy/egg_box,
+/obj/item/storage/box/fancy/egg_box,
+/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/reagent_containers/food/drinks/milk,
/obj/item/reagent_containers/food/drinks/soymilk,
diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm
index 488f871218b..067ce5d8f4f 100644
--- a/maps/aurora/aurora-5_interstitial.dmm
+++ b/maps/aurora/aurora-5_interstitial.dmm
@@ -1360,7 +1360,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/firealarm/north,
/obj/structure/table/wood,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/obj/machinery/camera/network/security{
c_tag = "Security - Training Division 3";
dir = 8
@@ -2627,7 +2627,7 @@
pixel_x = 5;
pixel_y = 5
},
-/obj/item/storage/fancy/vials,
+/obj/item/storage/box/fancy/vials,
/turf/simulated/floor/tiled/white,
/area/security/forensics_office)
"fU" = (
@@ -4575,7 +4575,7 @@
/obj/structure/table/wood,
/obj/item/reagent_containers/spray/luminol,
/obj/machinery/light,
-/obj/item/storage/fancy/csi_markers,
+/obj/item/storage/box/fancy/csi_markers,
/turf/simulated/floor/tiled,
/area/security/training)
"jA" = (
@@ -9335,7 +9335,7 @@
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/obj/item/storage/fancy/vials{
+/obj/item/storage/box/fancy/vials{
starts_with = list(/obj/item/reagent_containers/glass/beaker/vial = 2)
},
/turf/simulated/floor/tiled/white,
@@ -11060,7 +11060,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
-/obj/item/storage/fancy/csi_markers,
+/obj/item/storage/box/fancy/csi_markers,
/turf/simulated/floor/tiled/white,
/area/security/forensics_office)
"NQ" = (
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 33a0c2b3c40..e09489cd901 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -8603,7 +8603,7 @@
/area/shuttle/escape_pod2/station)
"pX" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/cigarettes{
+/obj/item/storage/box/fancy/cigarettes{
pixel_y = 2
},
/obj/random/single{
@@ -10075,9 +10075,9 @@
/area/storage/primary)
"sY" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/crayons,
-/obj/item/storage/fancy/crayons,
-/obj/item/storage/fancy/crayons/chalkbox,
+/obj/item/storage/box/fancy/crayons,
+/obj/item/storage/box/fancy/crayons,
+/obj/item/storage/box/fancy/crayons/chalkbox,
/turf/simulated/floor/tiled,
/area/storage/primary)
"sZ" = (
@@ -22012,7 +22012,7 @@
/area/shuttle/research/station)
"Qk" = (
/obj/structure/table/steel,
-/obj/item/storage/fancy/crayons/chalkbox,
+/obj/item/storage/box/fancy/crayons/chalkbox,
/obj/machinery/camera/network/civilian_surface{
c_tag = "Surface - Auxillary Tool Storage";
dir = 1
@@ -24447,8 +24447,8 @@
/area/hallway/secondary/entry/stairs)
"VA" = (
/obj/structure/table/standard,
-/obj/item/reagent_containers/food/snacks/cookiesnack,
-/obj/item/reagent_containers/food/snacks/cookiesnack,
+/obj/item/storage/box/fancy/cookiesnack,
+/obj/item/storage/box/fancy/cookiesnack,
/obj/item/reagent_containers/food/drinks/cans/waterbottle{
layer = 3.01;
pixel_x = -8;
diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm
index b2bd49db2ed..df7afe33739 100644
--- a/maps/exodus/exodus-1_station.dmm
+++ b/maps/exodus/exodus-1_station.dmm
@@ -2746,7 +2746,7 @@
dir = 4;
icon_state = "tube1"
},
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/obj/effect/floor_decal/corner/blue,
/turf/simulated/floor/tiled,
/area/security/main)
@@ -8164,7 +8164,7 @@
pixel_x = 5;
pixel_y = 5
},
-/obj/item/storage/fancy/vials,
+/obj/item/storage/box/fancy/vials,
/turf/simulated/floor/tiled/white,
/area/security/forensics_office)
"aoX" = (
@@ -10923,7 +10923,7 @@
name = "Prisoner's Locker"
},
/obj/item/flame/lighter/zippo,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/turf/simulated/floor/tiled,
/area/security/prison)
"aut" = (
@@ -18426,7 +18426,7 @@
pixel_x = -2;
pixel_y = 5
},
-/obj/item/storage/fancy/crayons,
+/obj/item/storage/box/fancy/crayons,
/turf/simulated/floor/carpet,
/area/chapel/office)
"aJt" = (
@@ -18779,7 +18779,7 @@
/area/security/nuke_storage)
"aJY" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/cigarettes{
+/obj/item/storage/box/fancy/cigarettes{
pixel_y = 2
},
/obj/machinery/alarm{
@@ -21886,7 +21886,7 @@
/area/hallway/secondary/entry/port)
"aQa" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/cigarettes{
+/obj/item/storage/box/fancy/cigarettes{
pixel_y = 2
},
/obj/random/single{
@@ -27330,7 +27330,7 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/obj/effect/floor_decal/corner/blue/full,
/turf/simulated/floor/tiled,
/area/bridge)
@@ -29104,7 +29104,7 @@
},
/obj/machinery/light,
/obj/structure/table/stone/marble,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/turf/simulated/floor/tiled,
/area/crew_quarters/kitchen)
"bed" = (
@@ -30455,7 +30455,7 @@
/area/crew_quarters/captain)
"bgT" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
@@ -31888,7 +31888,7 @@
/obj/machinery/recharger{
pixel_y = 4
},
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"bjH" = (
@@ -39379,7 +39379,7 @@
name = "Station Intercom (General)";
pixel_y = -29
},
-/obj/item/storage/box/matches,
+/obj/item/storage/box/fancy/matches,
/obj/item/clothing/mask/smokable/cigarette/cigar,
/obj/item/reagent_containers/food/drinks/flask{
pixel_x = 8
@@ -40546,7 +40546,7 @@
"bzA" = (
/obj/effect/floor_decal/corner/white,
/obj/structure/table/standard,
-/obj/item/storage/fancy/tray,
+/obj/item/storage/box/fancy/tray,
/turf/simulated/floor/tiled,
/area/assembly/robotics)
"bzB" = (
@@ -53242,7 +53242,7 @@
"bWV" = (
/obj/effect/floor_decal/corner/white/diagonal,
/obj/structure/table/glass,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/turf/simulated/floor/tiled,
/area/crew_quarters/medbreak)
"bWW" = (
@@ -55930,7 +55930,7 @@
maxcharge = 15000
},
/obj/item/clothing/glasses/welding/superior,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/item/book/manual/supermatter_engine,
/turf/simulated/floor/tiled,
/area/crew_quarters/heads/chief)
@@ -58800,7 +58800,7 @@
dir = 4;
pixel_x = -22
},
-/obj/item/storage/fancy/tray,
+/obj/item/storage/box/fancy/tray,
/turf/simulated/floor/tiled/white,
/area/medical/surgery)
"chF" = (
@@ -58853,7 +58853,7 @@
dir = 8;
pixel_x = 24
},
-/obj/item/storage/fancy/tray,
+/obj/item/storage/box/fancy/tray,
/turf/simulated/floor/tiled/white,
/area/medical/surgery2)
"chI" = (
@@ -67160,7 +67160,7 @@
/turf/simulated/floor/tiled/white,
/area/medical/abandoned)
"cxj" = (
-/obj/item/storage/fancy/vials,
+/obj/item/storage/box/fancy/vials,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 4
diff --git a/maps/exodus/exodus-2_centcomm.dmm b/maps/exodus/exodus-2_centcomm.dmm
index 3638677d80f..e7c7ae94a63 100644
--- a/maps/exodus/exodus-2_centcomm.dmm
+++ b/maps/exodus/exodus-2_centcomm.dmm
@@ -3068,7 +3068,7 @@
/obj/machinery/vending/cigarette{
name = "hacked cigarette machine";
prices = list();
- products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
+ products = list(/obj/item/storage/box/fancy/cigarettes = 10, /obj/item/storage/box/fancy/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
},
/turf/unsimulated/floor{
name = "plating";
@@ -3881,7 +3881,7 @@
/obj/machinery/vending/cigarette{
name = "hacked cigarette machine";
prices = list();
- products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
+ products = list(/obj/item/storage/box/fancy/cigarettes = 10, /obj/item/storage/box/fancy/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
},
/turf/simulated/floor/shuttle{
icon_state = "floor6"
@@ -4176,7 +4176,7 @@
},
/area/shuttle/administration/centcom)
"apv" = (
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/structure/table/reinforced,
/turf/simulated/floor/shuttle{
icon_state = "floor4"
@@ -6251,7 +6251,7 @@
/area/shuttle/administration/centcom)
"axh" = (
/obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/turf/unsimulated/floor{
icon_state = "dark"
},
@@ -7065,7 +7065,7 @@
/obj/machinery/vending/cigarette{
name = "hacked cigarette machine";
prices = list();
- products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
+ products = list(/obj/item/storage/box/fancy/cigarettes = 10, /obj/item/storage/box/fancy/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
},
/obj/effect/decal/cleanable/dirt,
/turf/unsimulated/floor{
@@ -8029,7 +8029,7 @@
dir = 5
},
/obj/item/flame/lighter/zippo,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/item/material/ashtray/bronze{
pixel_x = -1;
pixel_y = 1
@@ -8047,7 +8047,7 @@
dir = 5
},
/obj/item/flame/lighter/zippo,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/item/material/ashtray/bronze{
pixel_x = -1;
pixel_y = 1
@@ -8919,7 +8919,7 @@
/area/skipjack_station/start)
"aGb" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/item/flame/lighter/zippo,
/obj/item/clothing/gloves/yellow,
/obj/item/stack/material/steel{
@@ -10324,7 +10324,7 @@
/area/wizard_station)
"aKF" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/turf/unsimulated/floor{
dir = 8;
icon_state = "wood"
@@ -10901,7 +10901,7 @@
/area/centcom/test)
"aMc" = (
/obj/structure/table/wood,
-/obj/item/storage/fancy/cigarettes/cigar,
+/obj/item/storage/box/fancy/cigarettes/cigar,
/obj/item/flame/lighter/zippo,
/turf/simulated/floor/wood,
/area/merchant_station)
@@ -12007,7 +12007,7 @@
/area/centcom/control)
"aOK" = (
/obj/structure/table/reinforced,
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/turf/unsimulated/floor{
icon_state = "floor"
},
@@ -14722,7 +14722,7 @@
"aVb" = (
/obj/structure/table/rack,
/obj/item/storage/secure/briefcase,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/obj/item/flame/lighter/zippo,
/obj/item/storage/belt/utility,
/obj/item/storage/backpack/satchel,
@@ -19048,7 +19048,7 @@
"lgl" = (
/obj/structure/table/wood,
/obj/item/material/ashtray/glass,
-/obj/item/storage/fancy/cigarettes/dromedaryco,
+/obj/item/storage/box/fancy/cigarettes/dromedaryco,
/obj/item/reagent_containers/food/drinks/cans/waterbottle,
/turf/unsimulated/floor{
icon_state = "floor"
@@ -19107,7 +19107,7 @@
"ltQ" = (
/obj/structure/table/standard,
/obj/item/flame/lighter/zippo,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/turf/unsimulated/floor{
icon_state = "redbluefull";
dir = 8
diff --git a/maps/exodus/exodus-3_telecomms.dmm b/maps/exodus/exodus-3_telecomms.dmm
index 3308cd7a4c0..02093a25923 100644
--- a/maps/exodus/exodus-3_telecomms.dmm
+++ b/maps/exodus/exodus-3_telecomms.dmm
@@ -995,7 +995,7 @@
/area/tcommsat/computer)
"dp" = (
/obj/structure/table/standard,
-/obj/item/storage/fancy/cigarettes,
+/obj/item/storage/box/fancy/cigarettes,
/turf/simulated/floor/tiled,
/area/tcommsat/computer)
"dq" = (
diff --git a/maps/runtime/runtime-1.dmm b/maps/runtime/runtime-1.dmm
index a9a37f75602..14c98df7a4e 100644
--- a/maps/runtime/runtime-1.dmm
+++ b/maps/runtime/runtime-1.dmm
@@ -1039,7 +1039,7 @@
/turf/simulated/floor/tiled,
/area/hallway/secondary/entry)
"cG" = (
-/obj/item/storage/fancy/donut,
+/obj/item/storage/box/fancy/donut,
/obj/effect/floor_decal/corner/blue{
dir = 1
},
diff --git a/maps/templates/backup/syndicate_base.dmm b/maps/templates/backup/syndicate_base.dmm
index 4f3cc2af5f1..f9f424f5715 100644
--- a/maps/templates/backup/syndicate_base.dmm
+++ b/maps/templates/backup/syndicate_base.dmm
@@ -778,7 +778,7 @@
/obj/machinery/vending/cigarette{
name = "hacked cigarette machine";
prices = list();
- products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
+ products = list(/obj/item/storage/box/fancy/cigarettes = 10, /obj/item/storage/box/fancy/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/lino,
diff --git a/maps/templates/pra.dmm b/maps/templates/pra.dmm
index 7d724108707..7eecff9ffea 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/cigarettes/cigar,
+/obj/item/storage/box/fancy/cigarettes/cigar,
/obj/item/flame/lighter/zippo,
/turf/simulated/floor/wood,
/area/derelict/ship)
diff --git a/maps/templates/syndicate_base.dmm b/maps/templates/syndicate_base.dmm
index 5a158730171..91f3c45f134 100644
--- a/maps/templates/syndicate_base.dmm
+++ b/maps/templates/syndicate_base.dmm
@@ -778,7 +778,7 @@
/obj/machinery/vending/cigarette{
name = "hacked cigarette machine";
prices = list();
- products = list(/obj/item/storage/fancy/cigarettes = 10, /obj/item/storage/box/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
+ products = list(/obj/item/storage/box/fancy/cigarettes = 10, /obj/item/storage/box/fancy/matches = 10, /obj/item/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2)
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/lino,