[MIRROR] 3/4ths-ify some wall mount sprites (by Kryson and Viro) [MDB IGNORE] (#18039)

* 3/4ths-ify some wall mount sprites (by Kryson and Viro) (#71788)

posters are now 24px tall, new sprites for nanomeds, emergency safes, and ticket machines
(by Kryson)

* 3/4ths-ify some wall mount sprites (by Kryson and Viro)

* DON'T INCLUDE FUCKING OVERRIDES IF THEY DON'T DO ANYTHING HHHNGH MY CI IS FAILING CODERS

* FUCK

Co-authored-by: tattle <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com>

_maps/RandomRuins/SpaceRuins/asteroid4.dmm

@@ -54,9 +54,7 @@
 /obj/structure/chair{
 	dir = 1
 	},
-/obj/item/storage/pod{
-	pixel_x = -26
-	},
+/obj/item/storage/pod/directional/west,
 /turf/open/floor/mineral/titanium/blue,
 /area/ruin/space/has_grav)
 "o" = (

_maps/shuttles/escape_pod_default.dmm

@@ -30,9 +30,7 @@
 	dir = 1
 	},
 /obj/item/radio/intercom/directional/east,
-/obj/item/storage/pod{
-	pixel_x = -26
-	},
+/obj/item/storage/pod/directional/west,
 /obj/machinery/light/small/directional/west,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_1)

_maps/shuttles/escape_pod_large.dmm

@@ -3,9 +3,7 @@
 /obj/structure/chair/comfy/shuttle{
 	dir = 4
 	},
