Skip to content

Commit

Permalink
Fix runtimes when sending messages for ERT objectives (#6085)
Browse files Browse the repository at this point in the history
# About the pull request

This PR fixes ERTs that were sending objectives to the player using an
incorrect proc reference.

# Explain why it's good for the game

Objectives are intended to be given to the player.

Fixes 

![image](https://github.com/cmss13-devs/cmss13/assets/76988376/27a4f149-5d7c-436e-a501-c49f414db878)


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/cmss13-devs/cmss13/assets/76988376/20ab18c6-87e7-4765-a55a-88093ebb23e9)

</details>

# Changelog
:cl: Drathek
fix: Fixed objectives not getting displayed for CMB and cultist ERTs.
/:cl:
  • Loading branch information
Drulikar authored Apr 6, 2024
1 parent 724f306 commit 0657af9
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions code/datums/emergency_calls/cmb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

print_backstory(mob)

addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)


/datum/emergency_call/cmb/print_backstory(mob/living/carbon/human/M)
Expand Down Expand Up @@ -160,7 +160,7 @@

print_backstory(mob)

addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)


/datum/emergency_call/cmb/anchorpoint/print_backstory(mob/living/carbon/human/M)
Expand Down
4 changes: 2 additions & 2 deletions code/datums/emergency_calls/inspection.dm
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@

print_backstory(mob)

addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)


/datum/emergency_call/inspection_cmb/print_backstory(mob/living/carbon/human/M)
Expand Down Expand Up @@ -341,4 +341,4 @@

print_backstory(mob)

addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)
2 changes: 1 addition & 1 deletion code/datums/emergency_calls/xeno_cultists.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
arm_equipment(H, /datum/equipment_preset/other/xeno_cultist, TRUE, TRUE)
print_backstory(H)

addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), H, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS)
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), H, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS)

0 comments on commit 0657af9

Please sign in to comment.