Merge branch 'master' of https://github.com/SkyMarshal/Baystation12 into Sky

Conflicts:
	maps/tgstation.2.0.8.dmm

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 ..()