From 84718134064a72af5c621fa2b9225f3ab3281bf4 Mon Sep 17 00:00:00 2001 From: Chinsky Date: Thu, 7 Jan 2016 21:17:31 +0300 Subject: [PATCH] Adds a handheld mirror that can change hairstyles. --- code/game/objects/structures/mirror.dm | 19 ++++++++++++++++++- code/modules/client/preferences_gear.dm | 6 ++++++ icons/obj/items.dmi | Bin 63219 -> 63473 bytes 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index aced90f9bb6..52fb76eb4ca 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -30,7 +30,7 @@ /obj/structure/mirror/bullet_act(var/obj/item/projectile/Proj) - + if(prob(Proj.get_structure_damage() * 2)) if(!shattered) shatter() @@ -91,3 +91,20 @@ raiders.update_access(vox) qdel(user) ..() + +/obj/item/weapon/mirror + name = "mirror" + desc = "A SalonPro Nano-Mirror(TM) brand mirror! Now a portable version." + icon = 'icons/obj/items.dmi' + icon_state = "mirror" + var/list/ui_users = list() + +/obj/item/weapon/mirror/attack_self(mob/user as mob) + if(ishuman(user)) + var/datum/nano_module/appearance_changer/AC = ui_users[user] + if(!AC) + AC = new(src, user) + AC.name = "SalonPro Nano-Mirror™" + AC.flags = APPEARANCE_HAIR + ui_users[user] = AC + AC.ui_interact(user) \ No newline at end of file diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 40cd37094dd..dfc26cb7c6a 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -1233,6 +1233,12 @@ var/global/list/gear_datums = list() sort_category = "misc" cost = 1 +/datum/gear/mirror + display_name = "handheld mirror" + path = /obj/item/weapon/mirror + sort_category = "misc" + cost = 1 + /datum/gear/zippo display_name = "zippo" path = /obj/item/weapon/flame/lighter/zippo diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 6631ebe296d39b3306e0f6b6ae865622f71b7204..bd6bdba66355bd47836f6c5eef563777eb10a154 100644 GIT binary patch delta 5900 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 delta 5644 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 u