From 829441bd01ed99a72bcbf6a30e5e2e8eb236ba1d Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Thu, 3 Sep 2015 22:20:26 +0200
Subject: [PATCH] Fixes https://github.com/ParadiseSS13/Paradise/issues/1930

---
 .../reagents/reagent_containers/borghydro.dm  | 27 ++++++-------------
 .../reagents/reagent_containers/hypospray.dm  |  1 -
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index e5f1345f8fd..f1aeead35a2 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -30,7 +30,6 @@
 
 	processing_objects.Add(src)
 
-
 /obj/item/weapon/reagent_containers/borghypo/Destroy()
 	processing_objects.Remove(src)
 	return ..()
@@ -50,13 +49,6 @@
 	//update_icon()
 	return 1
 
-// Purely for testing purposes I swear~
-/*
-/obj/item/weapon/reagent_containers/borghypo/verb/add_cyanide()
-	set src in world
-	add_reagent("cyanide")
-*/
-
 // Use this to add more chemicals for the borghypo to produce.
 /obj/item/weapon/reagent_containers/borghypo/proc/add_reagent(var/reagent)
 	reagent_ids |= reagent
@@ -74,23 +66,20 @@
 		return
 	if (!istype(M))
 		return
-
-	var/mob/living/carbon/human/H = M
-	if(istype(H))
-		var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
-		if(!affected)
-			user << "<span class='danger'>\The [H] is missing that limb!</span>"
-			return
-		else if(affected.status & ORGAN_ROBOT)
-			user << "<span class='danger'>You cannot inject a robotic limb.</span>"
-			return	
-	
 	if (R.total_volume && M.can_inject(user,1))
 		user << "<span class='notice'>You inject [M] with the injector.</span>"
 		M << "<span class='notice'>You feel a tiny prick!</span>"
 
 		R.add_reagent(M)
 		if(M.reagents)
+			var/datum/reagent/injected = chemical_reagents_list[reagent_ids[mode]]
+			var/contained = injected.name
+			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [src.name] by [key_name(user)]. Reagents: [contained]</font>")
+			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to inject [key_name(M)]. Reagents: [contained]</font>")
+			if(M.ckey)
+				msg_admin_attack("[key_name_admin(user)] injected [key_name_admin(M)] with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)])")
+			M.LAssailant = user
+			
 			var/trans = R.trans_to(M, amount_per_transfer_from_this)
 			user << "<span class='notice'>[trans] units injected. [R.total_volume] units remaining.</span>"
 	return
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 72d4c18297c..2cc67490b39 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -28,7 +28,6 @@
 
 		src.reagents.add_reagent(M)
 		if(M.reagents)
-
 			var/list/injected = list()
 			for(var/datum/reagent/R in src.reagents.reagent_list)
 				injected += R.name