-/obj/item/storage/pod{
-	pixel_x = -24
-	},
+/obj/item/storage/pod/directional/west,
 /turf/open/floor/mineral/titanium/blue,
 /area/shuttle/pod_1)
 "r" = (

code/datums/greyscale/config_types/greyscale_configs.dm

@@ -389,42 +389,42 @@
 
 /datum/greyscale_config/giftdeliverybox
 	name = "Gift Box"
-	icon_file = 'icons/obj/storage/storage.dmi'
+	icon_file = 'icons/obj/storage/wrapping.dmi'
 	json_config = 'code/datums/greyscale/json_configs/giftdeliverybox.json'
 
 /datum/greyscale_config/giftdeliverycloset
 	name = "Gift Closet"
-	icon_file = 'icons/obj/storage/storage.dmi'
+	icon_file = 'icons/obj/storage/wrapping.dmi'
 	json_config = 'code/datums/greyscale/json_configs/giftdeliverycloset.json'
 
 /datum/greyscale_config/giftdeliverycrate
 	name = "Gift Crate"
-	icon_file = 'icons/obj/storage/storage.dmi'
+	icon_file = 'icons/obj/storage/wrapping.dmi'
 	json_config = 'code/datums/greyscale/json_configs/giftdeliverycrate.json'
 
 /datum/greyscale_config/giftdeliverypackage5
 	name = "Gift Package 5 (Biggest)"
-	icon_file = 'icons/obj/storage/storage.dmi'
+	icon_file = 'icons/obj/storage/wrapping.dmi'
 	json_config = 'code/datums/greyscale/json_configs/giftdeliverypackage5.json'
 
 /datum/greyscale_config/giftdeliverypackage4
 	name = "Gift Package 4"
-	icon_file = 'icons/obj/storage/storage.dmi'
+	icon_file = 'icons/obj/storage/wrapping.dmi'
 	json_config = 'code/datums/greyscale/json_configs/giftdeliverypackage4.json'
 
 /datum/greyscale_config/giftdeliverypackage3
 	name = "Gift Package 3"
-	icon_file = 'icons/obj/storage/storage.dmi'
+	icon_file = 'icons/obj/storage/wrapping.dmi'
 	json_config = 'code/datums/greyscale/json_configs/giftdeliverypackage3.json'
 
 /datum/greyscale_config/giftdeliverypackage2
 	name = "Gift Package 2"
-	icon_file = 'icons/obj/storage/storage.dmi'
+	icon_file = 'icons/obj/storage/wrapping.dmi'
 	json_config = 'code/datums/greyscale/json_configs/giftdeliverypackage2.json'
 
 /datum/greyscale_config/giftdeliverypackage1
 	name = "Gift Package 1 (Smallest)"
-	icon_file = 'icons/obj/storage/storage.dmi'
+	icon_file = 'icons/obj/storage/wrapping.dmi'
 	json_config = 'code/datums/greyscale/json_configs/giftdeliverypackage1.json'
 
 /datum/greyscale_config/wrap_paper

code/game/objects/effects/powerup.dm

@@ -85,7 +85,7 @@
 /obj/effect/powerup/ammo
 	name = "ammo pickup"
 	desc = "You like revenge, right? Everybody likes revenge! Well, let's go get some!"
-	icon = 'icons/obj/storage/storage.dmi'
+	icon = 'icons/obj/storage/box.dmi'
 	icon_state = "ammobox"
 	respawn_time = 30 SECONDS
 	pickup_message = "Ammunition reloaded!"

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/storage.dmi'
+	icon = 'icons/obj/storage/wrapping.dmi'
 	icon_state = "giftdeliverypackage3"
 	inhand_icon_state = "gift"
 	resistance_flags = FLAMMABLE

code/game/objects/items/gun_maintenance.dm

@@ -1,6 +1,6 @@
 /obj/item/gun_maintenance_supplies
 	name = "gun maintenance supplies"
 	desc = "plastic box containing gun maintenance supplies and spare parts. Use them on a Mosin Nagant to clean it."
-	icon = 'icons/obj/storage/storage.dmi'
+	icon = 'icons/obj/storage/box.dmi'
 	icon_state = "plasticbox"
 	w_class = WEIGHT_CLASS_SMALL

code/game/objects/items/his_grace.dm

@@ -7,7 +7,7 @@
 /obj/item/his_grace
 	name = "artistic toolbox"
 	desc = "A toolbox painted bright green. Looking at it makes you feel uneasy."
-	icon = 'icons/obj/storage/storage.dmi'
+	icon = 'icons/obj/storage/toolbox.dmi'
 	icon_state = "green"
 	inhand_icon_state = "artistic_toolbox"
 	lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'

code/game/objects/items/melee/baton.dm

@@ -279,7 +279,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/storage.dmi'
+	icon = 'icons/obj/storage/box.dmi'
 	icon_state = "uk"
 	custom_price = PAYCHECK_COMMAND * 4.5
 

code/game/objects/items/storage/basket.dm

@@ -1,6 +1,7 @@
 /obj/item/storage/basket
 	name = "basket"
 	desc = "Handwoven basket."
+	icon = 'icons/obj/storage/basket.dmi'
 	icon_state = "basket"
 	w_class = WEIGHT_CLASS_BULKY
 	resistance_flags = FLAMMABLE

code/game/objects/items/storage/book.dm

@@ -26,7 +26,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/storage.dmi'
+	icon = 'icons/obj/storage/book.dmi'
 	icon_state = "bible"
 	inhand_icon_state = "bible"
 	worn_icon_state = "bible"
@@ -61,7 +61,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
 
 	var/list/skins = list()
 	for(var/i in 1 to GLOB.biblestates.len)
-		var/image/bible_image = image(icon = 'icons/obj/storage/storage.dmi', icon_state = GLOB.biblestates[i])
+		var/image/bible_image = image(icon = 'icons/obj/storage/book.dmi', icon_state = GLOB.biblestates[i])
 		skins += list("[GLOB.biblenames[i]]" = bible_image)
 
 	var/choice = show_radial_menu(user, src, skins, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 40, require_near = TRUE)

code/game/objects/items/storage/boxes/_boxes.dm

@@ -2,6 +2,7 @@
 /obj/item/storage/box
 	name = "box"
 	desc = "It's just an ordinary box."
+	icon = 'icons/obj/storage/box.dmi'
 	icon_state = "box"
 	inhand_icon_state = "syringe_kit"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'

code/game/objects/items/storage/boxes/food_boxes.dm

@@ -49,6 +49,7 @@
 /obj/item/storage/box/papersack
 	name = "paper sack"
 	desc = "A sack neatly crafted out of paper."
+	icon = 'icons/obj/storage/paperbag.dmi'
 	icon_state = "paperbag_None"
 	inhand_icon_state = null
 	illustration = null
@@ -312,14 +313,15 @@
 	desc = "This box should not exist, contact the proper authorities."
 
 /obj/item/storage/box/ingredients/random/Initialize(mapload)
-	.=..()
+	. = ..()
 	var/chosen_box = pick(subtypesof(/obj/item/storage/box/ingredients) - /obj/item/storage/box/ingredients/random)
 	new chosen_box(loc)
 	return INITIALIZE_HINT_QDEL
 
 /obj/item/storage/box/gum
 	name = "bubblegum packet"
-	desc = "The packaging is entirely in japanese, apparently. You can't make out a single word of it."
+	desc = "The packaging is entirely in Japanese, apparently. You can't make out a single word of it."
+	icon = 'icons/obj/storage/gum.dmi'
 	icon_state = "bubblegum_generic"
 	w_class = WEIGHT_CLASS_TINY
 	illustration = null

code/game/objects/items/storage/boxes/service_boxes.dm

@@ -114,13 +114,12 @@
 
 /obj/item/storage/box/lights
 	name = "box of replacement bulbs"
-	icon = 'icons/obj/storage/storage.dmi'
-	illustration = "light"
 	desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
 	inhand_icon_state = "syringe_kit"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
+	illustration = "light"
 
 /obj/item/storage/box/lights/Initialize(mapload)
 	. = ..()
@@ -174,7 +173,7 @@
 		/obj/item/stock_parts/manipulator = 1,
 		/obj/item/stock_parts/matter_bin = 2,
 		/obj/item/wrench = 1,
-		)
+	)
 	generate_items_inside(items_inside,src)
 
 /obj/item/storage/box/actionfigure

