Merge with dev.

code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm

@@ -23,5 +23,6 @@
 		new /obj/item/clothing/head/greenbandana(src)
 		new /obj/item/weapon/minihoe(src)
 		new /obj/item/weapon/hatchet(src)
+		new /obj/item/weapon/wirecutters/clippers(src)
 //		new /obj/item/weapon/bee_net(src) //No more bees, March 2014
 		return

code/game/objects/structures/mirror.dm

@@ -64,3 +64,32 @@
 	else
 		user.visible_message("<span class='danger'>[user] hits [src] and bounces off!</span>")
 	return 1
+
+// The following mirror is ~special~.
+/obj/structure/mirror/raider
+	name = "cracked mirror"
+	desc = "Something seems strange about this old, dirty mirror. Your reflection doesn't look like you remember it."
+	icon_state = "mirror_broke"
+	shattered = 1
+
+/obj/structure/mirror/raider/attack_hand(var/mob/living/carbon/human/user)
+	if(istype(get_area(src),/area/syndicate_mothership))
+		if(istype(user) && user.mind && user.mind.special_role == "Raider" && user.species != "Vox" && is_alien_whitelisted(user, "Vox"))
+			var/choice = input("Do you wish to become a Vox? This is not reversible.") as null|anything in list("No","Yes")
+			if(choice && choice == "Yes")
+				var/mob/living/carbon/human/vox/vox = new(get_turf(src),"Vox")
+				vox.gender = user.gender
+				raiders.equip(vox)
+				if(user.mind)
+					user.mind.transfer_to(vox)
+				spawn(1)
+					var/newname = input(vox,"Enter a name, or leave blank for the default name.", "Name change","") as text
+					newname = sanitize(newname)
+					if(!newname || newname == "")
+						var/datum/language/L = all_languages[vox.species.default_language]
+						newname = L.get_random_name()
+					vox.real_name = newname
+					vox.name = vox.real_name
+					raiders.update_access(vox)
+				del(user)
+	..()

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -105,21 +105,33 @@
 		overlays -= armrest
 
 /obj/structure/bed/chair/comfy/brown
-	color = rgb(255,113,0)
+	color = rgb(141,70,0)
+
+/obj/structure/bed/chair/comfy/red
+	color = rgb(218,2,10)
+
+/obj/structure/bed/chair/comfy/teal
+	color = rgb(0,234,250)
+
+/obj/structure/bed/chair/comfy/black
+	color = rgb(60,60,60)
+
+/obj/structure/bed/chair/comfy/green
+	color = rgb(1,196,8)
+
+/obj/structure/bed/chair/comfy/purp
+	color = rgb(112,2,176)
+
+/obj/structure/bed/chair/comfy/blue
+	color = rgb(2,9,210)
 
 /obj/structure/bed/chair/comfy/beige
 	color = rgb(255,253,195)
 
-/obj/structure/bed/chair/comfy/teal
-	color = rgb(0,255,255)
-
 /obj/structure/bed/chair/office
 	anchored = 0
 	buckle_movable = 1
 
-/obj/structure/bed/chair/comfy/black
-	color = rgb(167,164,153)
-
 /obj/structure/bed/chair/comfy/lime
 	color = rgb(255,251,0)
 

code/game/objects/structures/under_wardrobe.dm

@@ -3,7 +3,7 @@
 	desc = "Holds item of clothing you shouldn't be showing off in the hallways."
 	icon = 'icons/obj/closet.dmi'
 	icon_state = "cabinet_closed"
-
+	density = 1
 
 /obj/structure/undies_wardrobe/attack_hand(mob/user as mob)
 	src.add_fingerprint(user)