cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-22 20:47:56 +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/vore/resizing/resize_vr.dm
+3 -3
View File
@@ -236,9 +236,9 @@
tmob_message = tail.msg_owner_stepunder
if(src_message)
to_chat(src, STEP_TEXT_OWNER(src_message))
to_chat(src, "<span class='filter_notice'>[STEP_TEXT_OWNER(src_message)]</span>")
if(tmob_message)
to_chat(tmob, STEP_TEXT_PREY(tmob_message))
to_chat(tmob, "<span class='filter_notice'>[STEP_TEXT_PREY(tmob_message)]</span>")
return TRUE
return FALSE
@@ -398,7 +398,7 @@
set category = "IC"
pickup_active = !pickup_active
to_chat(src, "You will [pickup_active ? "now" : "no longer"] attempt to pick up mobs when clicking them with help intent.")
to_chat(src, "<span class='filter_notice'>You will [pickup_active ? "now" : "no longer"] attempt to pick up mobs when clicking them with help intent.</span>")
#undef STEP_TEXT_OWNER
#undef STEP_TEXT_PREY