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

Conflicts:
	baystation12.dme
	code/game/gamemodes/events.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/gateway.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/sound.dm
	code/global.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/handlabeler.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/photocopier.dm
	code/modules/paperwork/stamps.dm
	code/world.dm
	html/changelog.html
	maps/RandomZLevels/fileList.txt

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

code/defines/obj.dm

@@ -192,38 +192,37 @@
 	var/d1 = 0
 	var/d2 = 1
 	layer = 2.44 //Just below unary stuff, which is at 2.45 and above pipes, which are at 2.4
-	var/color="red"
+	var/color = "red"
 	var/obj/structure/powerswitch/power_switch
 
 /obj/structure/cable/yellow
-	color="yellow"
+	color = "yellow"
 	icon = 'icons/obj/power_cond_yellow.dmi'
 
 /obj/structure/cable/green
-	color="green"
+	color = "green"
 	icon = 'icons/obj/power_cond_green.dmi'
 
 /obj/structure/cable/blue
-	color="blue"
+	color = "blue"
 	icon = 'icons/obj/power_cond_blue.dmi'
 
 /obj/structure/cable/pink
-	color="pink"
+	color = "pink"
 	icon = 'icons/obj/power_cond_pink.dmi'
 
 /obj/structure/cable/orange
-	color="orange"
+	color = "orange"
 	icon = 'icons/obj/power_cond_orange.dmi'
 
 /obj/structure/cable/cyan
-	color="cyan"
+	color = "cyan"
 	icon = 'icons/obj/power_cond_cyan.dmi'
 
 /obj/structure/cable/white
-	color="white"
+	color = "white"
 	icon = 'icons/obj/power_cond_white.dmi'
 
-
 /obj/effect/projection
 	name = "Projection"
 	desc = "This looks like a projection of something."

code/defines/obj/weapon.dm

@@ -1153,18 +1153,6 @@
 	throw_range = 15
 	attack_verb = list("banned")
 
-/obj/item/weapon/pen/sleepypen
-	desc = "It's a normal black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
-	slot_flags = SLOT_BELT
-	origin_tech = "materials=2;biotech=1;syndicate=7"
-
-/obj/item/weapon/pen/paralysis
-	desc = "It's a normal black ink pen with a sharp point."
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
-	slot_flags = SLOT_BELT
-	origin_tech = "materials=2;biotech=1;syndicate=5"
-
 /obj/item/weapon/rack_parts
 	name = "rack parts"
 	desc = "Parts of a rack."

code/defines/procs/helper_list.dm

@@ -286,4 +286,22 @@ proc/listclearnulls(list/list)
 
 	if(Li <= L.len)
 		return (result + L.Copy(Li, 0))
-	return (result + R.Copy(Ri, 0))
+	return (result + R.Copy(Ri, 0))
+
+
+//Converts a bitfield to a list of numbers (or words if a wordlist is provided)
+/proc/bitfield2list(bitfield = 0, list/wordlist)
+	var/list/r = list()
+	if(istype(wordlist,/list))
+		var/max = min(wordlist.len,16)
+		var/bit = 1
+		for(var/i=1, i<=max, i++)
+			if(bitfield & bit)
+				r += wordlist[i]
+			bit = bit << 1
+	else
+		for(var/bit=1, bit<=65535, bit = bit << 1)
+			if(bitfield & bit)
+				r += bit
+
+	return r

code/defines/procs/helpers.dm

@@ -327,8 +327,8 @@ Turf and target are seperate in case you want to teleport some distance from a t
 			if(isAI(src))
 				var/mob/living/silicon/ai/A = src
 				oldname = null//don't bother with the records update crap
-				world << "<b>[newname] is the AI!</b>"
-				world << sound('sound/AI/newAI.ogg')
+				//world << "<b>[newname] is the AI!</b>"
+				//world << sound('sound/AI/newAI.ogg')
 				// Set eyeobj name
 				if(A.eyeobj)
 					A.eyeobj.name = "[newname] (AI Eye)"