Merge remote-tracking branch 'upstream/master'

code/defines/obj/storage.dm

@@ -60,6 +60,12 @@
 
 /obj/item/weapon/storage/box/syndicate
 
+/obj/item/weapon/storage/box/ert
+	name = "medical box"
+	desc = "Full of goodness."
+	icon_state = "implant"
+	item_state = "syringe_kit"
+
 /obj/item/weapon/storage/pillbottlebox
 	name = "pill bottles"
 	desc = "A box of pill bottles."
@@ -82,6 +88,17 @@
 	desc = "The backpack used to keep with the sterile environment."
 	icon_state = "medicalpack"
 
+/obj/item/weapon/storage/backpack/medic/full
+//Spawns with 2 boxes of ERT gear, a box of ERT gear and a hypo, and a box of anesthetic.
+	New()
+		..()
+		new /obj/item/weapon/reagent_containers/hypospray/ert(src)
+		for(var/i = 1, i <=2, i++)
+			new /obj/item/weapon/storage/box/ert(src)
+		new /obj/item/weapon/storage/box/medic(src)
+		new /obj/item/weapon/storage/belt/medical(src)
+		return
+
 /obj/item/weapon/storage/backpack/security
 	name = "security backpack"
 	desc = "A very robust backpack."

code/defines/obj/weapon.dm

@@ -105,6 +105,11 @@
 	origin_tech = "materials=2"
 	m_amt = 30000
 	g_amt = 15000
+	var/ammo = 10
+
+/obj/item/weapon/rcd_ammo/large
+	name = "Super compressed matter cartridge"
+	ammo = 30
 
 /obj/item/weapon/spacecash
 	name = "Space Cash"