Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/datums/organs/organ_internal.dm
	code/datums/vote.dm
	code/defines/atom.dm
	code/defines/procs/gamehelpers.dm
	code/defines/turf.dm
	code/game/algorithm.dm
	code/game/cellautomata.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/electricchair.dm
	code/game/turfs/turf.dm
	code/game/vote.dm
	code/hub.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client defines.dm
	code/modules/food/food.dm
	code/modules/food/meat.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/login.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/photocopier.dm
	code/setup.dm
	icons/effects/genetics.dmi
	interface/interface.dm
	interface/skin.dmf
	maps/RandomZLevels/fileList.txt

various misc mergefixes and todos

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

code/modules/paperwork/filingcabinet.dm

@@ -7,7 +7,6 @@
 	var/icon_open = "filing_cabinet1"
 	density = 1
 	anchored = 1
-	var/list/items = new/list()
 
 /obj/structure/filingcabinet/chestdrawer
 	name = "chest drawer"
@@ -20,27 +19,33 @@
 	icon_closed = "filingcabinet"
 	icon_open = "filingcabinet-open"
 
+/obj/structure/filingcabinet/initialize()
+	for(var/obj/item/I in loc)
+		if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/folder) || istype(I, /obj/item/weapon/photo))
+			I.loc = src
+
 /obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob)
-	if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder))
-		user << "<span class='notice'>You put the [P] in \the [src].</span>"
+	if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo))
+		user << "<span class='notice'>You put [P] in [src].</span>"
 		user.drop_item()
 		P.loc = src
-		spawn()
-			icon_state = icon_open
-			sleep(5)
-			icon_state = icon_closed
+		icon_state = icon_open
+		sleep(5)
+		icon_state = icon_closed
+		updateUsrDialog()
 	else if(istype(P, /obj/item/weapon/wrench))
 		playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
 		anchored = !anchored
 		user << "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>"
 	else
-		user << "<span class='notice'>You can't put a [P] in \the [src]!</span>"
+		user << "<span class='notice'>You can't put [P] in [src]!</span>"
 
 /obj/structure/filingcabinet/attack_hand(mob/user as mob)
 	if(contents.len <= 0)
 		user << "<span class='notice'>\The [src] is empty.</span>"
 		return
 
+	user.machine = src
 	var/dat = "<center><table>"
 	var/i
 	for(i=contents.len, i>=1, i--)
@@ -57,12 +62,9 @@
 
 		//var/retrieveindex = text2num(href_list["retrieve"])
 		var/obj/item/P = locate(href_list["retrieve"])//contents[retrieveindex]
-		if(!isnull(P) && in_range(src,usr))
-			if(!usr.get_active_hand())
-				usr.put_in_hands(P)
-			else
-				P.loc = get_turf_loc(src)
-
+		if(P && in_range(src, usr))
+			usr.put_in_hands(P)
+			updateUsrDialog()
 			icon_state = icon_open
 			sleep(5)
 			icon_state = icon_closed

code/modules/paperwork/folders.dm

@@ -63,11 +63,7 @@
 			var/obj/item/P = locate(href_list["remove"])
 			if(P)
 				P.loc = usr.loc
-				if(ishuman(usr))
-					if(!usr.get_active_hand())
-						usr.put_in_hands(P)
-				else
-					P.loc = get_turf(usr)
+				usr.put_in_hands(P)
 
 		if(href_list["read"])
 			var/obj/item/weapon/paper/P = locate(href_list["read"])

code/modules/paperwork/photocopier.dm

@@ -11,6 +11,7 @@
 	active_power_usage = 200
 	power_channel = EQUIP
 	var/obj/item/weapon/paper/copy = null	//what's in the copier!
+	var/obj/item/weapon/photo/photocopy = null
 	var/copies = 1	//how many copies to print!
 	var/toner = 30 //how much toner is left! woooooo~
 	var/maxcopies = 10	//how many copies can be copied at once- idea shamelessly stolen from bs12's copier!
@@ -25,7 +26,7 @@
 		user.machine = src
 
 		var/dat = "Photocopier<BR><BR>"
-		if(copy)
+		if(copy || photocopy)
 			dat += "<a href='byond://?src=\ref[src];remove=1'>Remove Paper</a><BR>"
 			if(toner)
 				dat += "<a href='byond://?src=\ref[src];copy=1'>Copy</a><BR>"
@@ -64,15 +65,36 @@
 					else
 						break
 				updateUsrDialog()
+			else if(photocopy)
+				for(var/i = 0, i < copies, i++)
+					if(toner > 0)
+						var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (src.loc)
+						var/icon/I = icon(photocopy.icon, photocopy.icon_state)
+						if(toner > 10)	//plenty of toner, go straight greyscale
+							I.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))		//I'm not sure how expensive this is, but given the many limitations of photocopying, it shouldn't be an issue.
+						else			//not much toner left, lighten the photo
+							I.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(100,100,100))
+						p.icon = I
+						p.name = photocopy.name
+						p.desc = photocopy.desc
+						toner -= 5	//photos use a lot of ink!
+						sleep(15)
+					else
+						break
+				updateUsrDialog()
 		else if(href_list["remove"])
 			if(copy)
-				if(ishuman(usr))
-					if(!usr.get_active_hand())
-						copy.loc = usr.loc
-						usr.put_in_hands(copy)
-						usr << "<span class='notice'>You take the paper out of the photocopier.</span>"
-						copy = null
-						updateUsrDialog()
+				copy.loc = usr.loc
+				usr.put_in_hands(copy)
+				usr << "<span class='notice'>You take the paper out of \the [src].</span>"
+				copy = null
+				updateUsrDialog()
+			else if(photocopy)
+				photocopy.loc = usr.loc
+				usr.put_in_hands(photocopy)
+				usr << "<span class='notice'>You take the photo out of \the [src].</span>"
+				photocopy = null
+				updateUsrDialog()
 		else if(href_list["min"])
 			if(copies > 1)
 				copies--
@@ -84,7 +106,7 @@
 
 	attackby(obj/item/O as obj, mob/user as mob)
 		if(istype(O, /obj/item/weapon/paper))
-			if(!copy)
+			if(!copy && !photocopy)
 				user.drop_item()
 				copy = O
 				O.loc = src
@@ -92,7 +114,17 @@
 				flick("bigscanner1", src)
 				updateUsrDialog()
 			else
-				user << "<span class='notice'>There is already paper in \the [src].</span>"
+				user << "<span class='notice'>There is already something in \the [src].</span>"
+		else if(istype(O, /obj/item/weapon/photo))
+			if(!copy && !photocopy)
+				user.drop_item()
+				photocopy = O
+				O.loc = src
+				user << "<span class='notice'>You insert the photo into \the [src].</span>"
+				flick("bigscanner1", src)
+				updateUsrDialog()
+			else
+				user << "<span class='notice'>There is already something in \the [src].</span>"
 		else if(istype(O, /obj/item/device/toner))
 			if(toner == 0)
 				user.drop_item()