code/game/objects/items/storage/lockbox.dm

@@ -88,6 +88,7 @@
 /obj/item/storage/lockbox/medal
 	name = "medal box"
 	desc = "A locked box used to store medals of honor."
+	icon = 'icons/obj/storage/case.dmi'
 	icon_state = "medalbox+l"
 	inhand_icon_state = "syringe_kit"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
@@ -213,7 +214,7 @@
 /obj/item/storage/lockbox/order
 	name = "order lockbox"
 	desc = "A box used to secure small cargo orders from being looted by those who didn't order it. Yeah, cargo tech, that means you."
-	icon = 'icons/obj/storage/storage.dmi'
+	icon = 'icons/obj/storage/case.dmi'
 	icon_state = "secure"
 	icon_broken = "secure+b"
 	inhand_icon_state = "sec-case"

code/game/objects/items/storage/medkit.dm

@@ -11,6 +11,7 @@
 /obj/item/storage/medkit
 	name = "medkit"
 	desc = "It's an emergency medical kit for those serious boo-boos."
+	icon = 'icons/obj/storage/medkit.dmi'
 	icon_state = "medkit"
 	inhand_icon_state = "medkit"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
@@ -36,7 +37,8 @@
 		/obj/item/stack/medical/splint = 1, //SKYRAT EDIT ADDITION - MEDICAL
 		/obj/item/stack/medical/suture = 2,
 		/obj/item/stack/medical/mesh = 2,
-		/obj/item/reagent_containers/hypospray/medipen = 1)
+		/obj/item/reagent_containers/hypospray/medipen = 1,
+	)
 	generate_items_inside(items_inside,src)
 
 /obj/item/storage/medkit/emergency
@@ -54,7 +56,8 @@
 		/obj/item/stack/medical/suture/emergency = 1,
 		/obj/item/stack/medical/ointment = 1,
 		/obj/item/reagent_containers/hypospray/medipen/ekit = 2,
-		/obj/item/storage/pill_bottle/iron = 1)
+		/obj/item/storage/pill_bottle/iron = 1,
+	)
 	generate_items_inside(items_inside,src)
 
 /obj/item/storage/medkit/surgery
@@ -117,8 +120,8 @@
 		/obj/item/implanter,
 		/obj/item/pinpointer/crew,
 		/obj/item/holosign_creator/medical,
-		/obj/item/stack/sticky_tape //surgical tape
-		))
+		/obj/item/stack/sticky_tape, //surgical tape
+	))
 
 /obj/item/storage/medkit/surgery/PopulateContents()
 	if(empty)
@@ -133,7 +136,8 @@
 		/obj/item/surgical_drapes = 1,
 		/obj/item/scalpel = 1,
 		/obj/item/hemostat = 1,
-		/obj/item/cautery = 1)
+		/obj/item/cautery = 1,
+	)
 	generate_items_inside(items_inside,src)
 
 /obj/item/storage/medkit/ancient
