more tweaks

code/modules/reagents/newchem/chem_heater.dm

@@ -18,7 +18,7 @@
 	component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
 	component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
 	RefreshParts()
-	
+
 /obj/machinery/chem_heater/upgraded/New()
 	..()
 	component_parts = list()
@@ -68,7 +68,7 @@
 			stat |= NOPOWER
 	nanomanager.update_uis(src)
 
-/obj/machinery/chem_heater/attackby(var/obj/item/I as obj, var/mob/user as mob)
+/obj/machinery/chem_heater/attackby(obj/item/I, mob/user)
 	if(isrobot(user))
 		return
 
@@ -96,10 +96,10 @@
 			default_deconstruction_crowbar(I)
 			return 1
 
-/obj/machinery/chem_heater/attack_hand(var/mob/user as mob)
+/obj/machinery/chem_heater/attack_hand(mob/user)
 	ui_interact(user)
 
-/obj/machinery/chem_heater/attack_ai(mob/user as mob)
+/obj/machinery/chem_heater/attack_ai(mob/user)
 	src.add_hiddenprint(user)
 	return src.attack_hand(user)
 
@@ -126,8 +126,9 @@
 		eject_beaker()
 		. = 0 //updated in eject_beaker() already
 
-/obj/machinery/chem_heater/ui_interact(var/mob/user, ui_key = "main", var/datum/nanoui/ui = null)
-	if(user.stat || user.restrained()) return
+/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null)
+	if(user.stat || user.restrained())
+		return
 
 	var/data[0]
 	data["targetTemp"] = desired_temp

code/modules/reagents/reagent_containers/dropper.dm

@@ -80,18 +80,6 @@
 			else
 				M.LAssailant = user
 
-		// /vg/: Logging transfers of bad things
-		if(isobj(target))
-			if(target.reagents_to_log.len)
-				var/list/badshit=list()
-				for(var/bad_reagent in target.reagents_to_log)
-					if(reagents.has_reagent(bad_reagent))
-						badshit += reagents_to_log[bad_reagent]
-				if(badshit.len)
-					var/hl = "<span class='danger'>([english_list(badshit)])</span>"
-					message_admins("[key_name_admin(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl]")
-					log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
-
 		trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
 		to_chat(user, "\blue You transfer [trans] units of the solution.")
 		if(src.reagents.total_volume<=0)

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -205,7 +205,7 @@
 	possible_transfer_amounts = list()
 	possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"))
 
-/obj/item/weapon/reagent_containers/food/condiment/pack/attack(mob/M as mob, mob/user as mob, def_zone) //Can't feed these to people directly.
+/obj/item/weapon/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
 	return
 
 /obj/item/weapon/reagent_containers/food/condiment/pack/afterattack(obj/target, mob/user , proximity)

code/modules/reagents/reagent_containers/food/sandwich.dm

