Merge branch 'master' of git://github.com/Baystation12/Baystation12

Conflicts:
	code/game/objects/closets/secure/engineering.dm
	maps/tgstation.2.0.8.dmm

Signed-off-by: CaelAislinn <cael_aislinn@yahoo.com.au>

code/game/objects/closets/secure/personal.dm

@@ -45,6 +45,12 @@
 		else
 			user << "\red Access Denied"
 	else if( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
+		if(istype(W, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = W
+			if(E.uses)
+				E.uses--
+			else
+				return
 		broken = 1
 		locked = 0
 		desc = "It appears to be broken."

code/game/objects/closets/secure/secure_closets.dm

@@ -38,6 +38,12 @@
 		user << "\red It appears to be broken."
 		return
 	else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
+		if(istype(W, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = W
+			if(E.uses)
+				E.uses--
+			else
+				return
 		broken = 1
 		locked = 0
 		desc = "It appears to be broken."

code/game/objects/closets/walllocker.dm

@@ -48,6 +48,11 @@
 		user << "\red It appears to be broken."
 		return
 	else if(istype(W, /obj/item/weapon/card/emag) && !src.broken)
+		var/obj/item/weapon/card/emag/E = W
+		if(E.uses)
+			E.uses--
+		else
+			return
 		src.broken = 1
 		src.locked = 0
 		src.icon_state = src.icon_broken

code/game/objects/devices/scanners.dm

@@ -207,12 +207,12 @@ MASS SPECTROMETER
 				var/list/prints = temp[2]
 				if(!prints)
 					prints = list()
-				if(A.fingerprints)
-					for(var/j = 1, j < (A.fingerprints.len + 1), j++)	//Fingerprints~~~
+				if(A.fingerprints && A.fingerprints.len)
+					for(var/j = 1, j <= A.fingerprints.len, j++)	//Fingerprints~~~
 						var/list/print_test1 = params2list(A.fingerprints[j])
 						var/test_print1 = print_test1[num2text(1)]
 						var/found = 0
-						for(var/k = 1, k < (prints.len + 1), k++)	//Lets see if the print is already in there
+						for(var/k = 1, k <= prints.len, k++)	//Lets see if the print is already in there
 							var/list/print_test2 = params2list(prints[k])
 							var/test_print2 = print_test2[num2text(1)]
 							if(test_print2 == test_print1)	//It is!  Merge!
@@ -224,15 +224,15 @@ MASS SPECTROMETER
 				var/list/fibers = temp[3]
 				if(!fibers)
 					fibers = list()
-				if(A.suit_fibers)
-					for(var/j = 1, j < (A.suit_fibers.len + 1), j++)	//Fibers~~~
+				if(A.suit_fibers && A.suit_fibers.len)
+					for(var/j = 1, j <= A.suit_fibers.len, j++)	//Fibers~~~
 						if(!fibers.Find(A.suit_fibers[j]))	//It isn't!  Add!
 							fibers += A.suit_fibers[j]
 				var/list/blood = temp[4]
 				if(!blood)
 					blood = list()
-				if(A.blood_DNA.len)
-					for(var/j = 1, j < (A.blood_DNA.len + 1), j++)	//Blood~~~
+				if(A.blood_DNA.len && A.blood_DNA)
+					for(var/j = 1, j <= A.blood_DNA.len, j++)	//Blood~~~
 						if(!blood.Find(A.blood_DNA[j]))	//It isn't!  Add!
 							blood += A.blood_DNA[j]
 				var/list/sum_list[4]	//Pack it back up!
@@ -245,7 +245,11 @@ MASS SPECTROMETER
 		if(!merged)	//Uh, oh!  New data point!
 			var/list/sum_list[4]	//Pack it back up!
 			sum_list[1] = A
-			sum_list[2] = A.fingerprints
+			if(!A.fingerprints)
+				world << "Report this to a dev! [A] was lacking a list() for fingerprints!"
+				sum_list[2] = list()
+			else
+				sum_list[2] = A.fingerprints
 			sum_list[3] = A.suit_fibers
 			sum_list[4] = A.blood_DNA
 			stored.len++

code/game/objects/door_assembly.dm

@@ -43,7 +43,7 @@ obj/structure/door_assembly
 		name = "Security Airlock Assembly"
 		icon_state = "door_as_sec1"
 		glass_base_icon_state = "door_as_gsec"
-		glass_type = /obj/machinery/door/airlock/glass_security
+		glass_type = /obj/machinery/door/airlock/glass/glass_security
 		airlock_type = /obj/machinery/door/airlock/security
 		anchored = 1
 		density = 1
@@ -58,7 +58,7 @@ obj/structure/door_assembly
 		name = "Engineering Airlock Assembly"
 		icon_state = "door_as_eng1"
 		glass_base_icon_state = "door_as_geng"
-		glass_type = /obj/machinery/door/airlock/glass_engineering
+		glass_type = /obj/machinery/door/airlock/glass/glass_engineering
 		airlock_type = /obj/machinery/door/airlock/engineering
 		anchored = 1
 		density = 1
@@ -73,7 +73,7 @@ obj/structure/door_assembly
 		name = "Medical Airlock Assembly"
 		icon_state = "door_as_med1"
 		glass_base_icon_state = "door_as_gmed"
-		glass_type = /obj/machinery/door/airlock/glass_medical
+		glass_type = /obj/machinery/door/airlock/glass/glass_medical
 		airlock_type = /obj/machinery/door/airlock/medical
 		anchored = 1
 		density = 1

code/game/objects/items/item.dm

@@ -219,6 +219,7 @@
 			O.amount -= 1
 	else if(istype(W,/obj/item/wardrobe))
 		var/obj/item/wardrobe/I = W
+		var/could_fill = 1
 		for (var/obj/O in locate(src.x,src.y,src.z))
 			if (I.contents.len < 20)
 				if(istype(O,/obj/item/wardrobe))
@@ -227,10 +228,14 @@
 					continue
 				I.contents += O;
 			else
-				user << "\blue The wardrobe is full."
-				return
-		user << "\blue You pick up all the items."
-		user.visible_message("\blue [user] gathers up the pile of stuff, and puts it into \the [W]")
+				could_fill = 0
+				break
+
+		if(could_fill)
+			user << "\blue You pick up all the items."
+		else
+			user << "\blue You try to pick up all of the items, but run out of space in the bag."
+		user.visible_message("\blue [user] gathers up[could_fill ? "  " : " most of "]the pile of items and puts it into the [W].")
 		I.update_icon()
 
 /obj/item/attack_self(mob/user as mob)

code/game/objects/items/weapons/cards_ids.dm

@@ -20,7 +20,12 @@ FINGERPRINT CARD
 	icon_state = "emag"
 	item_state = "card-id"
 	origin_tech = "magnets=2;syndicate=2"
+	var/uses = 5
 
+	New()
+		..()
+		uses = rand(3,5)
+		return
 
 // DATA CARDS
 /obj/item/weapon/card/data
@@ -271,7 +276,7 @@ FINGERPRINT CARD
 		var/dat = "<B>Fingerprints on Card</B><HR>"
 		for(var/i = 1, i < (src.fingerprints.len + 1), i++)
 			var/list/L = params2list(src.fingerprints[i])
-			dat += text("[]<BR>", L[1])
+			dat += text("[]<BR>", L["1"])
 			//Foreach goto(41)
 		return dat
 	else

code/game/objects/items/weapons/manuals.dm

@@ -929,7 +929,7 @@
 /obj/item/weapon/book/manual/detective
 	name = "The Film Noir: Proper Procedures for Investigations"
 	icon_state ="bookHacking"
-	author = "Nanotrasen"
+	author = "NanoTrasen"
 
 	dat = {"<html>
 <head>

code/game/objects/secstorage/secstorage.dm

@@ -93,7 +93,13 @@
 
 /obj/item/weapon/secstorage/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
-	if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (src.locked == 1) && (!src.emagged))
+	if ((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (src.locked == 1) && (!src.emagged))
+		if(istype(W, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = W
+			if(E.uses)
+				E.uses--
+			else
+				return
 		emagged = 1
 		src.overlays += image('storage.dmi', icon_sparking)
 		sleep(6)

code/game/objects/storage/crates.dm

@@ -258,6 +258,12 @@
 		overlays += redlight
 		return
 	else if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && locked &&!broken)
+		if(istype(W, /obj/item/weapon/card/emag))
+			var/obj/item/weapon/card/emag/E = W
+			if(E.uses)
+				E.uses--
+			else
+				return
 		overlays = null
 		overlays += emag
 		overlays += sparks

code/game/objects/storage/lockbox.dm

@@ -34,6 +34,12 @@
 			else
 				user << "\red Access Denied"
 		else if((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && !src.broken)
+			if(istype(W, /obj/item/weapon/card/emag))
+				var/obj/item/weapon/card/emag/E = W
+				if(E.uses)
+					E.uses--
+				else
+					return
 			broken = 1
 			locked = 0
 			desc = "It appears to be broken."