game folder

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

@@ -6,29 +6,33 @@
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
-	storage_slots = 4
 	req_access = list(ACCESS_ARMORY)
-	var/locked = TRUE
 	var/broken = FALSE
 	var/open = FALSE
 	var/icon_locked = "lockbox+l"
 	var/icon_closed = "lockbox"
 	var/icon_broken = "lockbox+b"
 
+/obj/item/storage/lockbox/ComponentInitialize()
+	. = ..()
+	GET_COMPONENT(STR, /datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_NORMAL
+	STR.max_combined_w_class = 14
+	STR.max_items = 4
 
 /obj/item/storage/lockbox/attackby(obj/item/W, mob/user, params)
+	var/locked = SendSignal(COMSIG_IS_STORAGE_LOCKED)
 	if(W.GetID())
 		if(broken)
 			to_chat(user, "<span class='danger'>It appears to be broken.</span>")
 			return
 		if(allowed(user))
-			locked = !locked
+			SendSignal(COMSIG_TRY_STORAGE_SET_LOCKSTATE, !locked)
+			locked = SendSignal(COMSIG_IS_STORAGE_LOCKED)
 			if(locked)
 				icon_state = icon_locked
 				to_chat(user, "<span class='danger'>You lock the [src.name]!</span>")
-				close_all()
+				SendSignal(COMSIG_TRY_STORAGE_HIDE_ALL)
 				return
 			else
 				icon_state = icon_closed
@@ -42,51 +46,25 @@
 	else
 		to_chat(user, "<span class='danger'>It's locked!</span>")
 
-/obj/item/storage/lockbox/MouseDrop(over_object, src_location, over_location)
-	if (locked)
-		src.add_fingerprint(usr)
-		to_chat(usr, "<span class='warning'>It's locked!</span>")
-		return 0
-	..()
-
 /obj/item/storage/lockbox/emag_act(mob/user)
 	if(!broken)
 		broken = TRUE
-		locked = FALSE
+		SendSignal(COMSIG_TRY_STORAGE_SET_LOCKSTATE, FALSE)
 		desc += "It appears to be broken."
 		icon_state = src.icon_broken
 		if(user)
 			visible_message("<span class='warning'>\The [src] has been broken by [user] with an electromagnetic card!</span>")
 			return
 
-/obj/item/storage/lockbox/show_to(mob/user)
-	if(locked)
-		to_chat(user, "<span class='warning'>It's locked!</span>")
-	else
-		..()
-	return
-
-//Check the destination item type for contentto.
-/obj/item/storage/lockbox/storage_contents_dump_act(obj/item/storage/src_object, mob/user)
-	if(locked)
-		to_chat(user, "<span class='warning'>It's locked!</span>")
-		return null
-	open = TRUE
-	return ..()
-
-/obj/item/storage/lockbox/can_be_inserted(obj/item/W, stop_messages = 0)
-	if(locked)
-		return 0
-	return ..()
-
-/obj/item/storage/lockbox/handle_item_insertion(obj/item/W, prevent_warning = 0, mob/user)
+/obj/item/storage/lockbox/Entered()
+	. = ..()
 	open = TRUE
 	update_icon()
-	return ..()
-/obj/item/storage/lockbox/remove_from_storage(obj/item/W, atom/new_location, burn = 0)
+
+/obj/item/storage/lockbox/Exited()
+	. = ..()
 	open = TRUE
 	update_icon()
-	return ..()
 
 /obj/item/storage/lockbox/loyalty
 	name = "lockbox of mindshield implants"
@@ -97,7 +75,6 @@
 		new /obj/item/implantcase/mindshield(src)
 	new /obj/item/implanter/mindshield(src)
 
-
 /obj/item/storage/lockbox/clusterbang
 	name = "lockbox of clusterbangs"
 	desc = "You have a bad feeling about opening this."
@@ -114,23 +91,28 @@
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	w_class = WEIGHT_CLASS_NORMAL
-	max_w_class = WEIGHT_CLASS_SMALL
-	storage_slots = 10
-	max_combined_w_class = 20
 	req_access = list(ACCESS_CAPTAIN)
 	icon_locked = "medalbox+l"
 	icon_closed = "medalbox"
 	icon_broken = "medalbox+b"
-	can_hold = list(/obj/item/clothing/accessory/medal)
+
+/obj/item/storage/lockbox/medal/ComponentInitialize()
+	. = ..()
+	GET_COMPONENT(STR, /datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_SMALL
+	STR.max_items = 10
+	STR.max_combined_w_class = 20
+	STR.can_hold = typecacheof(list(/obj/item/clothing/accessory/medal))
 
 /obj/item/storage/lockbox/medal/examine(mob/user)
 	..()
+	var/locked = SendSignal(COMSIG_IS_STORAGE_LOCKED)
 	if(!locked)
 		to_chat(user, "<span class='notice'>Alt-click to [open ? "close":"open"] it.</span>")
 
 /obj/item/storage/lockbox/medal/AltClick(mob/user)
 	if(user.canUseTopic(src, BE_CLOSE))
-		if(!locked)
+		if(!SendSignal(COMSIG_IS_STORAGE_LOCKED))
 			open = (open ? FALSE : TRUE)
 			update_icon()
 		..()
@@ -148,6 +130,7 @@
 
 /obj/item/storage/lockbox/medal/update_icon()
 	cut_overlays()
+	var/locked = SendSignal(COMSIG_IS_STORAGE_LOCKED)
 	if(locked)
 		icon_state = "medalbox+l"
 		open = FALSE