cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

handheld mirror traitor item (#22042)

Browse Source 
* Adds handheld mirror item and adds it to traitor items

* Adjusted cost for economy refactor

* Revert "Adjusted cost for economy refactor"

This reverts commit f31cbae8be.

* actually adjusts properly

* Update code/game/objects/items/devices/traitordevices.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* removes redundant proc

* Adds inhand sprite and adds herald cloak functionality

* Revert "Adds inhand sprite and adds herald cloak functionality"

This reverts commit 3b2531f509.

* undoes the toolboxdmi change

* REMOVES CODER SPRITE FROM DEVICES

* fixes a runtime

herald cloak would runtime when teleporting to a person holding a mirror object in hand/pocket

* stuns anyone holding a mirror when jaunted through

* fixes merge conflict and changes uplink description

* mergeconflict

* actually fixes mconflict

* please bro just fix the conflict bro please

* Fixpls

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
This commit is contained in:
tristan1333
2023-09-19 12:03:44 +01:00
committed by GitHub
co-authored by GDN
parent 7c238c1d6a
commit 5028f63cd7
6 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/traitordevices.dm
+25
View File
@@ -405,3 +405,28 @@
times_used = max_uses - 1
activate_batterer()
/obj/item/handheld_mirror
name = "hand mirror"
desc = "Style, on the go!"
icon = 'icons/obj/hhmirror.dmi'
icon_state = "hhmirror"
w_class = WEIGHT_CLASS_TINY
var/datum/ui_module/appearance_changer/appearance_changer_holder
/obj/item/handheld_mirror/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state)
appearance_changer_holder.ui_interact(user, ui_key, ui, force_open, master_ui, state = GLOB.hands_state)
/obj/item/handheld_mirror/attack_self(mob/user)
if(ishuman(user))
appearance_changer_holder = new(src, user)
ui_interact(user)
/obj/item/handheld_mirror/Initialize(mapload)
. = ..()
GLOB.mirrors += src
/obj/item/handheld_mirror/Destroy()
GLOB.mirrors -= src
QDEL_NULL(appearance_changer_holder)
return ..()