Merge pull request #7799 from R3dtail/new_carpet

Added Another new carpet, and two tables, a new cargo crate, and two new medals.

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -111,12 +111,20 @@
 /obj/item/stack/tile/carpet/black/fifty
 	amount = 50
 
-/obj/item/stack/tile/carpet/red
+/obj/item/stack/tile/carpet/blackred
     name = "red carpet"
-    icon_state = "tile-carpet-red"
-    turf_type = /turf/open/floor/carpet/red
+    icon_state = "tile-carpet-blackred"
+    turf_type = /turf/open/floor/carpet/blackred
 
-/obj/item/stack/tile/carpet/red/fifty
+/obj/item/stack/tile/carpet/blackred/fifty
+    amount = 50
+
+/obj/item/stack/tile/carpet/monochrome
+    name = "monochrome carpet"
+    icon_state = "tile-carpet-monochrome"
+    turf_type = /turf/open/floor/carpet/monochrome
+
+/obj/item/stack/tile/carpet/monochrome/fifty
     amount = 50
 
 /obj/item/stack/tile/fakespace

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

@@ -178,3 +178,21 @@
 /obj/item/storage/lockbox/medal/sci/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/accessory/medal/plasma/nobel_science(src)
+
+/obj/item/storage/lockbox/medal/engineering
+	name	=	"engineering medal box"
+	desc	=	"A locked box used to store medals to be given to the members of the engineering department."
+	req_access	=	list(ACCESS_CE)
+
+/obj/item/storage/lockbox/medal/engineering/PopulateContents()
+	for(var/i	in	1	to	3)
+		new	/obj/item/clothing/accessory/medal/engineer(src)
+
+/obj/item/storage/lockbox/medal/medical
+	name	=	"medical medal box"
+	desc	=	"A locked box used to store medals to be given to the members of the medical department."
+	req_access	=	list(ACCESS_CMO)
+
+/obj/item/storage/lockbox/medal/medical/PopulateContents()
+	for(var/i	in	1	to	3)
+		new	/obj/item/clothing/accessory/medal/ribbon/medical_doctor(src)