updates to ERT stuff

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

@@ -103,12 +103,13 @@ RCD
 /obj/item/weapon/rcd/attackby(obj/item/weapon/W, mob/user)
 	..()
 	if(istype(W, /obj/item/weapon/rcd_ammo))
-		if((matter + 20) > max_matter)
+		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()
 		qdel(W)
-		matter += 20
+		matter += R.ammoamt
 		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
 		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."
@@ -265,6 +266,15 @@ RCD
 	desc = "A device used to rapidly build walls/floor."
 	canRwall = 1
 
+/obj/item/weapon/rcd/loaded
+	matter = 100
+
+/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."
@@ -277,3 +287,7 @@ RCD
 	origin_tech = "materials=2"
 	m_amt = 16000
 	g_amt = 8000
+	var/ammoamt = 20
+
+/obj/item/weapon/rcd_ammo/large
+	ammoamt = 100

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

@@ -16,6 +16,7 @@
 	g_amt = 50
 	var/rigged = 0		// true if rigged to explode
 	var/minor_fault = 0 //If not 100% reliable, it will build up faults.
+	var/chargerate = 100 //how much power is given every tick in a recharger
 
 /obj/item/weapon/stock_parts/cell/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.</span>")
@@ -44,15 +45,19 @@
 	..()
 	charge = 0
 
-/obj/item/weapon/stock_parts/cell/emproof/pulse //40 pulse shots
+/obj/item/weapon/stock_parts/cell/pulse //40 pulse shots
 	name = "pulse rifle power cell"
 	maxcharge = 8000
 	rating = 3
+	chargerate = 1500
 
-/obj/item/weapon/stock_parts/cell/emproof/pulse/carbine //25 pulse shots
-	name = "pulse rifle power cell"
+/obj/item/weapon/stock_parts/cell/pulse/carbine //25 pulse shots
+	name = "pulse carbine power cell"
 	maxcharge = 5000
-	rating = 3
+
+/obj/item/weapon/stock_parts/cell/pulse/pistol //10 pulse shots
+	name = "pulse pistol power cell"
+	maxcharge = 2000
 
 /obj/item/weapon/stock_parts/cell/high
 	name = "high-capacity power cell"
@@ -61,6 +66,7 @@
 	maxcharge = 10000
 	g_amt = 60
 	rating = 3
+	chargerate = 1500
 
 /obj/item/weapon/stock_parts/cell/high/empty/New()
 	..()
@@ -73,6 +79,7 @@
 	maxcharge = 20000
 	g_amt = 70
 	rating = 4
+	chargerate = 2000
 
 /obj/item/weapon/stock_parts/cell/super/empty/New()
 	..()
@@ -85,6 +92,7 @@
 	maxcharge = 30000
 	g_amt = 80
 	rating = 5
+	chargerate = 3000
 
 /obj/item/weapon/stock_parts/cell/hyper/empty/New()
 	..()
@@ -97,6 +105,7 @@
 	maxcharge = 30000
 	g_amt = 80
 	rating = 6
+	chargerate = 30000
 	use()
 		return 1
 
@@ -113,16 +122,15 @@
 	minor_fault = 1
 	rating = 1
 
-/obj/item/weapon/stock_parts/cell/slime
+/obj/item/weapon/stock_parts/cell/high/slime
 	name = "charged slime core"
 	desc = "A yellow slime core infused with plasma, it crackles with power."
 	origin_tech = "powerstorage=2;biotech=4"
-	icon = 'icons/mob/slimes.dmi' //'icons/obj/harvest.dmi'
-	icon_state = "yellow slime extract" //"potato_battery"
-	maxcharge = 10000
+	icon = 'icons/mob/slimes.dmi'
+	icon_state = "yellow slime extract"
 	m_amt = 0
 	g_amt = 0
-	rating = 3
+
 
 /obj/item/weapon/stock_parts/cell/emproof
 	name = "\improper EMP-proof cell"

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

@@ -33,6 +33,7 @@
 	new /obj/item/weapon/weldingtool(src)
 	new /obj/item/weapon/crowbar(src)
 	new /obj/item/weapon/wirecutters(src)
+	new /obj/item/device/multitool(src)
 	new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
 
 

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

