diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index b32169951c46..e1804726b312 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) /obj/item/a_gift name = "gift" desc = "PRESENTS!!!! eek!" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "giftdeliverypackage3" item_state = "gift" resistance_flags = FLAMMABLE diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 153c3a75564d..48d7eb00f76a 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -264,7 +264,7 @@ /obj/item/conversion_kit name = "conversion kit" desc = "A strange box containing wood working tools and an instruction paper to turn stun batons into something else." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "uk" custom_price = 450 diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index e87691b651a9..d8a382cf589c 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -550,7 +550,7 @@ /obj/item/borg/upgrade/rped name = "engineering cyborg RPED" desc = "A rapid part exchange device for the engineering cyborg." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "borgrped" require_module = TRUE module_type = list(/obj/item/robot_module/engineering, /obj/item/robot_module/saboteur) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index b4ec267bd770..32f0ea888964 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -226,7 +226,7 @@ /obj/item/storage/backpack/satchel/leather name = "leather satchel" desc = "It's a very fancy satchel made with fine leather." - icon = 'icons/obj/storage.dmi' //WS Edit - Suitcases + icon = 'icons/obj/storage/storage.dmi' //WS Edit - Suitcases icon_state = "satchel" item_state = "satchel" @@ -359,7 +359,7 @@ /obj/item/storage/backpack/messenger name = "messenger bag" desc = "A sturdy backpack worn over one shoulder." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' mob_overlay_icon = 'icons/mob/clothing/back.dmi' icon_state = "courierbag" item_state = "courierbag" diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index a0ce4670c0bf..c602f3786bdc 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", /obj/item/storage/book/bible name = "bible" desc = "Apply to head repeatedly." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "bible" item_state = "bible" lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi' @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", if(!GLOB.bible_icon_state && H.mind.holy_role == HOLY_ROLE_HIGHPRIEST) var/dat = "Pick Bible Style

Pick a bible style

