Merge pull request #6172 from mistyLuminescence/contacts

Makeover Kit

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

@@ -87,4 +87,26 @@
 				text = "guy"
 			if(FEMALE)
 				text = "lady"
-	user.visible_message("<span class='notice'>[user] uses [src] to comb their hair with incredible style and sophistication. What a [text].</span>")
+	user.visible_message("<span class='notice'>[user] uses [src] to comb their hair with incredible style and sophistication. What a [text].</span>")
+
+/obj/item/weapon/makeover
+	name = "makeover kit"
+	desc = "A tiny case containing a mirror and some contact lenses."
+	w_class = ITEMSIZE_TINY
+	icon = 'icons/obj/items.dmi'
+	icon_state = "trinketbox"
+	var/list/ui_users = list()
+
+/obj/item/weapon/makeover/attack_self(mob/living/carbon/user as mob)
+	if(ishuman(user))
+		to_chat(user, "<span class='notice'>You flip open \the [src] and begin to adjust your appearance.</span>")
+		var/datum/nano_module/appearance_changer/AC = ui_users[user]
+		if(!AC)
+			AC = new(src, user)
+			AC.name = "SalonPro Porta-Makeover Deluxe&trade;"
+			ui_users[user] = AC
+		AC.ui_interact(user)
+		var/mob/living/carbon/human/H = user
+		var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES]
+		if(istype(E))
+			E.change_eye_color()

code/game/objects/items/weapons/storage/wallets.dm

@@ -35,7 +35,8 @@
 		/obj/item/weapon/tool/screwdriver,
 		/obj/item/weapon/stamp,
 		/obj/item/clothing/accessory/permit,
-		/obj/item/clothing/accessory/badge
+		/obj/item/clothing/accessory/badge,
+		/obj/item/weapon/makeover
 		)
 	cant_hold = list(/obj/item/weapon/tool/screwdriver/power)
 	slot_flags = SLOT_ID