From e9872f61889ae97bf11009f76382c4d3a7252898 Mon Sep 17 00:00:00 2001
From: "rastaf.zero@gmail.com"
 <rastaf.zero@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 18 Mar 2011 00:19:09 +0000
Subject: [PATCH] Fixed an issue with examining several objects in your hands
 (such as beakers). Fixed bug with random last name being empty in rare cases.
 Fixed spawnable dnainjectors (/dnainjector/hulkmut and so on)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1199 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/WorkInProgress/Chemistry-Tools.dm | 26 +++++-----
 code/defines/obj/injector.dm           | 70 ++++++++++++++++++++------
 config/names/last.txt                  |  2 +-
 3 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm
index 772b2e98157..b9d76330837 100644
--- a/code/WorkInProgress/Chemistry-Tools.dm
+++ b/code/WorkInProgress/Chemistry-Tools.dm
@@ -312,6 +312,7 @@
 		..()
 
 	examine()
+		set src in view()
 		..()
 		if (!(usr in view(2)) && usr!=src.loc) return
 		usr << "\blue It contains:"
@@ -323,7 +324,7 @@
 
 	verb/set_APTFT() //set amount_per_transfer_from_this
 		set name = "Set transfer amount"
-		set src in range(1)
+		set src in view(1)
 		var/N = input("Amount per transfer from this:","[src]") as null|anything in possible_transfer_amounts
 		if (N)
 			amount_per_transfer_from_this = N
@@ -417,6 +418,7 @@
 	)
 
 	examine()
+		set src in view()
 		..()
 		if (!(usr in view(2)) && usr!=src.loc) return
 		usr << "\blue It contains:"
@@ -1133,19 +1135,15 @@
 				icon_state = "blender_jug_f"
 
 /obj/item/weapon/reagent_containers/glass/large
-   name = "large reagent glass"
-   desc = "A large reagent glass."
-   icon = 'chemical.dmi'
-   icon_state = "beakerlarge"
-   item_state = "beaker"
-
-   New()
-      var/datum/reagents/R = new/datum/reagents(100)
-      reagents = R
-      R.my_atom = src
-
-   amount_per_transfer_from_this = 10
-   flags = FPRINT | TABLEPASS | OPENCONTAINER
+	name = "large reagent glass"
+	desc = "A large reagent glass."
+	icon = 'chemical.dmi'
+	icon_state = "beakerlarge"
+	item_state = "beaker"
+	volume = 100
+	amount_per_transfer_from_this = 10
+	possible_transfer_amounts = list(5,10,15,30,50)
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
 
 /obj/item/weapon/reagent_containers/glass/bottle
 	name = "bottle"
diff --git a/code/defines/obj/injector.dm b/code/defines/obj/injector.dm
index e237d1e7934..91a2215c703 100644
--- a/code/defines/obj/injector.dm
+++ b/code/defines/obj/injector.dm
@@ -19,25 +19,37 @@
 	name = "DNA-Injector (Anti-Hulk)"
 	dnatype = "se"
 	dna = "708"
-	block = 2
+	//block = 2
+	New()
+		..()
+		block = HULKBLOCK
 
 /obj/item/weapon/dnainjector/hulkmut
 	name = "DNA-Injector (Hulk)"
 	dnatype = "se"
 	dna = "FED"
-	block = 2
+	//block = 2
+	New()
+		..()
+		block = HULKBLOCK
 
 /obj/item/weapon/dnainjector/xraymut
 	name = "DNA-Injector (Xray)"
 	dnatype = "se"
 	dna = "FED"
-	block = 8
+	//block = 8
+	New()
+		..()
+		block = XRAYBLOCK
 
 /obj/item/weapon/dnainjector/antixray
 	name = "DNA-Injector (Anti-Xray)"
 	dnatype = "se"
 	dna = "708"
-	block = 8
+	//block = 8
+	New()
+		..()
+		block = XRAYBLOCK
 
 /////////////////////////////////////
 /obj/item/weapon/dnainjector/antiglasses
@@ -80,13 +92,19 @@
 	name = "DNA-Injector (Clumsy)"
 	dnatype = "se"
 	dna = "FA0"
-	block = 6
+	//block = 6
+	New()
+		..()
+		block = CLUMSYBLOCK
 
 /obj/item/weapon/dnainjector/anticlumsy
 	name = "DNA-Injector (Anti-Clumy)"
 	dnatype = "se"
 	dna = "708"
-	block = 6
+	//block = 6
+	New()
+		..()
+		block = CLUMSYBLOCK
 
 /obj/item/weapon/dnainjector/antitour
 	name = "DNA-Injector (Anti-Tour.)"
@@ -116,49 +134,73 @@
 	name = "DNA-Injector (Anti-Fire)"
 	dnatype = "se"
 	dna = "708"
-	block = 10
+	//block = 10
+	New()
+		..()
+		block = FIREBLOCK
 
 /obj/item/weapon/dnainjector/firemut
 	name = "DNA-Injector (Fire)"
 	dnatype = "se"
 	dna = "FED"
-	block = 10
+	//block = 10
+	New()
+		..()
+		block = FIREBLOCK
 
 /obj/item/weapon/dnainjector/blindmut
 	name = "DNA-Injector (Blind)"
 	dnatype = "se"
 	dna = "FA0"
-	block = 11
+	//block = 11
+	New()
+		..()
+		block = BLINDBLOCK
 
 /obj/item/weapon/dnainjector/antiblind
 	name = "DNA-Injector (Anti-Blind)"
 	dnatype = "se"
 	dna = "708"
-	block = 11
+	//block = 11
+	New()
+		..()
+		block = BLINDBLOCK
 
 /obj/item/weapon/dnainjector/antitele
 	name = "DNA-Injector (Anti-Tele.)"
 	dnatype = "se"
 	dna = "708"
-	block = 12
+	//block = 12
+	New()
+		..()
+		block = TELEBLOCK
 
 /obj/item/weapon/dnainjector/telemut
 	name = "DNA-Injector (Tele.)"
 	dnatype = "se"
 	dna = "FED"
-	block = 12
+	//block = 12
+	New()
+		..()
+		block = TELEBLOCK
 
 /obj/item/weapon/dnainjector/deafmut
 	name = "DNA-Injector (Deaf)"
 	dnatype = "se"
 	dna = "FA0"
-	block = 13
+	//block = 13
+	New()
+		..()
+		block = DEAFBLOCK
 
 /obj/item/weapon/dnainjector/antideaf
 	name = "DNA-Injector (Anti-Deaf)"
 	dnatype = "se"
 	dna = "708"
-	block = 13
+	//block = 13
+	New()
+		..()
+		block = DEAFBLOCK
 
 /obj/item/weapon/dnainjector/h2m
 	name = "DNA-Injector (Human > Monkey)"
diff --git a/config/names/last.txt b/config/names/last.txt
index b299f5827ec..f1db727c8dc 100644
--- a/config/names/last.txt
+++ b/config/names/last.txt
@@ -641,4 +641,4 @@ Mikhaylov
 Pavlov
 Semenov
 Andreev
-Alekseev
+Alekseev
\ No newline at end of file