" for(var/i in 1 to GLOB.biblestates.len) - var/icon/bibleicon = icon('icons/obj/storage.dmi', GLOB.biblestates[i]) + var/icon/bibleicon = icon('icons/obj/storage/storage.dmi', GLOB.biblestates[i]) var/nicename = GLOB.biblenames[i] H << browse_rsc(bibleicon, nicename) dat += {""} diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 9e8d4e94745c..29a7904773b0 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -254,7 +254,7 @@ /obj/item/storage/box/hypospray name = "hypospray mk. II kit" - icon = 'icons/obj/storage.dmi' //WS Edit - Suitcases + icon = 'icons/obj/storage/storage.dmi' //WS Edit - Suitcases icon_state = "medbriefcase" illustration = null @@ -465,6 +465,7 @@ name = "box of donk-pockets" desc = "Instructions:Heat in microwave. Product will cool if not eaten within seven minutes." icon_state = "donkpocketbox" + icon = 'icons/obj/storage/donk.dmi' illustration=null var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket @@ -736,7 +737,7 @@ /obj/item/storage/box/lights name = "box of replacement bulbs" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' illustration = "light" desc = "This box is shaped on the inside so that only light tubes and bulbs fit." item_state = "syringe_kit" @@ -886,7 +887,7 @@ /obj/item/storage/box/slugshot name = "box of 12-gauge slug shotgun shells" desc = "a box full of slug shots, designed for riot shotguns" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "slugshot_box" illustration = null @@ -1478,6 +1479,7 @@ name = "bubblegum packet" desc = "The packaging is entirely in japanese, apparently. You can't make out a single word of it." icon_state = "bubblegum_generic" + icon = 'icons/obj/storage/gum.dmi' w_class = WEIGHT_CLASS_TINY illustration = null foldable = null diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 895b94acf574..db7212dc7d76 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -1,7 +1,7 @@ /obj/item/storage/briefcase name = "briefcase" desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." - icon = 'icons/obj/storage.dmi' //WS edit - Better briefcases + icon = 'icons/obj/storage/storage.dmi' //WS edit - Better briefcases icon_state = "briefcase" lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi' diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 4505f596907f..cb81fcec1613 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -12,7 +12,7 @@ /obj/item/storage/firstaid name = "first-aid kit" desc = "It's an emergency medical kit for those serious boo-boos." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "firstaid" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' @@ -119,7 +119,7 @@ generate_items_inside(items_inside,src) /obj/item/storage/firstaid/ancient - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "firstaid" desc = "A first aid kit with the ability to heal common types of injuries." diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index 6d6690106b4d..37cd3378142e 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -3,7 +3,7 @@ desc = "A locked box." icon_state = "lockbox+l" item_state = "syringe_kit" - icon = 'icons/obj/storage.dmi' //WS edit - better briefcases + icon = 'icons/obj/storage/storage.dmi' //WS edit - better briefcases lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' w_class = WEIGHT_CLASS_BULKY diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index c1014716c323..6549daee51ee 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -117,7 +117,7 @@ // ----------------------------- /obj/item/storage/secure/briefcase name = "secure briefcase" - icon = 'icons/obj/storage.dmi' //WS edit - better briefcases + icon = 'icons/obj/storage/storage.dmi' //WS edit - better briefcases icon_state = "secure" item_state = "sec-case" lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi' @@ -158,7 +158,7 @@ /obj/item/storage/secure/safe name = "secure safe" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "safe" icon_opened = "safe0" icon_locking = "safeb" diff --git a/code/game/objects/items/storage/sixpack.dm b/code/game/objects/items/storage/sixpack.dm index 1a229909aa82..f426ba1dbd4e 100644 --- a/code/game/objects/items/storage/sixpack.dm +++ b/code/game/objects/items/storage/sixpack.dm @@ -1,7 +1,7 @@ /obj/item/storage/cans name = "can ring" desc = "Holds up to six drink cans, and select bottles." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "canholder" item_state = "cola" lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index c2619eef4c14..6992bac55688 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -1,6 +1,6 @@ /obj/item/storage name = "storage" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' w_class = WEIGHT_CLASS_NORMAL var/rummage_if_nodrop = TRUE var/component_type = /datum/component/storage/concrete diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 05dccfc0ca75..9da4af8b984d 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -17,7 +17,7 @@ if(src.client.handle_spam_prevention(msg,MUTE_PRAY)) return - var/mutable_appearance/cross = mutable_appearance('icons/obj/storage.dmi', "bible") + var/mutable_appearance/cross = mutable_appearance('icons/obj/storage/storage.dmi', "bible") var/font_color = "purple" var/prayer_type = "PRAYER" var/deity diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index 3ca5e48930a4..b8cb31e1a895 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -3,7 +3,7 @@ /obj/item/evidencebag name = "evidence bag" desc = "An empty evidence bag." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "evidenceobj" item_state = "" w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 0c36ea6ec8c7..d0f4506976b2 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -679,7 +679,7 @@ /obj/item/storage/bottles name = "bottle crate" desc = "A small crate for storing bottles" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "bottlecrate" item_state = "deliverypackage" lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 77525a1f309e..126b581de3cf 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -1,7 +1,7 @@ /obj/structure/bigDelivery name = "large parcel" desc = "A large delivery parcel." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "deliverycloset" density = TRUE mouse_drag_pointer = MOUSE_ACTIVE_POINTER @@ -165,7 +165,7 @@ /obj/item/smallDelivery name = "parcel" desc = "A brown paper delivery parcel." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "deliverypackage3" item_state = "deliverypackage" var/giftwrapped = 0 diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index 7b5bd27a8ada..7e2f48a1c2d8 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -48,7 +48,7 @@ /obj/structure/cursed_money name = "bag of money" desc = "RICH! YES! YOU KNEW IT WAS WORTH IT! YOU'RE RICH! RICH! RICH!" - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "moneybag" anchored = FALSE density = TRUE diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 0c535f58ae23..5a721b324dc2 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -20,7 +20,7 @@ desc = "A wall mounted safe containing space suits. Will only open in emergencies." anchored = TRUE density = FALSE - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "safe" var/unlocked = FALSE @@ -70,7 +70,7 @@ /obj/item/storage/overmap_ship name = "emergency space suits" desc = "A wall mounted safe containing space suits. Will only open in emergencies." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "safe" anchored = TRUE var/unlocked = FALSE diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 317297c4fe8d..d08b641bf027 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -192,7 +192,7 @@ /obj/item/organ_storage //allows medical cyborgs to manipulate organs without hands name = "organ storage bag" desc = "A container for holding body parts." - icon = 'icons/obj/storage.dmi' + icon = 'icons/obj/storage/storage.dmi' icon_state = "evidenceobj" item_flags = SURGICAL_TOOL diff --git a/icons/obj/food/cake.dmi b/icons/obj/food/cake.dmi index 83919fe586c9..b57decba6d19 100644 Binary files a/icons/obj/food/cake.dmi and b/icons/obj/food/cake.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index a7b5d43559cf..834b82ace72e 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi index a2286963d9a3..ad2cf89b7e7c 100644 Binary files a/icons/obj/food/meat.dmi and b/icons/obj/food/meat.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi deleted file mode 100644 index 250f7220713d..000000000000 Binary files a/icons/obj/storage.dmi and /dev/null differ diff --git a/icons/obj/storage/donk.dmi b/icons/obj/storage/donk.dmi new file mode 100644 index 000000000000..c0cb7fcc39bb Binary files /dev/null and b/icons/obj/storage/donk.dmi differ diff --git a/icons/obj/storage/gum.dmi b/icons/obj/storage/gum.dmi new file mode 100644 index 000000000000..ed5140d84439 Binary files /dev/null and b/icons/obj/storage/gum.dmi differ diff --git a/icons/obj/storage/storage.dmi b/icons/obj/storage/storage.dmi new file mode 100644 index 000000000000..15b63621ae2e Binary files /dev/null and b/icons/obj/storage/storage.dmi differ
[nicename]