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 6631ebe296d..bd6bdba6635 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