Merge pull request #746 from jack-fractal/write-research-debug

R&D Research Levels Unification

code/modules/reagents/reagent_containers/glass.dm

@@ -247,6 +247,8 @@
 			// /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)
 
@@ -257,6 +259,8 @@
 				if(badshit.len)
 
 					var/hl="\red <b>([english_list(badshit)])</b> \black"
+
+					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].")
 

code/modules/reagents/syringe_gun.dm

@@ -64,4 +64,5 @@
 	name = "rapid syringe gun"
 	desc = "A modification of the syringe gun design, using a rotating cylinder to store up to six syringes."
 	icon_state = "rapidsyringegun"
-	max_syringes = 6
+	max_syringes = 6
+	origin_tech="combat=3;materials=3;engineering=3;biotech=2"