Nuke Ops Rework Phase 1

code/game/objects/items/toys.dm

@@ -927,9 +927,9 @@ obj/item/toy/cards/deck/syndicate
 	desc = "A deck of space-grade playing cards. They seem unusually rigid."
 	deckstyle = "syndicate"
 	card_hitsound = 'sound/weapons/bladeslice.ogg'
-	card_force = 15
-	card_throwforce = 15
-	card_throw_speed = 6
+	card_force = 5
+	card_throwforce = 10
+	card_throw_speed = 3
 	card_throw_range = 20
 	card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut")
 
@@ -952,13 +952,18 @@ obj/item/toy/cards/deck/syndicate/black
 
 /obj/item/toy/nuke/attack_self(mob/user)
 	if (cooldown < world.time)
-		cooldown = world.time + 3000 //5 minutes
+		cooldown = world.time + 1800 //3 minutes
 		user.visible_message("<span class='warning'>[user] presses a button on [src]</span>", "<span class='notice'>You activate [src], it plays a loud noise!</span>", "<span class='notice'>You hear the click of a button.</span>")
 		spawn(5) //gia said so
 			icon_state = "nuketoy"
-			playsound(src, 'sound/machines/Alarm.ogg', 100, 0, surround = 0)
+			playsound(src, 'sound/machines/Alarm.ogg', 100, 0, 0)
 			sleep(135)
+			icon_state = "nuketoycool"
+			sleep(cooldown - world.time)
 			icon_state = "nuketoyidle"
+	else
+		var/timeleft = (cooldown - world.time)
+		user << "<span class='alert'>Nothing happens, and '</span>[round(timeleft/10)]<span class='alert'>' appears on a small display.</span>"
 
 
 /obj/item/toy/therapy_red

code/game/objects/items/weapons/implants/implant.dm

@@ -405,7 +405,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 /obj/item/weapon/implant/adrenalin
 	name = "adrenalin"
 	desc = "Removes all stuns and knockdowns."
-	var/uses
+	var/uses = 3
 
 	get_data()
 		var/dat = {"
@@ -414,8 +414,8 @@ the implant may become unstable and either pre-maturely inject the subject or si
 <b>Life:</b> Five days.<BR>
 <b>Important Notes:</b> <font color='red'>Illegal</font><BR>
 <HR>
-<b>Implant Details:</b> Subjects injected with implant can activate a massive injection of adrenalin.<BR>
-<b>Function:</b> Contains nanobots to stimulate body to mass-produce Adrenalin.<BR>
+<b>Implant Details:</b> Subjects injected with implant can activate an injection of medical cocktails.<BR>
+<b>Function:</b> Removes stuns, increases speed, and has a mild healing effect.<BR>
 <b>Special Features:</b> Will prevent and cure most forms of brainwashing.<BR>
 <b>Integrity:</b> Implant can only be used three times before the nanobots are depleted."}
 		return dat
@@ -429,6 +429,12 @@ the implant may become unstable and either pre-maturely inject the subject or si
 			source.SetStunned(0)
 			source.SetWeakened(0)
 			source.SetParalysis(0)
+			source.lying = 0
+			source.update_canmove()
+
+			source.reagents.add_reagent("synaptizine", 10)
+			source.reagents.add_reagent("tricordrazine", 10)
+			source.reagents.add_reagent("hyperzine", 10)
 
 		return
 

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

@@ -198,6 +198,21 @@
 		new /obj/item/weapon/grenade/flashbang(src)
 		new /obj/item/weapon/grenade/flashbang(src)
 
+/obj/item/weapon/storage/box/teargas
+	name = "box of tear gas grenades (WARNING)"
+	desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness and skin irritation.</B>"
+	icon_state = "flashbang"
+
+/obj/item/weapon/storage/box/teargas/New()
+	..()
+	new /obj/item/weapon/grenade/chem_grenade/teargas(src)
+	new /obj/item/weapon/grenade/chem_grenade/teargas(src)
+	new /obj/item/weapon/grenade/chem_grenade/teargas(src)
+	new /obj/item/weapon/grenade/chem_grenade/teargas(src)
+	new /obj/item/weapon/grenade/chem_grenade/teargas(src)
+	new /obj/item/weapon/grenade/chem_grenade/teargas(src)
+	new /obj/item/weapon/grenade/chem_grenade/teargas(src)
+
 /obj/item/weapon/storage/box/emps
 	name = "emp grenades"
 	desc = "A box with 5 emp grenades."

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

@@ -135,6 +135,15 @@
 	new /obj/item/ammo_box/a357(src)
 	return
 
+/obj/item/weapon/storage/box/syndie_kit/imp_adrenal
+	name = "boxed adrenal implant (with injector)"
+
+	New()
+		..()
+		var/obj/item/weapon/implanter/O = new(src)
+		O.imp = new /obj/item/weapon/implant/adrenalin(O)
+		O.update()
+
 /obj/item/weapon/storage/box/syndie_kit/mindslave
 	name = "box (MS)"