Merge pull request #26 from AnonymousHybi/master

Some nice new vents and scrubbers and also an attempt at fixing the NIF runtime. Oh and syringes can't get dirty anymore.

code/modules/nifsoft/software/13_soulcatcher.dm

@@ -89,7 +89,7 @@
 				var/mob/living/carbon/brain/caught_soul/CS = brainmob
 				to_chat(CS,"<b>\[\icon[nif.big_icon]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"")
 
-		log_nsay(message,nif.human.real_name,src)
+		log_nsay(message,nif.human.real_name,sender)
 
 	proc/emote_into(var/message, var/mob/living/sender, var/mob/eyeobj)
 		var/sender_name = eyeobj ? eyeobj.name : sender.name
@@ -105,7 +105,7 @@
 				var/mob/living/carbon/brain/caught_soul/CS = brainmob
 				to_chat(CS,"<b>\[\icon[nif.big_icon]NIF\]</b> <b>[sender_name]</b> [message]")
 
-		log_nme(message,nif.human.real_name,src)
+		log_nme(message,nif.human.real_name,sender)
 
 	proc/show_settings(var/mob/living/carbon/human/H)
 		set waitfor = FALSE

code/modules/reagents/reagent_containers/syringes.dm

@@ -203,13 +203,13 @@
 			var/contained = reagentlist()
 			while(reagents.total_volume)
 				if(ismob(target))
-					trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)	
+					trans += reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)
 				else
 					trans += reagents.trans_to_obj(target, amount_per_transfer_from_this)
 				update_icon()
 				if(!reagents.total_volume || !do_after(user,cycle_time,target))
 					break
-			
+
 			if (reagents.total_volume <= 0 && mode == SYRINGE_INJECT)
 				mode = SYRINGE_DRAW
 				update_icon()
@@ -220,7 +220,7 @@
 			else
 				to_chat(user, "<span class='notice'>The syringe is empty.</span>")
 
-			dirty(target,affected) //VOREStation Add
+//			dirty(target,affected) //VOREStation Add
 
 	return
 /* VOREStation Edit - See syringes_vr.dm

code/modules/reagents/reagent_containers/syringes_vr.dm

@@ -4,19 +4,17 @@
 	icon = 'icons/goonstation/objects/syringe_vr.dmi'
 	mode = SYRINGE_CAPPED //Override
 	var/used = FALSE
-	var/dirtiness = 0
 	var/list/targets
-	var/list/datum/disease2/disease/viruses
 
 /obj/item/weapon/reagent_containers/syringe/initialize()
 	. = ..()
 	update_icon()
 
 /obj/item/weapon/reagent_containers/syringe/Destroy()
-	qdel_null_list(viruses)
+//	qdel_null_list(viruses)
 	LAZYCLEARLIST(targets)
 	return ..()
-
+/*
 /obj/item/weapon/reagent_containers/syringe/process()
 	dirtiness = min(dirtiness + targets.len,75)
 	if(dirtiness >= 75)
@@ -63,7 +61,7 @@
 		var/obj/item/organ/external/found_limb = limb_ref.resolve()
 		if(istype(found_limb))
 			eo.germ_level += INFECTION_LEVEL_ONE+30
-	
+*/
 //Allow for capped syringe mode
 /obj/item/weapon/reagent_containers/syringe/attack_self(mob/user as mob)
 	switch(mode)
@@ -78,10 +76,10 @@
 			return
 	update_icon()
 
-//Allow for capped syringes 
+//Allow for capped syringes
 /obj/item/weapon/reagent_containers/syringe/update_icon()
 	cut_overlays(src)
-	
+
 	var/matrix/tf = matrix()
 	if(isstorage(loc))
 		tf.Turn(-90) //Vertical for storing compact-ly
@@ -111,7 +109,7 @@
 			if (SYRINGE_INJECT)
 				injoverlay = "inject"
 		new_overlays += injoverlay
-	
+
 	add_overlay(new_overlays)
 	icon_state = "[rounded_vol]"
 	item_state = "syringe_[rounded_vol]"