@@ -557,6 +561,7 @@
 /obj/item/storage/organbox
 	name = "organ transport box"
 	desc = "An advanced box with an cooling mechanism that uses cryostylane or other cold reagents to keep the organs or bodyparts inside preserved."
+	icon = 'icons/obj/storage/case.dmi'
 	icon_state = "organbox"
 	base_icon_state = "organbox"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'

code/game/objects/items/storage/secure.dm

@@ -12,13 +12,6 @@
 	name = "secstorage"
 	desc = "This shouldn't exist. If it does, create an issue report."
 	w_class = WEIGHT_CLASS_NORMAL
-
-	/// icon_state of locked safe
-	var/icon_locking = "secureb"
-	/// icon_state of sparking safe
-	var/icon_sparking = "securespark"
-	/// icon_state of opened safe
-	var/icon_opened = "secure0"
 	/// The code entered by the user
 	var/entered_code
 	/// The code that will open this safe
@@ -32,17 +25,26 @@
 	/// Is this door hackable?
 	var/can_hack_open = TRUE
 
-
 /obj/item/storage/secure/Initialize(mapload)
 	. = ..()
 	atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
 	atom_storage.max_total_storage = 14
+	update_appearance()
 
 /obj/item/storage/secure/examine(mob/user)
 	. = ..()
 	if(can_hack_open)
 		. += "The service panel is currently <b>[panel_open ? "unscrewed" : "screwed shut"]</b>."
 
+/obj/item/storage/secure/update_icon()
+	..()
+	if(!atom_storage)
+		return
+	if(atom_storage.locked)
+		icon_state = "[initial(icon_state)]_locked"
+	else
+		icon_state = "[initial(icon_state)]"
+
 /obj/item/storage/secure/tool_act(mob/living/user, obj/item/tool)
 	if(can_hack_open && atom_storage.locked)
 		return ..()
@@ -64,7 +66,7 @@
 	if(lock_hacking)
 		balloon_alert(user, "already hacking!")
 		return
-	if(panel_open == TRUE)
+	if(panel_open)
 		balloon_alert(user, "hacking...")
 		lock_hacking = TRUE
 		if (tool.use_tool(src, user, 400))
@@ -81,7 +83,7 @@
 	user.set_machine(src)
 	var/dat = text("<TT><B>[]</B><BR>\n\nLock Status: []",src, (locked ? "LOCKED" : "UNLOCKED"))
 	var/message = "Code"
-	if (lock_set == 0)
+	if (!lock_set)
 		dat += text("<p>\n<b>5-DIGIT PASSCODE NOT SET.<br>ENTER NEW PASSCODE.</b>")
 	message = text("[]", entered_code)
 	if (!locked)
@@ -100,15 +102,14 @@
 				lock_set = TRUE
 			else if ((entered_code == lock_code) && lock_set)
 				atom_storage.locked = FALSE
-				cut_overlays()
-				add_overlay(icon_opened)
+				update_appearance()
 				entered_code = null
 			else
 				entered_code = "ERROR"
 		else
 			if (href_list["type"] == "R")
 				atom_storage.locked = TRUE
-				cut_overlays()
+				update_appearance()
 				entered_code = null
 				atom_storage.hide_contents(usr)
 			else
@@ -125,7 +126,7 @@
 ///Secure Briefcase
 /obj/item/storage/secure/briefcase
 	name = "secure briefcase"
-	icon = 'icons/obj/storage/storage.dmi'
+	icon = 'icons/obj/storage/case.dmi'
 	icon_state = "secure"
 	inhand_icon_state = "sec-case"
 	lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
@@ -161,10 +162,7 @@
 /obj/item/storage/secure/safe
 	name = "secure safe"
 	icon = 'icons/obj/storage/storage.dmi'
-	icon_state = "safe"
-	icon_opened = "safe0"
-	icon_locking = "safeb"
-	icon_sparking = "safespark"
+	icon_state = "wall_safe"
 	desc = "Excellent for securing things away from grubby hands."
 	w_class = WEIGHT_CLASS_GIGANTIC
 	anchored = TRUE
@@ -213,10 +211,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/storage/secure/safe/caps_spare, 32)
 
 /obj/item/storage/secure/safe/caps_spare/Initialize(mapload)
 	. = ..()
-
 	lock_code = SSid_access.spare_id_safe_code
 	lock_set = TRUE
 	atom_storage.locked = TRUE
