cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 02:57:48 +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/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
+5 -4
View File
@@ -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