@@ -1,104 +0,0 @@
-/*
-
-/obj/item/weapon/reagent_containers/food/snacks/breadslice/attackby(obj/item/W as obj, mob/user as mob, params)
-
-	if(istype(W,/obj/item/weapon/shard) || istype(W,/obj/item/weapon/reagent_containers/food/snacks))
-		var/obj/item/weapon/reagent_containers/food/snacks/csandwich/S = new(get_turf(src))
-		S.attackby(W,user, params)
-		qdel(src)
-	..()
-
-/obj/item/weapon/reagent_containers/food/snacks/csandwich
-	name = "sandwich"
-	desc = "The best thing since sliced bread."
-	icon_state = "breadslice"
-	trash = /obj/item/trash/plate
-	bitesize = 2
-
-	var/list/ingredients = list()
-
-/obj/item/weapon/reagent_containers/food/snacks/csandwich/attackby(obj/item/W as obj, mob/user as mob, params)
-
-	var/sandwich_limit = 4
-	for(var/obj/item/O in ingredients)
-		if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/breadslice))
-			sandwich_limit += 4
-
-	if(src.contents.len > sandwich_limit)
-		to_chat(user, "\red If you put anything else on \the [src] it's going to collapse.")
-		return
-	else if(istype(W,/obj/item/weapon/shard))
-		to_chat(user, "\blue You hide [W] in \the [src].")
-		user.drop_item()
-		W.loc = src
-		update()
-		return
-	else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks))
-		to_chat(user, "\blue You layer [W] over \the [src].")
-		var/obj/item/weapon/reagent_containers/F = W
-		F.reagents.trans_to(src, F.reagents.total_volume)
-		user.drop_item()
-		W.loc = src
-		ingredients += W
-		update()
-		return
-	..()
-
-/obj/item/weapon/reagent_containers/food/snacks/csandwich/proc/update()
-	var/fullname = "" //We need to build this from the contents of the var.
-	var/i = 0
-
-	overlays.Cut()
-
-	for(var/obj/item/weapon/reagent_containers/food/snacks/O in ingredients)
-
-		i++
-		if(i == 1)
-			fullname += "[O.name]"
-		else if(i == ingredients.len)
-			fullname += " and [O.name]"
-		else
-			fullname += ", [O.name]"
-
-		var/image/I = new(src.icon, "sandwich_filling")
-		I.color = O.filling_color
-		I.pixel_x = pick(list(-1,0,1))
-		I.pixel_y = (i*2)+1
-		overlays += I
-
-	var/image/T = new(src.icon, "sandwich_top")
-	T.pixel_x = pick(list(-1,0,1))
-	T.pixel_y = (ingredients.len * 2)+1
-	overlays += T
-
-	name = lowertext("[fullname] sandwich")
-	if(length(name) > 80) name = "[pick(list("absurd","colossal","enormous","ridiculous"))] sandwich"
-	w_class = n_ceil(Clamp((ingredients.len/2),1,3))
-
-/obj/item/weapon/reagent_containers/food/snacks/csandwich/Destroy()
-	for(var/obj/item/O in ingredients)
-		qdel(O)
-	return ..()
-
-/obj/item/weapon/reagent_containers/food/snacks/csandwich/examine(mob/user)
-	..(user)
-	var/obj/item/O = pick(contents)
-	to_chat(user, "\blue You think you can see [O.name] in there.")
-
-/obj/item/weapon/reagent_containers/food/snacks/csandwich/attack(mob/M as mob, mob/user as mob, def_zone)
-
-	var/obj/item/shard
-	for(var/obj/item/O in contents)
-		if(istype(O,/obj/item/weapon/shard))
-			shard = O
-			break
-
-	var/mob/living/H
-	if(istype(M,/mob/living))
-		H = M
-
-	if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable.
-		to_chat(H, "\red You lacerate your mouth on a [shard.name] in the sandwich!")
-		H.adjustBruteLoss(5) //TODO: Target head if human.
-	..()
-*/

code/modules/reagents/reagent_containers/glass_containers.dm

@@ -114,17 +114,6 @@
 			to_chat(user, "<span class='warning'>[target] is full.</span>")
 			return
 
-		// /vg/: Logging transfers of bad things
-		if(target.reagents_to_log.len)
-			var/list/badshit=list()
-			for(var/bad_reagent in target.reagents_to_log)
-				if(reagents.has_reagent(bad_reagent))
-					badshit += reagents_to_log[bad_reagent]
-			if(badshit.len)
-				var/hl = "<span class='danger'>([english_list(badshit)])</span>"
-				message_admins("[key_name_admin(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl]")
-				log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
-
 		var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
 		to_chat(user, "<span class='notice'>You transfer [trans] units of the solution to [target].</span>")
 
@@ -142,7 +131,7 @@
 		return
 
 
-/obj/item/weapon/reagent_containers/glass/attackby(var/obj/item/I, mob/user as mob, params)
+/obj/item/weapon/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird
 		return
 	if(is_hot(I))
@@ -231,7 +220,7 @@
 		reagents.chem_temp += 30
 		reagents.handle_reactions()
 
-/obj/item/weapon/reagent_containers/glass/beaker/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+/obj/item/weapon/reagent_containers/glass/beaker/attackby(obj/item/weapon/W, mob/user, params)
 	if(istype(W, /obj/item/device/assembly_holder) && can_assembly)
 		if(assembly)
 			to_chat(usr, "<span class='warning'>The [src] already has an assembly.</span>")

