cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fix radiation examine message ordering (#2311)

Browse Source 
* Fix radiation examine message ordering (#55696)

When examining radioactive game objects, the message about their
radiation levels, such as "The air around the screwdriver feels warm",
or "The air around the uranium statue feels warm, and it hurts to look
at." will now be printed after the main body of the examine text.

The examine signal was being used to trigger `to_chat` calls, causing
the radiation message to be sent before the main examine text, "That's a
large statue of a pig."

The pronouns of the text have also been tweaked, so examining the
radiation of a pair of gloves, or a man will produce appropriate
messages.

* Fix radiation examine message ordering

Co-authored-by: coiax <yellowbounder@gmail.com>
This commit is contained in:
SkyratBot
2020-12-24 23:58:29 +01:00
committed by GitHub
co-authored by coiax
parent f8d0ecf9eb
commit c6f7c02137
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/radioactive.dm
+13 -10
View File
@@ -67,24 +67,27 @@
else
strength = max(strength, _strength)
/datum/component/radioactive/proc/rad_examine(datum/source, mob/user, atom/thing)
/datum/component/radioactive/proc/rad_examine(datum/source, mob/user, list/out)
SIGNAL_HANDLER
var/atom/master = parent
var/list/out = list()
var/list/fragments = list()
if(get_dist(master, user) <= 1)
out += "The air around [master] feels warm"
fragments += "The air around [master] feels warm"
switch(strength)
if(0 to RAD_AMOUNT_LOW)
if(length(fragments))
fragments += "."
if(RAD_AMOUNT_LOW to RAD_AMOUNT_MEDIUM)
out += "[length(out) ? " and it " : "[master] "]feels weird to look at."
fragments += "[length(fragments) ? " and [master.p_they()] " : "[master] "]feel[master.p_s()] weird to look at."
if(RAD_AMOUNT_MEDIUM to RAD_AMOUNT_HIGH)
out += "[length(out) ? " and it " : "[master] "]seems to be glowing a bit."
fragments += "[length(fragments) ? " and [master.p_they()] " : "[master] "]seem[master.p_s()] to be glowing a bit."
if(RAD_AMOUNT_HIGH to INFINITY) //At this level the object can contaminate other objects
out += "[length(out) ? " and it " : "[master] "]hurts to look at."
if(!LAZYLEN(out))
return
out += "."
to_chat(user, "<span class ='warning'>[out.Join()]</span>")
fragments += "[length(fragments) ? " and [master.p_they()] " : "[master] "]hurt[master.p_s()] to look at."
if(length(fragments))
out += "<span class='warning'>[fragments.Join()]</span>"
/datum/component/radioactive/proc/rad_attack(datum/source, atom/movable/target, mob/living/user)
SIGNAL_HANDLER