@@ -0,0 +1,94 @@
+/obj/structure/closet/secure_closet/ertCom
+	name = "commander's closet"
+	desc = "Emergency Response Team equipment locker."
+	req_access = list(access_cent_captain)
+	icon_state = "capsecure1"
+	icon_closed = "capsecure"
+	icon_locked = "capsecure1"
+	icon_opened = "capsecureopen"
+	icon_broken = "capsecurebroken"
+	icon_off = "capsecureoff"
+
+/obj/structure/closet/secure_closet/ertCom/New()
+	..()
+	new /obj/item/weapon/storage/firstaid/regular(src)
+	new /obj/item/weapon/storage/box/handcuffs(src)
+	new /obj/item/device/aicard(src)
+	new /obj/item/weapon/melee/baton/loaded(src)
+	new /obj/item/device/flash/handheld(src)
+	if(prob(50))
+		new /obj/item/ammo_box/magazine/m50(src)
+		new /obj/item/ammo_box/magazine/m50(src)
+		new /obj/item/weapon/gun/projectile/automatic/pistol/deagle(src)
+	else
+		new /obj/item/ammo_box/a357(src)
+		new /obj/item/ammo_box/a357(src)
+		new /obj/item/weapon/gun/projectile/revolver/mateba(src)
+	return
+
+/obj/structure/closet/secure_closet/ertSec
+	name = "security closet"
+	desc = "Emergency Response Team equipment locker."
+	req_access = list(access_cent_specops)
+	icon_state = "hossecure1"
+	icon_closed = "hossecure"
+	icon_locked = "hossecure1"
+	icon_opened = "hossecureopen"
+	icon_broken = "hossecurebroken"
+	icon_off = "hossecureoff"
+
+/obj/structure/closet/secure_closet/ertSec/New()
+	..()
+	new /obj/item/weapon/storage/box/flashbangs(src)
+	new /obj/item/weapon/storage/box/teargas(src)
+	new /obj/item/weapon/storage/box/flashes(src)
+	new /obj/item/weapon/storage/box/handcuffs(src)
+	new /obj/item/weapon/melee/baton/loaded(src)
+	new /obj/item/weapon/shield/riot/tele(src)
+	return
+
+/obj/structure/closet/secure_closet/ertMed
+	name = "medical closet"
+	desc = "Emergency Response Team equipment locker."
+	req_access = list(access_cent_medical)
+	icon_state = "cmosecure1"
+	icon_closed = "cmosecure"
+	icon_locked = "cmosecure1"
+	icon_opened = "cmosecureopen"
+	icon_broken = "cmosecurebroken"
+	icon_off = "cmosecureoff"
+
+/obj/structure/closet/secure_closet/ertMed/New()
+	..()
+	new /obj/item/weapon/storage/firstaid/o2(src)
+	new /obj/item/weapon/storage/firstaid/toxin(src)
+	new /obj/item/weapon/storage/firstaid/fire(src)
+	new /obj/item/weapon/storage/firstaid/brute(src)
+	new /obj/item/weapon/storage/firstaid/regular(src)
+	new /obj/item/weapon/melee/baton/loaded(src)
+	new /obj/machinery/bot/medbot(src)
+	return
+
+/obj/structure/closet/secure_closet/ertEngi
+	name = "engineer closet"
+	desc = "Emergency Response Team equipment locker."
+	req_access = list(access_cent_storage)
+	icon_state = "securece1"
+	icon_closed = "securece"
+	icon_locked = "securece1"
+	icon_opened = "secureceopen"
+	icon_broken = "securecebroken"
+	icon_off = "secureceoff"
+
+/obj/structure/closet/secure_closet/ertEngi/New()
+	..()
+	new /obj/item/stack/sheet/plasteel(src, 50)
+	new /obj/item/stack/sheet/metal(src, 50)
+	new /obj/item/stack/sheet/glass(src, 50)
+	new /obj/item/clothing/shoes/magboots(src)
+	new /obj/item/weapon/storage/box/metalfoam(src)
+	new /obj/item/weapon/melee/baton/loaded(src)
+	new /obj/item/weapon/rcd_ammo/large(src)
+	new /obj/item/weapon/rcd_ammo/large(src)
+	new /obj/item/weapon/rcd_ammo/large(src)
+	return

code/game/objects/structures/crates_lockers/closets/syndicate.dm

@@ -125,4 +125,4 @@
 			var/obj/item/stack/R = new res(src)
 			R.amount = R.max_amount
 
-	return
+	return