Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Antagonist welcome Sounds #486

Merged
merged 6 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/game/antagonist/antagonist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@
Think through your actions and make the roleplay immersive! <b>Please remember all \
rules aside from those without explicit exceptions apply to antagonists.</b>"

/// Sound to play when a player becomes an antagonist
var/welcome_sound = null

// Map template that antag needs to load before spawning. Nulled after it's loaded.
var/datum/map_template/base_to_load

Expand Down
4 changes: 3 additions & 1 deletion code/game/antagonist/antagonist_create.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@

// Basic intro text.
to_chat(player.current, "<span class='danger'><font size=3>You are a [role_text]!</font></span>")
if(welcome_sound)
sound_to(player.current, welcome_sound)
if(leader_welcome_text && player == leader)
to_chat(player.current, "<span class='antagdesc'>[get_leader_welcome_text(player.current)]</span>")
else
Expand All @@ -75,7 +77,7 @@

/datum/antagonist/proc/set_antag_name(var/mob/living/player)
// Choose a name, if any.
var/newname = sanitize(input(player, "You are a [role_text]. Would you like to change your name to something else?", "Name change") as null|text, MAX_NAME_LEN)
var/newname = sanitizeName(input(player, "You are a [role_text]. Would you like to change your name to something else?", "Name change") as null|text, MAX_NAME_LEN, TRUE)
if (newname)
player.real_name = newname
player.SetName(player.real_name)
Expand Down
1 change: 1 addition & 0 deletions code/game/antagonist/outsider/commando.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ GLOBAL_DATUM_INIT(commandos, /datum/antagonist/deathsquad/mercenary, new)
welcome_text = "You are in the employ of a criminal syndicate hostile to corporate interests."
id_type = /obj/item/card/id/centcom/ERT
flags = ANTAG_RANDOM_EXCEPTED
welcome_sound = 'sound/misc/antag_alerts/operative_alert.ogg'

hard_cap = 4
hard_cap_round = 8
Expand Down
1 change: 1 addition & 0 deletions code/game/antagonist/outsider/deathsquad.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ GLOBAL_DATUM_INIT(deathsquad, /datum/antagonist/deathsquad, new)
flags = ANTAG_OVERRIDE_JOB | ANTAG_OVERRIDE_MOB | ANTAG_HAS_LEADER | ANTAG_RANDOM_EXCEPTED
default_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)
antaghud_indicator = "huddeathsquad"
welcome_sound = 'sound/misc/antag_alerts/operative_alert.ogg'

hard_cap = 4
hard_cap_round = 8
Expand Down
1 change: 1 addition & 0 deletions code/game/antagonist/outsider/mercenary.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ GLOBAL_DATUM_INIT(mercs, /datum/antagonist/mercenary, new)
welcome_text = "To speak on the strike team's private channel use :t."
flags = ANTAG_VOTABLE | ANTAG_OVERRIDE_JOB | ANTAG_OVERRIDE_MOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_SET_APPEARANCE | ANTAG_HAS_LEADER
antaghud_indicator = "hudoperative"
welcome_sound = 'sound/misc/antag_alerts/operative_alert.ogg'

hard_cap = 4
hard_cap_round = 8
Expand Down
3 changes: 2 additions & 1 deletion code/game/antagonist/outsider/wizard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ GLOBAL_DATUM_INIT(wizards, /datum/antagonist/wizard, new)
welcome_text = "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.<br>In your pockets you will find a teleport scroll. Use it as needed."
flags = ANTAG_OVERRIDE_JOB | ANTAG_OVERRIDE_MOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_CHOOSE_NAME | ANTAG_VOTABLE | ANTAG_SET_APPEARANCE
antaghud_indicator = "hudwizard"
welcome_sound = 'sound/misc/antag_alerts/wizard_alert.ogg'