+	update_appearance()
 
 /obj/item/storage/secure/safe/caps_spare/PopulateContents()
 	new /obj/item/card/id/advanced/gold/captains_spare(src)

code/game/objects/items/storage/toolbox.dm

@@ -1,7 +1,7 @@
 /obj/item/storage/toolbox
 	name = "toolbox"
 	desc = "Danger. Very robust."
-	icon = 'icons/obj/storage/storage.dmi'
+	icon = 'icons/obj/storage/toolbox.dmi'
 	icon_state = "toolbox_default"
 	inhand_icon_state = "toolbox_default"
 	lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'

code/game/objects/items/toys.dm

@@ -507,7 +507,7 @@
 /obj/item/toy/windup_toolbox
 	name = "windup toolbox"
 	desc = "A replica toolbox that rumbles when you turn the key."
-	icon = 'icons/obj/storage/storage.dmi'
+	icon = 'icons/obj/storage/toolbox.dmi'
 	icon_state = "green"
 	inhand_icon_state = "artistic_toolbox"
 	lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'

code/game/objects/structures/railings.dm

@@ -1,7 +1,7 @@
 /obj/structure/railing
 	name = "railing"
 	desc = "Basic railing meant to protect idiots like you from falling."
-	icon = 'icons/obj/fluff.dmi'
+	icon = 'icons/obj/railings.dmi'
 	icon_state = "railing"
 	flags_1 = ON_BORDER_1
 	density = TRUE

code/game/objects/structures/training_machine.dm

@@ -344,7 +344,7 @@
 /obj/item/training_toolbox
 	name = "Training Toolbox"
 	desc = "AURUMILL-Brand Baby's First Training Toolbox. A digital display on the back keeps track of hits made by the user. Second toolbox sold separately!"
-	icon = 'icons/obj/storage/storage.dmi'
+	icon = 'icons/obj/storage/toolbox.dmi'
 	icon_state = "gold"
 	inhand_icon_state = "toolbox_gold"
 	lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'

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/storage.dmi', "bible")
+	var/mutable_appearance/cross = mutable_appearance('icons/obj/storage/book.dmi', "bible")
 	var/font_color = "purple"
 	var/prayer_type = "PRAYER"
 	var/deity

code/modules/antagonists/wizard/equipment/soulstone.dm

@@ -257,7 +257,7 @@
 	occupant.death()
 
 	target_toolbox.name = "soulful toolbox"
-	target_toolbox.icon = 'icons/obj/storage/storage.dmi'
+	target_toolbox.icon = 'icons/obj/storage/toolbox.dmi'
 	target_toolbox.icon_state = "toolbox_blue_old"
 	target_toolbox.has_soul = TRUE
 	target_toolbox.has_latches = FALSE

code/modules/mining/voucher_sets.dm

@@ -71,7 +71,7 @@
 /datum/voucher_set/conscription_kit
 	name = "Mining Conscription Kit"
 	description = "Contains a whole new mining starter kit for one crewmember, consisting of a proto-kinetic accelerator, a survival knife, a seclite, an explorer's suit, a mesons, an automatic mining scanner, a mining satchel, a gas mask, a mining radio key and a special ID card with a basic mining access."
-	icon = 'icons/obj/storage/storage.dmi'
+	icon = 'icons/obj/storage/backpack.dmi'
 	icon_state = "duffel-explorer"
 	set_items = list(
 		/obj/item/storage/backpack/duffelbag/mining_conscript,

code/modules/paperwork/ticketmachine.dm

@@ -151,29 +151,27 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/ticket_machine, 32)
 
 /obj/machinery/ticket_machine/update_icon_state()
 	switch(ticket_number) //Gives you an idea of how many tickets are left
-		if(0 to 49)
-			icon_state = "[base_icon_state]_100"
-		if(50 to 99)
-			icon_state = "[base_icon_state]_50"
+		if(0 to 99)
+			icon_state = "[base_icon_state]"
 		if(100)
-			icon_state = "[base_icon_state]_0"
+			icon_state = "[base_icon_state]_empty"
 	return ..()
 
 /obj/machinery/ticket_machine/proc/handle_maptext()
 	switch(current_number) //This is here to handle maptext offsets so that the numbers align.
 		if(0 to 9)
-			maptext_x = 13
+			maptext_x = 9
 		if(10 to 99)
