Merge pull request #3056 from Citadel-Station-13/upstream-merge-31130

[MIRROR] Adds the Cargo-Tech-of-the-Shift award

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

@@ -177,6 +177,14 @@
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/accessory/medal/silver/security(src)
 
+/obj/item/storage/lockbox/medal/cargo
+	name = "cargo award box"
+	desc = "A locked box used to store awards to be given to members of the cargo department."
+	req_access = list(ACCESS_QM)
+
+/obj/item/storage/lockbox/medal/cargo/PopulateContents()
+		new /obj/item/clothing/accessory/medal/ribbon/cargo(src)
+
 /obj/item/storage/lockbox/medal/sci
 	name = "science medal box"
 	desc = "A locked box used to store medals to be given to members of the science department."

code/game/objects/structures/crates_lockers/closets/secure/cargo.dm

@@ -1,19 +1,20 @@
-/obj/structure/closet/secure_closet/quartermaster
-	name = "\proper quartermaster's locker"
+/obj/structure/closet/secure_closet/quartermaster
+	name = "\proper quartermaster's locker"
 	req_access = list(ACCESS_QM)
-	icon_state = "qm"
-
-/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
-	..()
-	new /obj/item/clothing/neck/cloak/qm(src)
-	new /obj/item/clothing/under/rank/cargo(src)
-	new /obj/item/clothing/shoes/sneakers/brown(src)
-	new /obj/item/device/radio/headset/headset_cargo(src)
-	new /obj/item/clothing/suit/fire/firefighter(src)
-	new /obj/item/clothing/gloves/fingerless(src)
-	new /obj/item/device/megaphone/cargo(src)
-	new /obj/item/tank/internals/emergency_oxygen(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/clothing/head/soft(src)
-	new /obj/item/device/export_scanner(src)
-	new /obj/item/door_remote/quartermaster(src)
+	icon_state = "qm"
+
+/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
+	..()
+	new /obj/item/clothing/neck/cloak/qm(src)
+	new /obj/item/storage/lockbox/medal/cargo/(src)
+	new /obj/item/clothing/under/rank/cargo(src)
+	new /obj/item/clothing/shoes/sneakers/brown(src)
+	new /obj/item/device/radio/headset/headset_cargo(src)
+	new /obj/item/clothing/suit/fire/firefighter(src)
+	new /obj/item/clothing/gloves/fingerless(src)
+	new /obj/item/device/megaphone/cargo(src)
+	new /obj/item/tank/internals/emergency_oxygen(src)
+	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/head/soft(src)
+	new /obj/item/device/export_scanner(src)
+	new /obj/item/door_remote/quartermaster(src)

code/modules/clothing/under/accessories.dm

@@ -151,6 +151,16 @@
 	desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty."
 	icon_state = "bronze_heart"
 
+/obj/item/clothing/accessory/medal/ribbon
+	name = "ribbon"
+	desc = "A ribbon"
+	icon_state = "cargo"
+	item_color = "cargo"
+
+/obj/item/clothing/accessory/medal/ribbon/cargo
+	name = "\"cargo tech of the shift\" award"
+	desc = "An award bestowed only upon those cargotechs who have exhibited devotion to their duty in keeping with the highest traditions of Cargonia."
+
 /obj/item/clothing/accessory/medal/silver
 	name = "silver medal"
 	desc = "A silver medal."