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

merge conflict fixes for chat filters PR

Browse Source
This commit is contained in:
Seris02
2023-03-09 17:19:02 +08:00
parent dd1e58acc7
commit 0cdc45eddf
40 changed files with 128 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+1 -5
View File
@@ -892,11 +892,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
lighting_alpha = darkness_levels[index]
updateghostsight()
<<<<<<< HEAD
to_chat(src, "Your vision now has [darkness_names[index]].")
=======
to_chat(src, "<span class='filter_notice'>You [seedarkness ? "now" : "no longer"] see darkness.</span>")
>>>>>>> 75577bd3ca9... cleans up so many to_chats so they use vchat filters, unsorted chat filter for everything else (#9006)
to_chat(src, "<span class='filter_notice'>Your vision now has [darkness_names[index]].</span>")
/mob/observer/dead/proc/updateghostsight()
plane_holder.set_desired_alpha(VIS_LIGHTING, lighting_alpha)