-			maptext_x = 10
+			maptext_x = 6
 		if(100)
-			maptext_x = 8
+			maptext_x = 4
 	maptext = MAPTEXT(current_number) //Finally, apply the maptext
 
 /obj/machinery/ticket_machine/attackby(obj/item/I, mob/user, params)
 	..()
 	if(istype(I, /obj/item/hand_labeler_refill))
 		if(!(ticket_number >= max_number))
-			to_chat(user, span_notice("[src] refuses [I]! There [max_number-ticket_number==1 ? "is" : "are"] still [max_number-ticket_number] ticket\s left!"))
+			to_chat(user, span_notice("[src] refuses [I]! There [max_number - ticket_number == 1 ? "is" : "are"] still [max_number - ticket_number] ticket\s left!"))
 			return
 		to_chat(user, span_notice("You start to refill [src]'s ticket holder (doing this will reset its ticket count!)."))
 		if(do_after(user, 30, target = src))

code/modules/shuttle/emergency.dm

@@ -674,9 +674,15 @@
 	anchored = TRUE
 	density = FALSE
 	icon = 'icons/obj/storage/storage.dmi'
-	icon_state = "safe"
+	icon_state = "wall_safe_locked"
 	var/unlocked = FALSE
 
+/obj/item/storage/pod/update_icon()
+	. = ..()
+	icon_state = "wall_safe[unlocked ? "" : "_locked"]"
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/item/storage/pod, 32)
+
 /obj/item/storage/pod/PopulateContents()
 	new /obj/item/clothing/head/helmet/space/orange(src)
 	new /obj/item/clothing/head/helmet/space/orange(src)

code/modules/shuttle/on_move.dm

@@ -295,6 +295,7 @@ All ShuttleMove procs go here
 	// the station as it is loaded in.
 	if (oldT && !is_reserved_level(oldT.z))
 		unlocked = TRUE
+		update_appearance()
 
 /************************************Mob move procs************************************/
 

code/modules/vending/medical_wall.dm

@@ -3,7 +3,7 @@
 	desc = "Wall-mounted Medical Equipment dispenser."
 	icon_state = "wallmed"
 	icon_deny = "wallmed-deny"
-	panel_type = "panel-wall"
+	panel_type = "wallmed-panel"
 	density = FALSE
 	products = list(
 		/obj/item/reagent_containers/syringe = 3,

modular_skyrat/modules/aesthetics/storage/storage.dm

@@ -94,37 +94,3 @@
 
 /obj/item/storage/box/cyber_implants
 	illustration = null //Included in the sprite
-
-//Unchanged from TG:
-/obj/item/storage/box/monkeycubes
-	icon = 'icons/obj/storage/storage.dmi'
-
-/obj/item/storage/box/gum
-	icon = 'icons/obj/storage/storage.dmi'
-
-/obj/item/storage/box/donkpockets
-	icon = 'icons/obj/storage/storage.dmi'
-
-/obj/item/storage/box/papersack
-	icon = 'icons/obj/storage/storage.dmi'
-
-/obj/item/storage/box/mothic_rations
-	icon = 'icons/obj/storage/storage.dmi'
-
-/obj/item/storage/box/mothic_goods
-	icon = 'icons/obj/storage/storage.dmi'
-
-/obj/item/storage/box/mothic_cans_sauces
-	icon = 'icons/obj/storage/storage.dmi'
-
-/obj/item/storage/box/mothic_rations
-	icon = 'icons/obj/storage/storage.dmi'
-
-/obj/item/storage/box/tiziran_goods
-	icon = 'icons/obj/storage/storage.dmi'
-
-/obj/item/storage/box/tiziran_cans
-	icon = 'icons/obj/storage/storage.dmi'
-
-/obj/item/storage/box/tiziran_meats
-	icon = 'icons/obj/storage/storage.dmi'

modular_skyrat/modules/medical/code/anesthetic_machine.dm

@@ -200,7 +200,7 @@
 	name = "anesthetic stand parts kit"
 	desc = "Contains all of the parts needed to assemble a portable anesthetic stand. Use in hand to construct."
 	w_class = WEIGHT_CLASS_BULKY
-	icon = 'icons/obj/storage/storage.dmi'
+	icon = 'icons/obj/storage/box.dmi'
 	icon_state = "plasticbox"
 
 /obj/item/anesthetic_machine_kit/attack_self(mob/user)