Fixes related to syndicate maid clothes and accessories, adds the syn…

…dicate maid kit as a 20 TC uplink item (#2480)

code/modules/clothing/under/_under.dm

@@ -140,7 +140,12 @@
 				to_chat(user, "<span class='notice'>You attach [I] to [src].</span>")
 
 			var/accessory_color = attached_accessory.icon_state
-			accessory_overlay = mutable_appearance('icons/mob/accessories.dmi', "[accessory_color]")
+			// NSV13 starts here - Checks if accessory is NSV exclusive
+			if(icon_exists('nsv13/icons/mob/accessories.dmi', accessory_color))
+				accessory_overlay = mutable_appearance('nsv13/icons/mob/accessories.dmi', "[accessory_color]")
+			else
+				accessory_overlay = mutable_appearance('icons/mob/accessories.dmi', "[accessory_color]")
+			// NSV13 ends here
 			accessory_overlay.alpha = attached_accessory.alpha
 			accessory_overlay.color = attached_accessory.color
 

nsv13/code/game/objects/items/storage_items.dm

@@ -37,11 +37,17 @@
 	new /obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull( src )
 	new /obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull( src )
 
-/obj/item/storage/box/beakers/large_mix
-	name = "box of beakers"
-	illustration = "beaker"
+/obj/item/storage/box/syndie_kit/maid/PopulateContents()
+	new /obj/item/clothing/head/maidheadband/syndicate(src)
+	new /obj/item/clothing/under/syndicate/maid(src)
+	new /obj/item/clothing/gloves/combat/maid(src)
+	new /obj/item/clothing/accessory/maidapron/syndicate(src)
+	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/soap/syndie(src)
+	new /obj/item/reagent_containers/glass/bucket(src)
+	new /obj/item/mop/sharp(src)
 
-/obj/item/storage/box/beakers/PopulateContents()
+/obj/item/storage/box/beakers/large_mix/PopulateContents()
 	for(var/i in 1 to 2)
 		new /obj/item/reagent_containers/glass/beaker/large( src )
 	for(var/i in 1 to 5)

nsv13/code/modules/clothing/custom_clothes.dm

@@ -824,12 +824,12 @@
 	icon = 'nsv13/icons/obj/clothing/gloves.dmi'
 	worn_icon = 'nsv13/icons/mob/hands.dmi'
 	icon_state = "syndimaid_arms"
+	worn_icon_state = "syndimaid_arms"
 	item_state = "syndimaid_arms"
 
 /obj/item/clothing/accessory/maidapron/syndicate
 	name = "syndicate maid apron"
 	desc = "Practical? No. Tactical? Also no. Cute? Most definitely yes."
-	icon = 'nsv13/icons/obj/clothing/accessories.dmi'
-	worn_icon = 'nsv13/icons/mob/accessories.dmi'
+	icon = 'nsv13/icons/mob/accessories.dmi'
 	icon_state = "maidapronsynd"
 	item_state = "maidapronsynd"

nsv13/code/modules/uplink/uplink_items.dm

@@ -13,3 +13,13 @@
 	item = /obj/item/gun/ballistic/rifle/boltaction/pdc
 	cost = 12
 	restricted_roles = list(JOB_NAME_MUNITIONSTECHNICIAN,JOB_NAME_MASTERATARMS)
+
+/datum/uplink_item/badass/maid
+	name = "Emergency Maid Kit"
+	desc = "A kit containing everything you need to become a proper syndicate maid. \
+			Contains a maid outfit, a mop, a bucket and a bar of soap. \
+			Because you never know when you might need to clean up a mess."
+	item = /obj/item/storage/box/syndie_kit/maid
+	cost = 20
+	cant_discount = TRUE
+	surplus = 0