cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various TG Chat message sorting fixes (#25229)

Browse Source 
* Fixes unsorted emotes, announcements, votes, surgery, prayers, ahelp responses

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
S34N
2024-04-29 03:07:25 +01:00
committed by GitHub
parent 4add53d6c1
commit 2e4089dc15
28 changed files with 368 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/core_removal.dm
+7 -6
View File
@@ -22,17 +22,17 @@
time = 1.6 SECONDS
/datum/surgery_step/slime/cut_flesh/begin_step(mob/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
user.visible_message("[user] starts cutting through [target]'s flesh with \the [tool].", "You start cutting through [target]'s flesh with \the [tool].")
user.visible_message("[user] starts cutting through [target]'s flesh with \the [tool].", "You start cutting through [target]'s flesh with \the [tool].", chat_message_type = MESSAGE_TYPE_COMBAT)
return ..()
/datum/surgery_step/slime/cut_flesh/end_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
user.visible_message("<span class='notice'> [user] cuts through [target]'s flesh with \the [tool].</span>",
"<span class='notice'> You cut through [target]'s flesh with \the [tool], revealing its silky innards.</span>")
"<span class='notice'> You cut through [target]'s flesh with \the [tool], revealing its silky innards.</span>", chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_CONTINUE
/datum/surgery_step/slime/cut_flesh/fail_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'> [user]'s hand slips, tearing [target]'s flesh with \the [tool]!</span>", \
"<span class='warning'> Your hand slips, tearing [target]'s flesh with \the [tool]!</span>")
"<span class='warning'> Your hand slips, tearing [target]'s flesh with \the [tool]!</span>", chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_RETRY
/datum/surgery_step/slime/extract_core
@@ -43,7 +43,8 @@
/datum/surgery_step/slime/extract_core/begin_step(mob/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
user.visible_message(
"<span class='notice'>[user] begins to extract a core from [target].</span>",
"<span class='notice'>You begin to extract a core from [target]...</span>"
"<span class='notice'>You begin to extract a core from [target]...</span>",
chat_message_type = MESSAGE_TYPE_COMBAT
)
return ..()
@@ -52,7 +53,7 @@
if(slime.cores > 0)
slime.cores--
user.visible_message("<span class='notice'>[user] successfully extracts a core from [slime]!</span>",
"<span class='notice'>You successfully extract a core from [slime]. [slime.cores] core\s remaining.</span>")
"<span class='notice'>You successfully extract a core from [slime]. [slime.cores] core\s remaining.</span>", chat_message_type = MESSAGE_TYPE_COMBAT)
new slime.coretype(slime.loc)
@@ -67,5 +68,5 @@
/datum/surgery_step/slime/extract_core/fail_step(mob/living/user, mob/living/simple_animal/slime/target, target_zone, obj/item/tool)
user.visible_message("<span class='warning'> [user]'s hand slips, tearing [target]'s flesh with \the [tool]!</span>", \
"<span class='warning'> Your hand slips, tearing [target]'s flesh with \the [tool]!</span>")
"<span class='warning'> Your hand slips, tearing [target]'s flesh with \the [tool]!</span>", chat_message_type = MESSAGE_TYPE_COMBAT)
return SURGERY_STEP_RETRY