Skip to content

Commit

Permalink
Updates Headset Message Options (#2198)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request


![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/9752fe8c-ebc7-4aa4-8178-aa1230ee864f)


![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/0de32684-82ef-4f39-865a-321ca5d7f747)


![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/5f4a33cb-af56-4032-b10f-299360bdb554)

Adds more options to the headset message verb so admins can message
players' respective faction without relying on CentCom or narrating,
such as Inteq Risk Management, the Syndicate's many branches, and the
Minutemen.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
We have more factions than just the Syndicate and NanoTrasen now, and
it's best to use something more specific than CentCom for contacting
players on, say, a CMM ship.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
admin: There are more options to headset messages, including Inteq, CMM,
and multiple Syndicate branches.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: meemofcourse <75212565+meemofcourse@users.noreply.github.com>
Co-authored-by: Mark Suckerberg <mark@suckerberg.gay>
  • Loading branch information
meemofcourse and MarkSuckerberg authored Jul 28, 2023
1 parent d2998c1 commit af7b547
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions code/modules/admin/verbs/randomverbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,18 @@
return

if (!sender)
sender = input("Who is the message from?", "Sender") as null|anything in list(RADIO_CHANNEL_CENTCOM,RADIO_CHANNEL_SYNDICATE,RADIO_CHANNEL_SOLGOV) //WS Edit - SolGov Rep
sender = input("Who is the message from?", "Sender") as null|anything in list(RADIO_CHANNEL_CENTCOM, RADIO_CHANNEL_SYNDICATE, RADIO_CHANNEL_SOLGOV, RADIO_CHANNEL_INTEQ, RADIO_CHANNEL_MINUTEMEN) //WS Edit - SolGov Rep
if(!sender)
return
switch(sender)
if (RADIO_CHANNEL_SYNDICATE)
sender = input("From what branch?", "Syndicate") as null|anything in list("Syndicate High Command", "The Anti-Corporation Liberation Front", "The Gorlex Marauders", "Donk! Corporation", "Cybersun Virtual Solutions", "The Galactic Engineer's Concordat", "The Naturalienwissenschaftlicher Studentenverbindungs-Verband")
if (RADIO_CHANNEL_MINUTEMEN)
sender = input("From what division?", "Minutemen") as null|anything in list("Colonial Minutemen Headquarters", "The Galactic Optium Labor Divison", "The Biohazard Assesment and Removal Division")
if (RADIO_CHANNEL_INTEQ)
sender = "Inteq Risk Management"
if(!sender)
return

message_admins("[key_name_admin(src)] has started answering [key_name_admin(H)]'s [sender] request.")
var/input = input("Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from [sender]", "") as text|null
if(!input)
Expand All @@ -77,7 +85,7 @@

log_directed_talk(mob, H, input, LOG_ADMIN, "reply")
message_admins("[key_name_admin(src)] replied to [key_name_admin(H)]'s [sender] message with: \"[input]\"")
to_chat(H, "<span class='hear'>You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender == RADIO_CHANNEL_SYNDICATE ? "your benefactor" : sender]. Message as follows[sender == "Syndicate" ? ", agent." : ":"] <b>[input].</b> Message ends.\"</span>", confidential = TRUE) //WS Edit - SolGov Rep
to_chat(H, "<span class='hear'>You hear something crackle in your ears for a moment before a voice speaks. \"Please stand by for a message from [sender]. Message as follows: <b>[input].</b> Message ends.\"</span>", confidential = TRUE) //WS Edit - SolGov Rep

SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

Expand Down

0 comments on commit af7b547

Please sign in to comment.