cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-22 12:46:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9043 from Ilysen/interact-message

Browse Source 
Add interact_message proc for more flexible visible messages between two parties
This commit is contained in:
Atermonera
2023-03-13 23:56:41 -08:00
committed by GitHub
parent 7b35dc7e9e 7e4040e76b
commit 43c76279c7
2 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/flash.dm
+22 -6
View File
@@ -216,18 +216,34 @@
sleep(5)
qdel(animation)
var/datum/gender/TT = gender_datums[M.get_visible_gender()]
if(!flashfail)
flick("flash2", src)
if(!issilicon(M))
user.visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
M.interact_message(user,
SPAN_DANGER("\The [user] blinds \the [M] with \the [src]!"),
SPAN_DANGER("\The [user] blinds you with \the [src]!"),
SPAN_DANGER("You blind \the [M] with \the [src]!"),
SPAN_DANGER("\The [user] blinds [TT.himself] with \the [src]!"),
SPAN_DANGER("You blind yourself with \the [src]! Why?")
)
else
user.visible_message("<span class='notice'>[user] overloads [M]'s sensors with the flash!</span>")
M.interact_message(user,
SPAN_DANGER("\The [user] overloads \the [M]'s sensors with \the [src]!"),
SPAN_DANGER("\The [user] overloads your sensors with \the [src]!"),
SPAN_DANGER("You overload \the [M]'s sensors with \the [src]!"),
SPAN_DANGER("\The [user] overloads [TT.his] own sensors with \the [src]!"),
SPAN_DANGER("You overload your own sensors with \the [src]! Why?")
)
M.Weaken(rand(5,10))
else
user.visible_message("<span class='notice'>[user] fails to blind [M] with the flash!</span>")
M.interact_message(user,
SPAN_DANGER("\The [user] fails to blind \the [M] with \the [src]!"),
SPAN_DANGER("\The [user] fails to blind you with \the [src]!"),
SPAN_DANGER("You fail to blind \the [M] with \the [src]!"),
SPAN_DANGER("\The [user] fails to blind [TT.himself] with \the [src]!"),
SPAN_DANGER("You fail to blind yourself with \the [src]!"),
)
return