Nuke Ops Rework Phase 2

code/modules/reagents/Chemistry-Reagents.dm

@@ -408,8 +408,8 @@ datum
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
-				M.adjustToxLoss(4)
-				M.adjustOxyLoss(4)
+				M.adjustToxLoss(3)
+				M.adjustOxyLoss(3)
 				M.sleeping += 1
 				..()
 				return
@@ -510,14 +510,14 @@ datum
 			description = "An effective hypnotic used to treat insomnia."
 			reagent_state = LIQUID
 			color = "#E895CC" // rgb: 232, 149, 204
-			oxyod = 100
-			toxod = 100
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!M) M = holder.my_atom
 				if(!data) data = 1
 				switch(data)
-					if(1 to 15)
+					if(1 to 12)
+						if(prob(5))	M.emote("yawn")
+					if(12 to 15)
 						M.eye_blurry = max(M.eye_blurry, 10)
 					if(15 to 25)
 						M.drowsyness  = max(M.drowsyness, 20)
@@ -2077,8 +2077,8 @@ datum
 					M.status_flags &= ~FAKEDEATH
 				M.adjustOxyLoss(0.5*REM)
 				M.adjustToxLoss(0.5*REM)
-				M.Weaken(10)
-				M.silent = max(M.silent, 10)
+				M.Weaken(5)
+				M.silent = max(M.silent, 5)
 				M.tod = worldtime2text()
 				..()
 				return
@@ -2107,7 +2107,6 @@ datum
 			description = "A powerful hallucinogen. Not a thing to be messed with."
 			reagent_state = LIQUID
 			color = "#B31008" // rgb: 139, 166, 233
-			custom_metabolism = 0.05
 			addictiveness = 15
 
 			on_mob_life(var/mob/living/M)

code/modules/reagents/reagent_containers/hypospray.dm

@@ -54,6 +54,20 @@
 
 	return
 
+/obj/item/weapon/reagent_containers/hypospray/combat
+	name = "combat stimulant injector"
+	desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat."
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(10)
+	icon_state = "combat_hypo"
+	volume = 60
+
+/obj/item/weapon/reagent_containers/hypospray/combat/New()
+	..()
+	reagents.remove_reagent("tricordrazine", 30)
+	reagents.add_reagent("synaptizine", 30)
+
+
 /obj/item/weapon/reagent_containers/hypospray/autoinjector
 	name = "emergency autoinjector"
 	desc = "A potent mix of pain killers and muscle stimulants."

code/modules/reagents/reagent_containers/pill.dm

@@ -155,6 +155,14 @@
 		..()
 		reagents.add_reagent("kelotane", 30)
 
+/obj/item/weapon/reagent_containers/pill/dermaline
+	name = "Dermaline pill"
+	desc = "Used to treat severe burns."
+	icon_state = "pill12"
+	New()
+		..()
+		reagents.add_reagent("dermaline", 30)
+
 /obj/item/weapon/reagent_containers/pill/tramadol
 	name = "Tramadol pill"
 	desc = "A simple painkiller."