hard_cap = 1
hard_cap_round = 3
Expand Down Expand Up @@ -125,4 +126,4 @@ Made a proc so this is not repeated 14 (or more) times.*/
if(!is_wiz_garb(src.head) && (!species.hud || (slot_head in src.species.hud.equip_slots)))
to_chat(src, "<span class='warning'>I don't feel strong enough without my hat.</span>")
return 0
return 1
return 1
1 change: 1 addition & 0 deletions code/game/antagonist/station/changeling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ GLOBAL_DATUM_INIT(changelings, /datum/antagonist/changeling, new)
blacklisted_jobs = list(/datum/job/ai, /datum/job/cyborg, /datum/job/submap)
protected_jobs = list(/datum/job/officer, /datum/job/warden, /datum/job/detective, /datum/job/captain, /datum/job/hos)
welcome_text = "Use say \"%LANGUAGE_PREFIX%g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them."
welcome_sound = 'sound/misc/antag_alerts/changeling_alert.ogg'
flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
antaghud_indicator = "hudchangeling"

Expand Down
1 change: 1 addition & 0 deletions code/game/antagonist/station/cultist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ GLOBAL_DATUM_INIT(cult, /datum/antagonist/cultist, new)
feedback_tag = "cult_objective"
antag_indicator = "hudcultist"
welcome_text = "You have a tome in your possession; one that will help you start the cult. Use it well and remember - there are others."
welcome_sound = 'sound/misc/antag_alerts/cult_alert.ogg'
victory_text = "The cult wins! It has succeeded in serving its dark masters!"
loss_text = "The staff managed to stop the cult!"
victory_feedback_tag = "win - cult win"
Expand Down
1 change: 1 addition & 0 deletions code/game/antagonist/station/revolutionary.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ GLOBAL_DATUM_INIT(revs, /datum/antagonist/revolutionary, new)
flags = ANTAG_SUSPICIOUS | ANTAG_VOTABLE
antaghud_indicator = "hud_rev"
skill_setter = /datum/antag_skill_setter/station
welcome_sound = 'sound/misc/antag_alerts/revolutionary_alert.ogg'

hard_cap = 2
hard_cap_round = 4
Expand Down
1 change: 1 addition & 0 deletions code/game/antagonist/station/rogue_ai.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ GLOBAL_DATUM_INIT(malf, /datum/antagonist/rogue_ai, new)
mob_path = /mob/living/silicon/ai
landmark_id = "AI"
welcome_text = "You are malfunctioning! You do not have to follow any laws."
welcome_sound = 'sound/misc/antag_alerts/malf_alert.ogg'
victory_text = "The AI has taken control of all systems."
loss_text = "The AI has been shut down!"
flags = ANTAG_VOTABLE | ANTAG_OVERRIDE_MOB | ANTAG_OVERRIDE_JOB | ANTAG_CHOOSE_NAME
Expand Down
1 change: 1 addition & 0 deletions code/game/antagonist/station/traitor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ GLOBAL_DATUM_INIT(traitors, /datum/antagonist/traitor, new)
protected_jobs = list(/datum/job/officer, /datum/job/warden, /datum/job/detective, /datum/job/captain, /datum/job/lawyer, /datum/job/hos)
flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
skill_setter = /datum/antag_skill_setter/station
welcome_sound = 'sound/misc/antag_alerts/traitor_alert.ogg'

/datum/antagonist/traitor/get_extra_panel_options(var/datum/mind/player)
return "<a href='?src=\ref[player];common=crystals'>\[set crystals\]</a><a href='?src=\ref[src];spawn_uplink=\ref[player.current]'>\[spawn uplink\]</a>"
Expand Down
Binary file added sound/misc/antag_alerts/changeling_alert.ogg
Binary file not shown.
Binary file added sound/misc/antag_alerts/cult_alert.ogg
Binary file not shown.
Binary file added sound/misc/antag_alerts/malf_alert.ogg
Binary file not shown.
Binary file added sound/misc/antag_alerts/operative_alert.ogg
Binary file not shown.
Binary file added sound/misc/antag_alerts/revolutionary_alert.ogg
Binary file not shown.
Binary file added sound/misc/antag_alerts/traitor_alert.ogg
Binary file not shown.
Binary file added sound/misc/antag_alerts/wizard_alert.ogg
Binary file not shown.
Loading