Merge pull request #148 from skull132/master

Wintercoats, map and custom items

code/modules/clothing/suits/miscellaneous.dm

@@ -340,3 +340,47 @@
 	icon_state = "swim_red"
 	item_color = "swim_red"
 	siemens_coefficient = 1
+
+/obj/item/clothing/suit/wintercoat
+	name = "Dark Winter Coat"
+	desc = "A soft dark coat, with fur on the edges of the hood."
+	icon_state = "coatdark"
+	item_state = "coatdark"
+
+/obj/item/clothing/suit/wintercoat/white
+	name = "White Winter Coat"
+	desc = "A soft white coat, with fur on the edges of the hood."
+	icon_state = "coatwhite"
+	item_state = "coatwhite"
+
+/obj/item/clothing/suit/wintercoat/verb/toggle()
+	set name = "Toggle wintercoat hood"
+	set category = "Object"
+	set src in usr
+
+	if(!usr.canmove || usr.stat || usr.restrained())
+		return 0
+
+	switch(icon_state)
+		if("coatdark")
+			src.icon_state = "coatdark-hood"
+			usr << "You button up the coat and pull on the hood."
+		if("coatdark-hood")
+			src.icon_state = "coatdark"
+			usr << "You unbutton the coat and pull off the hood."
+		if("coatwhite")
+			src.icon_state = "coatwhite-hood"
+			usr << "You button up the coat and pull on the hood."
+		if("coatwhite-hood")
+			src.icon_state = "coatwhite"
+			usr << "You unbutton the coat and pull off the hood."
+		if("temple_coat")
+			src.icon_state = "temple_coat-hood"
+			usr << "You button up the coat and pull on the hood."
+		if("temple_coat-hood")
+			src.icon_state = "temple_coat"
+			usr << "You unbutton the coat and pull off the hood."
+		else
+			usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are."
+			return
+	usr.update_inv_wear_suit()	//so our overlays update

code/modules/customitems/item_defines.dm

@@ -648,7 +648,7 @@
 	icon_state = "bluepanther"
 	item_state = "bluepanther"
 
-/obj/item/clothing/gloves/fluff/amy_gloves //Red fingerless gloves - Amy Tilley - lk600 - GET SPRITE
+/obj/item/clothing/gloves/fluff/amy_gloves //Red fingerless gloves - Amy Tilley - lk600 - DONE
 	name = "Red fingerless gloves"
 	desc = "A pair of red and black fingerless gloves that stretch up the arm. They look to be made of a soft wool and are well worn."
 	icon = 'icons/obj/custom_items.dmi'
@@ -656,7 +656,7 @@
 	item_state = "amy_gloves"
 	clipped = 1
 
-/obj/item/clothing/tie/storage/fluff/cecillia_locket
+/obj/item/clothing/tie/storage/fluff/cecillia_locket //Old locket - Cecillia Lambert - casperf1 - DONE
 	name = "old locket"
 	desc = "A dark metal locket, it seems at least sixty years old. The photo that was once inside is gone."
 	icon = 'icons/obj/custom_items.dmi'
@@ -697,13 +697,19 @@
 
 /obj/item/clothing/tie/storage/fluff/cecillia_locket/New()
 		..()
-		new /obj/item/weapon/reagent_containers/pill/cecillia_pill(src)
+		new /obj/item/weapon/reagent_containers/pill/cecillia_pill(hold)
 		return
 
-/obj/item/clothing/glasses/regular/fluff/cecillia_glasses
+/obj/item/clothing/glasses/regular/fluff/cecillia_glasses //Red prescription glasses - Cecillia Lamber - casperf1 - DONE
 	name = "red prescription glasses"
 	desc = "These glasses have been prescribed for a terrible pair of eyes."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "cecillia_glasses"
 	item_state = "cecillia_glasses"
 
+/obj/item/clothing/suit/wintercoat/fluff/temple_coat //Red coat - Temple Zorion - deatacita - DONE
+	name = "red coat"
+	desc = "An old red and black winter-coat, there looks to be spots of dried blood on it."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "temple_coat"
+	item_state = "temple_coat"

code/modules/customitems/item_spawning.dm

@@ -96,6 +96,11 @@
 						del(Item)
 						goto skip
 					var/obj/item/device/pda/fluff/meowykins_pda/I = Item
+					if(istype(M.belt,/obj/item/device/pda))
+						for(var/obj/item/device/pda/B in M)
+							del(B)
+							M.belt=null
+						ok = M.equip_if_possible(I, slot_belt,0)
 					if(istype(M.l_store,/obj/item/device/pda))
 						for(var/obj/item/device/pda/B in M)
 							del(B)