cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +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 21:03:44 +10:00
committed by GitHub
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/datums/uplink_items/uplink_general.dm
+7
View File
@@ -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