diff --git a/baystation12.dme b/baystation12.dme
index fd245c3b782..b029869cf22 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -157,10 +157,8 @@
 #define FILE_DIR "code/WorkInProgress"
 #define FILE_DIR "code/WorkInProgress/Apples"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Jumper"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust"
 #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
-#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/tajara_sprites"
 #define FILE_DIR "code/WorkInProgress/Chinsky"
 #define FILE_DIR "code/WorkInProgress/mapload"
 #define FILE_DIR "code/WorkInProgress/Mini"
diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm
index 01210b543cc..26139627de7 100755
--- a/code/game/objects/devices/PDA/PDA.dm
+++ b/code/game/objects/devices/PDA/PDA.dm
@@ -620,6 +620,10 @@
 						var/obj/item/device/pda/P = locate(href_list["target"])
 						if(!isnull(P))
 							if (!P.toff && cartridge:shock_charges > 0)
+								log_admin("ATTACK: [U] ([U.ckey]) triggered a Detomatix Cartridge.")
+								message_admins("ATTACK: [U] ([U.ckey]) triggered a Detomatix Cartridge.")
+								log_attack("<font color='red'>[U.name] ([U.ckey]) triggered a Detomatix Cartridge.</font>")
+
 								cartridge:shock_charges--
 
 								var/difficulty = 0
diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm
index 52957a480b1..96e5480a8b0 100644
--- a/code/game/objects/items/weapons/grenades.dm
+++ b/code/game/objects/items/weapons/grenades.dm
@@ -293,6 +293,9 @@ FLASHBANG
 		if(!active)
 			//world << "cluster attack self"
 			user << "\red You prime the clusterbang! [det_time/10] seconds!"
+			log_attack("<font color='red'>[user.name] ([user.ckey]) primed a [src].</font>")
+			log_admin("ATTACK: [user] ([user.ckey]) primed a [src].")
+			message_admins("ATTACK: [user] ([user.ckey]) primed a [src].")
 			src.active = 1
 			src.icon_state = "clusterbang1"
 			playsound(src.loc, 'armbomb.ogg', 75, 1, -3)
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 022c2a0af13..d742c765e2a 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -26,7 +26,7 @@
 	var/obj/item/weapon/circuitboard/circuit = null
 	var/list/allowed_containers = list("/obj/item/weapon/reagent_containers/glass/beaker", "/obj/item/weapon/reagent_containers/glass/dispenser", "/obj/item/weapon/reagent_containers/glass/bottle")
 	var/affected_area = 3
-
+	var/mob/attacher = "Unknown"
 
 	attackby(var/obj/item/weapon/W, var/mob/user)
 		if(path || !active)
@@ -65,6 +65,10 @@
 						W.loc = src
 						user << "\blue You attach the [W] to the grenade controls!"
 						W.master = src
+						bombers += "[key_name(user)] attached a [W] to a grenade casing."
+						message_admins("[key_name_admin(user)] attached a [W] to a grenade casing.")
+						log_game("[key_name_admin(user)] attached a [W] to a grenade casing.")
+						attacher = key_name(user)
 
 					else if(istype(W, /obj/item/weapon/screwdriver))
 						if(beaker_one && beaker_two && attached_device)
@@ -266,6 +270,12 @@
 				beaker_two.reagents.maximum_volume += beaker_one.reagents.maximum_volume // make sure everything can mix
 				beaker_one.reagents.update_total()
 				beaker_one.reagents.trans_to(beaker_two, beaker_one.reagents.total_volume)
+				var/turf/bombturf = get_turf(src)
+				var/bombarea = bombturf.loc.name
+				var/log_str = "Grenade detonated in [bombarea] with device attacher: [attacher]. Last touched by: [src.fingerprintslast]"
+				bombers += log_str
+				message_admins(log_str)
+				log_game(log_str)
 				if(beaker_one.reagents.total_volume) //The possible reactions didnt use up all reagents.
 					var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
 					steam.set_up(10, 0, get_turf(src))