Merge pull request #8761 from Cerebulon/briefcases

A Short Investigation

code/game/objects/items/weapons/storage/briefcase.dm

@@ -1,6 +1,6 @@
 /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."
+	name = "brown briefcase"
+	desc = "It's made of AUTHENTIC faux-leather. Its owner must be a real professional."
 	icon_state = "briefcase"
 	force = 8.0
 	throw_speed = 1
@@ -12,9 +12,29 @@
 	drop_sound = 'sound/items/drop/backpack.ogg'
 	pickup_sound = 'sound/items/pickup/backpack.ogg'
 
+/obj/item/storage/briefcase/standard/black
+	name = "black briefcase"
+	icon_state = "briefcase_black"
+
+/obj/item/storage/briefcase/standard/nt
+	name = "branded briefcase"
+	desc = "It's made of AUTHENTIC faux-leather and printed with the NanoTrasen logo. Its owner must be a real executive."
+	icon_state = "briefcase_nt"
+
+
+/obj/item/storage/briefcase/standard/alum
+	name = "aluminium briefcase"
+	desc = "It's made of lightweight but sturdy metal. Its owner might be a real professional of a different kind."
+	icon_state = "briefcase_alum"
+
+/obj/item/storage/briefcase/standard/alum/Initialize()
+	if(prob(50))
+		name = "aluminum briefcase"
+	. = ..()
+
 /obj/item/storage/briefcase/clutch
 	name = "clutch purse"
-	desc = "A fashionable handheld bag typically used by women."
+	desc = "A fashionable handheld bag."
 	icon_state = "clutch"
 	item_state_slots = list(slot_r_hand_str = "smpurse", slot_l_hand_str = "smpurse")
 	force = 0
@@ -29,4 +49,4 @@
 	force = 4.0
 	w_class = ITEMSIZE_LARGE
 	max_w_class = ITEMSIZE_NORMAL
-	max_storage_space = ITEMSIZE_COST_NORMAL * 4
+	max_storage_space = ITEMSIZE_COST_NORMAL * 4

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

@@ -90,7 +90,12 @@
 
 /obj/item/storage/lockbox/medal
 	name = "lockbox of medals"
-	desc = "A lockbox filled with commemorative medals, it has the NanoTrasen logo stamped on it."
+	desc = "A tasteful wooden lockbox filled with commemorative medals."
+	icon_state = "medalbox+l"
+	icon_locked = "medalbox+l"
+	icon_closed = "medalbox"
+	icon_broken = "medalbox+b"
+	item_state_slots = list(slot_r_hand_str = "briefcase", slot_l_hand_str = "briefcase")
 	req_access = list(access_heads)
 	storage_slots = 7
 	starts_with = list(

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

@@ -85,11 +85,11 @@
 	tgui_interact(user)
 
 /obj/item/storage/secure/tgui_interact(mob/user, datum/tgui/ui = null)
-	ui = SStgui.try_update_ui(user, src, ui)	
+	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
 		ui = new(user, src, "SecureSafe", name)
 		ui.open()
-		
+
 /obj/item/storage/secure/tgui_data(mob/user)
 	var/list/data = list()
 	data["locked"] = locked
@@ -148,7 +148,6 @@
 	name = "secure briefcase"
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "secure"
-	item_state_slots = list(slot_r_hand_str = "case", slot_l_hand_str = "case")
 	desc = "A large briefcase with a digital locking system."
 	force = 8.0
 	throw_speed = 1