Fixed ERT Update (#1266)

Credits for content go to Serveris. All I did was fix it up for the baymerge and got it working in-game (Yes I know zipties don't stack. I couldn't figure it out. Maybe latter.)

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

@@ -330,11 +330,13 @@ var/const/NO_EMAG_ACT = -50
 
 /obj/item/weapon/card/id/centcom/ERT
 	name = "\improper Emergency Response Team ID"
+	icon_state = "centcom"
 	assignment = "Emergency Response Team"
 
-/obj/item/weapon/card/id/centcom/ERT/New()
+/obj/item/weapon/card/id/ERT/New()
 	..()
-	access |= get_all_station_access()
+	access = get_all_accesses() + get_centcom_access("Emergency Response Team")
+	
 
 /obj/item/weapon/card/id/all_access
 	name = "\improper Administrator's spare ID"

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -259,6 +259,29 @@
 		beakers += B2
 		icon_state = "grenade"
 
+/obj/item/weapon/grenade/chem_grenade/gas
+	name = "NT. 53 'Sandman' grenade"
+	desc = "Used for pacifying rooms full of people with less-than-lethal force. It warns against use on people with lung defects."
+	path = 1
+	stage = 2
+
+	New()
+		..()
+		var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
+		var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
+
+		B1.reagents.add_reagent("sugar", 20)
+		B1.reagents.add_reagent("potassium",20)
+		B1.reagents.add_reagent("stoxin", 10)
+		B1.reagents.add_reagent("anti_toxin", 10)
+		B2.reagents.add_reagent("chloralhydrate",40)
+		B2.reagents.add_reagent("phosphorus",20)
+
+		detonator = new/obj/item/device/assembly_holder/timer_igniter(src)
+
+		beakers += B1
+		beakers += B2
+		icon_state = initial(icon_state) +"_locked"
 /obj/item/weapon/grenade/chem_grenade/cleaner
 	name = "cleaner grenade"
 	desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."

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

@@ -64,7 +64,7 @@
 
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	user.do_attack_animation(H)
-	
+
 	user.visible_message("<span class='danger'>\The [user] has put [cuff_type] on \the [H]!</span>")
 	target.drop_r_hand()
 	target.drop_l_hand()
@@ -159,4 +159,12 @@ var/last_chew = 0
 	item_state = null
 	icon = 'icons/obj/bureaucracy.dmi'
 	breakouttime = 200
-	cuff_type = "duct tape"
+	cuff_type = "duct tape"
+
+/obj/item/weapon/handcuffs/ziptie
+	name = "ziptie"
+	desc = " A sturdy and reliable plastic ziptie for binding the wrists."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "ziptie"
+	breakouttime = 600
+	cuff_sound = 'sound/weapons/cablecuff.ogg'

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

@@ -156,6 +156,47 @@
 		set_light(1.5, 1.5, "#006AFF")
 	else
 		set_light(0)
+// tact
+/obj/item/weapon/shield/riot/tact
+	name = "tactical shield"
+	desc = "A highly advanced ballistic shield crafted from durable materials and plated ablative panels. Can be collapsed for mobility."
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "tactshield0"
+	force = 3.0
+	throwforce = 3.0
+	throw_speed = 3
+	throw_range = 4
+	w_class = 2
+	attack_verb = list("shoved", "bashed")
+	var/active = 0
+
+/obj/item/weapon/shield/riot/tact/attack_self(mob/living/user)
+	active = !active
+	icon_state = "tactshield[active]"
+	playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
+
+	if(active)
+		force = 15
+		throwforce = 5
+		throw_speed = 2
+		w_class = 4
+		slot_flags = SLOT_BACK
+		user << "<span class='notice'>You extend \the [src] downward with a sharp snap of your wrist.</span>"
+	else
+		force = 3
+		throwforce = 3
+		throw_speed = 3
+		w_class = 2
+		slot_flags = 0
+		user << "<span class='notice'>The [src] folds inwards neatly as you snap your wrist upwards and push it back into the frame.</span>"
+
+	if(istype(user,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = user
+		H.update_inv_l_hand()
+		H.update_inv_r_hand()
+
+	add_fingerprint(user)
+	return
 
 /obj/item/weapon/cloaking_device
 	name = "cloaking device"