-
Notifications
You must be signed in to change notification settings - Fork 523
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
More features and tweaks for broadcasting (#6115)
# About the pull request Turned out that through cameras you can only see speech that you already see without cameras. So I quickly found a way to fix it with the least (for me) amount of crap code. # Explain why it's good for the game That's pretty much the point of broadcasting. # Testing Photographs and Procedure <details> ![2024-04-08_09-56-41](https://github.com/cmss13-devs/cmss13/assets/115417687/f7b28bd6-571b-4c4e-8c5c-337f25ea8b6e) ![Screenshot_2024-04-10_01-35-26](https://github.com/cmss13-devs/cmss13/assets/115417687/35b6cce1-ed2e-4270-973a-6e4387540ae2) ![Screenshot_2024-04-10_01-56-08](https://github.com/cmss13-devs/cmss13/assets/115417687/0bcab79b-2fb2-4364-91db-84f73bd58f24) ![Screenshot_2024-04-10_04-14-50](https://github.com/cmss13-devs/cmss13/assets/115417687/e85bb1a6-6642-4db1-a505-50e01248085a) </details> # Changelog :cl: ihatethisengine add: Combat Correspondent can broadcast speech and emotes. add: Speech close enough to the camera will be shown above connected TVs as abovehead messages /:cl: --------- Co-authored-by: Drathek <[email protected]>
- Loading branch information
1 parent
7e962fb
commit 9512952
Showing
10 changed files
with
134 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
//If in view and within view distance | ||
GLOBAL_DATUM_INIT(in_view, /datum/ui_state/in_view, new) | ||
/datum/ui_state/in_view/can_use_topic(src_object, mob/user) | ||
return user.in_view_can_use_topic(src_object) // Call the individual mob-overridden procs. | ||
|
||
/mob/proc/in_view_can_use_topic(src_object) | ||
return UI_CLOSE // Don't allow interaction by default. | ||
|
||
/mob/ghost/in_view_can_use_topic(src_object) | ||
return UI_UPDATE //ghost can just watch | ||
|
||
/mob/living/in_view_can_use_topic(src_object) | ||
. = shared_ui_interaction(src_object) | ||
if(. > UI_CLOSE && loc) //must not be in nullspace. | ||
. = min(., shared_living_ui_in_view(src_object)) // Check the distance and view... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters