Merge pull request #406 from SamCroswell/master

ERT Rework

code/game/objects/items/weapons/RCD.dm

@@ -21,6 +21,7 @@ RCD
 	m_amt = 100000
 	origin_tech = "engineering=4;materials=2"
 	var/datum/effect/effect/system/spark_spread/spark_system
+	var/max_matter = 100
 	var/matter = 0
 	var/working = 0
 	var/mode = 1
@@ -39,15 +40,16 @@ RCD
 	attackby(obj/item/weapon/W, mob/user, params)
 		..()
 		if(istype(W, /obj/item/weapon/rcd_ammo))
-			if((matter + 20) > 100)
+			var/obj/item/weapon/rcd_ammo/R = W
+			if((matter + R.ammoamt) > max_matter)
 				user << "<span class='notice'>The RCD cant hold any more matter-units.</span>"
 				return
 			user.drop_item()
 			del(W)
-			matter += 20
+			matter += R.ammoamt
 			playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
-			user << "<span class='notice'>The RCD now holds [matter]/100 matter-units.</span>"
-			desc = "A RCD. It currently holds [matter]/100 matter-units."
+			user << "<span class='notice'>The RCD now holds [matter]/[max_matter] matter-units.</span>"
+			desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
 			return
 
 
@@ -186,6 +188,12 @@ RCD
 	desc = "A device used to rapidly build and deconstruct walls and floors."
 	canRwall = 1
 
+/obj/item/weapon/rcd/combat
+	name = "combat RCD"
+	max_matter = 500
+	matter = 500
+	canRwall = 1
+
 /obj/item/weapon/rcd_ammo
 	name = "compressed matter cartridge"
 	desc = "Highly compressed matter for the RCD."
@@ -197,4 +205,8 @@ RCD
 	anchored = 0.0
 	origin_tech = "materials=2"
 	m_amt = 16000
-	g_amt = 8000
+	g_amt = 8000
+	var/ammoamt = 20
+
+/obj/item/weapon/rcd_ammo/large
+	ammoamt = 100

code/game/objects/items/weapons/power_cells.dm

@@ -120,6 +120,14 @@
 	m_amt = 0
 	g_amt = 0
 
+/obj/item/weapon/stock_parts/cell/pulse/carbine
+	name = "pulse carbine power cell"
+	maxcharge = 4000
+
+/obj/item/weapon/stock_parts/cell/pulse/pistol
+	name = "pulse pistol power cell"
+	maxcharge = 1600
+
 /obj/item/weapon/stock_parts/cell/emproof
 	name = "\improper EMP-proof cell"
 	desc = "An EMP-proof cell."
@@ -134,4 +142,4 @@
 	return
 
 /obj/item/weapon/stock_parts/cell/emproof/corrupt()
-	return
+	return

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

@@ -59,6 +59,9 @@
 	new /obj/item/weapon/wirecutters(src)
 	new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
 
+/obj/item/weapon/storage/belt/utility/full/response_team/New()
+	..()
+	new /obj/item/device/multitool(src)
 
 /obj/item/weapon/storage/belt/utility/atmostech/New()
 	..()
@@ -128,6 +131,13 @@
 	..()
 	new /obj/item/device/flashlight/seclite(src)
 
+/obj/item/weapon/storage/belt/security/response_team/New()
+	..()
+	new /obj/item/weapon/grenade/flashbang(src)
+	new /obj/item/weapon/grenade/flashbang(src)
+	new /obj/item/weapon/melee/telebaton(src)
+	new /obj/item/weapon/restraints/handcuffs(src)
+
 /obj/item/weapon/storage/belt/soulstone
 	name = "soul stone belt"
 	desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"

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

@@ -77,6 +77,17 @@
 		new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
 		return
 
+/obj/item/weapon/storage/box/response_team
+	New()
+		..()
+		contents = list()
+		sleep(1)
+		new /obj/item/clothing/mask/breath( src )
+		new /obj/item/weapon/tank/emergency_oxygen/double/full( src )
+		new /obj/item/clothing/glasses/night( src )
+		new /obj/item/weapon/kitchenknife/combat( src ) // SURVIVAL KNIFE, FOR CARVING A BOW OUT OF THE BONES OF ASSISTANTS AFTER YOU CRASH-LAND ON THE STATION.
+		new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
+		return
 
 /obj/item/weapon/storage/box/gloves
 	name = "box of latex gloves"
@@ -480,7 +491,7 @@
 		new /obj/item/weapon/restraints/handcuffs(src)
 		new /obj/item/weapon/restraints/handcuffs(src)
 		new /obj/item/weapon/restraints/handcuffs(src)
-		
+
 /obj/item/weapon/storage/box/zipties
 	name = "box of spare zipties"
 	desc = "A box full of zipties."