Merge pull request #11933 from comma/mirrormirror

Handheld mirror
This commit is contained in:
GinjaNinja32
2016-01-08 22:09:22 +00:00
4 changed files with 39 additions and 4 deletions
+32 -1
View File
@@ -30,7 +30,7 @@
/obj/structure/mirror/bullet_act(var/obj/item/projectile/Proj)
if(prob(Proj.get_structure_damage() * 2))
if(!shattered)
shatter()
@@ -64,6 +64,13 @@
user.visible_message("<span class='danger'>[user] hits [src] and bounces off!</span>")
return 1
/obj/structure/mirror/Destroy()
for(var/user in ui_users)
var/datum/nano_module/appearance_changer/AC = ui_users[user]
qdel(AC)
ui_users.Cut()
..()
// The following mirror is ~special~.
/obj/structure/mirror/raider
name = "cracked mirror"
@@ -91,3 +98,27 @@
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&trade;"
AC.flags = APPEARANCE_HAIR
ui_users[user] = AC
AC.ui_interact(user)
/obj/item/weapon/mirror/Destroy()
for(var/user in ui_users)
var/datum/nano_module/appearance_changer/AC = ui_users[user]
qdel(AC)
ui_users.Cut()
..()