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

Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

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

code/modules/paperwork/paperbin.dm

@@ -44,14 +44,10 @@
 					P.updateinfolinks()
 
 		P.loc = user.loc
-		if(ishuman(user))
-			user.put_in_hands(P)
-			user << "<span class='notice'>You take a paper out of the bin.</span>"
-		else
-			P.loc = get_turf_loc(src)
-			user << "<span class='notice'>You take a paper out of the bin.</span>"
+		user.put_in_hands(P)
+		user << "<span class='notice'>You take [P] out of the [src].</span>"
 	else
-		user << "<span class='notice'>The paper bin is empty!</span>"
+		user << "<span class='notice'>[src] is empty!</span>"
 
 	add_fingerprint(user)
 	return
@@ -63,7 +59,7 @@
 
 	user.drop_item()
 	i.loc = src
-	usr << "<span class='notice'>You put the paper on the top of the paper bin.</span>"
+	user << "<span class='notice'>You put [i] in [src].</span>"
 	papers.Add(i)
 	amount++