Lotsa stuff. Map update.

code/WorkInProgress/Mini/customitems.dm

@@ -6,6 +6,7 @@
 var/list/CustomItemList = list(
 		//    ckey        real_name   item path
 	//	list("miniature","Dave Booze",/obj/item/toy/crayonbox)	//screw this i dont want crayons, it's an example okay
+	list("skymarshal", "Phillip Oswald", /obj/item/weapon/coin/silver)	//Phillip likes to chew on cigars.  Just unlit cigars, don't ask me why.  Must be a clone thing.  (Cigarette machines dispense cigars if they have a coin in them)  --SkyMarshal
 	)
 
 /proc/EquipCustomItems(mob/living/carbon/human/M)

code/WorkInProgress/SkyMarshal/coatrack.dm

@@ -65,7 +65,7 @@
 	if ( istype(I,/obj/item/clothing/suit/storage/det_suit) && coat)
 		user << "There's already a coat on the rack!"
 		return ..()
-	user << "The coatrack wants none of what you offer."
+	user << "The coat rack wants none of what you offer."
 	return ..()
 
 

code/game/machinery/camera.dm

@@ -287,9 +287,9 @@
 	user.reset_view(src)
 
 /obj/machinery/camera/attackby(W as obj, user as mob)
-	..()
 	if (istype(W, /obj/item/weapon/wirecutters))
 		deactivate(user)
+		..()
 	else if (istype(W, /obj/item/weapon/paper))
 		var/obj/item/weapon/paper/X = W
 		user << "You hold a paper up to the camera ..."
@@ -307,6 +307,7 @@
 		if(src.status)
 			user << "\red You can't dismantle a camera while it is active."
 		else
+			..()
 			user << "\blue Dismantling camera..."
 			if(do_after(user, 20))
 				var/obj/item/weapon/chem_grenade/case = new /obj/item/weapon/chem_grenade(src.loc)
@@ -322,15 +323,19 @@
 				del(src)
 	else if (istype(W, /obj/item/weapon/camera_bug))
 		if (!src.status)
+			..()
 			user << "\blue Camera non-functional"
 			return
 		if (src.bugged)
+			..()
 			user << "\blue Camera bug removed."
 			src.bugged = 0
 		else
+			..()
 			user << "\blue Camera bugged."
 			src.bugged = 1
 	else if(istype(W, /obj/item/weapon/melee/energy/blade))//Putting it here last since it's a special case. I wonder if there is a better way to do these than type casting.
+		..()
 		deactivate(user,2)//Here so that you can disconnect anyone viewing the camera, regardless if it's on or off.
 		var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 		spark_system.set_up(5, 0, loc)

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

@@ -53,8 +53,8 @@
 	if (src.contents.len > 0)
 		var/obj/item/I = src.contents[1]
 		user << "You take the [I] out of the [src]."
-		I.loc = user.loc
 		src.underlays -= I
+		I.loc = get_turf(user.loc)
 		w_class = 1
 		src.icon_state = "evidenceobj"
 		desc = "An empty evidence bag."

code/modules/mob/living/carbon/human/emote.dm

@@ -271,12 +271,12 @@
 				m_type = 2
 
 		if ("mumble")
-			message = "<B>[src]</B> mumbles!"
+			message = "<B>[src]</B> mumbles."
 			m_type = 2
 
 		if ("grumble")
 			if (!muzzled)
-				message = "<B>[src]</B> grumbles!"
+				message = "<B>[src]</B> grumbles."
 				m_type = 2
 			else
 				message = "<B>[src]</B> makes a noise."