code/modules/reagents/reagent_containers/hypospray.dm

@@ -17,31 +17,27 @@
 
 /obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M, mob/user)
 	if(!reagents.total_volume)
-		to_chat(user, "\red [src] is empty.")
+		to_chat(user, "<span class='warning'>[src] is empty!</span>")
 		return
-	if(!istype(M))
+	if(!iscarbon(M))
 		return
-	if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1)))
-		to_chat(user, "\blue You inject [M] with [src].")
-		to_chat(M, "\red You feel a tiny prick!")
 
-		src.reagents.add_reagent(M)
+	if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1))) // Ignore flag should be checked first or there will be an error message.
+		to_chat(M, "<span class='warning'>You feel a tiny prick!</span>")
+		to_chat(user, "<span class='notice'>You inject [M] with [src].</span>")
+
 		if(M.reagents)
 			var/list/injected = list()
-			for(var/datum/reagent/R in src.reagents.reagent_list)
+			for(var/datum/reagent/R in reagents.reagent_list)
 				injected += R.name
-			var/contained = english_list(injected)
-			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)])")
-			if(!iscarbon(user))
-				M.LAssailant = null
-			else
-				M.LAssailant = user
 
 			var/trans = reagents.trans_to(M, amount_per_transfer_from_this)
-			to_chat(user, "\blue [trans] units injected. [reagents.total_volume] units remaining in [src].")
+
+			to_chat(user, "<span class='notice'>[trans] unit\s injected.  [reagents.total_volume] unit\s remaining in [src].</span>")
+
+			var/contained = english_list(injected)
+
+			add_logs(M, user, "injected", src, "([contained])")
 
 /obj/item/weapon/reagent_containers/hypospray/CMO
 	list_reagents = list("omnizine" = 30)

code/modules/reagents/reagent_containers/pill.dm

@@ -17,7 +17,7 @@
 		icon_state = "pill[rand(1,20)]"
 
 /obj/item/weapon/reagent_containers/food/pill/attack_self(mob/user)
-		return
+	return
 
 /obj/item/weapon/reagent_containers/food/pill/attack(mob/living/carbon/M, mob/user, def_zone)
 	if(!istype(M))
@@ -38,17 +38,6 @@
 			to_chat(user, "<span class='warning'>[target] is empty. Cant dissolve [src].</span>")
 			return
 
-		// /vg/: Logging transfers of bad things
-		if(target.reagents_to_log.len)
-			var/list/badshit=list()
-			for(var/bad_reagent in target.reagents_to_log)
-				if(reagents.has_reagent(bad_reagent))
-					badshit += reagents_to_log[bad_reagent]
-			if(badshit.len)
-				var/hl = "<span class='danger'>([english_list(badshit)])</span>"
-				message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
-				log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
-
 		to_chat(user, "<span class='notify'>You dissolve [src] in [target].</span>")
 		reagents.trans_to(target, reagents.total_volume)
 		for(var/mob/O in viewers(2, user))
@@ -56,8 +45,6 @@
 		spawn(5)
 			qdel(src)
 
-	return
-
 ////////////////////////////////////////////////////////////////////////////////
 /// Pills. END
 ////////////////////////////////////////////////////////////////////////////////

code/modules/reagents/reagent_containers/syringes.dm

@@ -209,18 +209,6 @@
 			if(ismob(target) && target == user)
 				src.reagents.reaction(target, INGEST)
 
-			if(isobj(target))
-				// /vg/: Logging transfers of bad things
-				if(target.reagents_to_log.len)
-					var/list/badshit=list()
-					for(var/bad_reagent in target.reagents_to_log)
-						if(reagents.has_reagent(bad_reagent))
-							badshit += reagents_to_log[bad_reagent]
-					if(badshit.len)
-						var/hl = "<span class='danger'>([english_list(badshit)])</span>"
-						message_admins("[key_name_admin(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] ")
-						log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
-
 			spawn(5)
 				var/datum/reagent/blood/B
 				for(var/datum/reagent/blood/d in src.reagents.reagent_list)