mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
handheld mirror traitor item (#22042)
* Adds handheld mirror item and adds it to traitor items * Adjusted cost for economy refactor * Revert "Adjusted cost for economy refactor" This reverts commitf31cbae8be. * 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 commit3b2531f509. * 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:
@@ -523,6 +523,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
|
||||
item = /obj/item/storage/box/syndie_kit/safecracking
|
||||
cost = 5
|
||||
|
||||
/datum/uplink_item/stealthy_tools/handheld_mirror
|
||||
name = "Hand Held Mirror"
|
||||
desc = "A pocket sized mirror. Allows you to change all your hair and facial features, from color to style, instantly while in your hand."
|
||||
reference = "HM"
|
||||
item = /obj/item/handheld_mirror
|
||||
cost = 5
|
||||
|
||||
// DEVICE AND TOOLS
|
||||
|
||||
/datum/uplink_item/device_tools
|
||||
|
||||
@@ -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 ..()
|
||||
|
||||
@@ -322,13 +322,14 @@
|
||||
if(istype(chosen, /obj/structure/mirror))
|
||||
var/obj/structure/mirror/M = chosen
|
||||
M.obj_break("brute")
|
||||
else if(istype(chosen, /obj/item/shield/mirror))
|
||||
else if(istype(chosen, /obj/item/shield/mirror) || istype(chosen, /obj/item/handheld_mirror))
|
||||
var/turf/T = get_turf(usr)
|
||||
new /obj/effect/temp_visual/cult/sparks(T)
|
||||
playsound(T, 'sound/effects/glassbr3.ogg', 100)
|
||||
if(isliving(chosen.loc))
|
||||
var/mob/living/shatterer = loc
|
||||
shatterer.Weaken(6 SECONDS)
|
||||
for(var/mob/living/L in T)
|
||||
if(L == usr)
|
||||
continue
|
||||
L.Weaken(6 SECONDS)
|
||||
qdel(chosen)
|
||||
|
||||
#undef HERALD_TRISHOT
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 185 KiB After Width: | Height: | Size: 185 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 168 KiB After Width: | Height: | Size: 183 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 338 B |
Reference in New Issue
Block a user