diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm
index 2043febdb6..1a736cd74f 100644
--- a/code/datums/datacore.dm
+++ b/code/datums/datacore.dm
@@ -361,7 +361,7 @@
clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
- if("Captain")
+ if("Station Administrator")
clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
if("Head of Security")
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index 291cef4682..ddf88533e1 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -87,7 +87,7 @@ var/global/list/PDA_Manifest = list()
heads[++heads.len] = list("name" = name, "rank" = rank, "active" = isactive)
department = 1
depthead = 1
- if(rank=="Captain" && heads.len != 1)
+ if(rank=="Station Administrator" && heads.len != 1)
heads.Swap(1,heads.len)
if(real_rank in security_positions)
diff --git a/code/game/antagonist/mutiny/mutineer.dm b/code/game/antagonist/mutiny/mutineer.dm
index c0d764b3be..eb341e36cf 100644
--- a/code/game/antagonist/mutiny/mutineer.dm
+++ b/code/game/antagonist/mutiny/mutineer.dm
@@ -6,7 +6,7 @@ var/datum/antagonist/mutineer/mutineers
role_text_plural = "Mutineers"
id = MODE_MUTINEER
antag_indicator = "mutineer"
- restricted_jobs = list("Captain")
+ restricted_jobs = list("Station Administrator")
/datum/antagonist/mutineer/New(var/no_reference)
..()
@@ -39,7 +39,7 @@ var/datum/antagonist/mutineer/mutineers
proc/get_head_loyalist_candidates()
var/list/candidates[0]
for(var/mob/loyalist in player_list)
- if(loyalist.mind && loyalist.mind.assigned_role == "Captain")
+ if(loyalist.mind && loyalist.mind.assigned_role == "Station Administrator")
candidates.Add(loyalist.mind)
return candidates
@@ -47,7 +47,7 @@ var/datum/antagonist/mutineer/mutineers
var/list/candidates[0]
for(var/mob/mutineer in player_list)
if(mutineer.client.prefs.be_special & BE_MUTINEER)
- for(var/job in command_positions - "Captain")
+ for(var/job in command_positions - "Station Administrator")
if(mutineer.mind && mutineer.mind.assigned_role == job)
candidates.Add(mutineer.mind)
return candidates
diff --git a/code/game/antagonist/outsider/ert.dm b/code/game/antagonist/outsider/ert.dm
index 29ea3d27c1..658e32e4aa 100644
--- a/code/game/antagonist/outsider/ert.dm
+++ b/code/game/antagonist/outsider/ert.dm
@@ -13,7 +13,7 @@ var/datum/antagonist/ert/ert
and before taking extreme actions, please try to also contact the administration! \
Think through your actions and make the roleplay immersive! Please remember all \
rules aside from those without explicit exceptions apply to the ERT."
- leader_welcome_text = "As leader of the Emergency Response Team, you answer only to the Company, and have authority to override the Captain where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the captain where possible, however."
+ leader_welcome_text = "As leader of the Emergency Response Team, you answer only to the Company, and have authority to override the Station Administrator where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the Station Administrator where possible, however."
landmark_id = "Response Team"
id_type = /obj/item/weapon/card/id/centcom/ERT
diff --git a/code/game/antagonist/station/changeling.dm b/code/game/antagonist/station/changeling.dm
index 044e968f49..686de4d818 100644
--- a/code/game/antagonist/station/changeling.dm
+++ b/code/game/antagonist/station/changeling.dm
@@ -6,7 +6,7 @@
bantype = "changeling"
feedback_tag = "changeling_objective"
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Station Administrator")
welcome_text = "Use say \"#g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them."
flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
antaghud_indicator = "hudchangeling"
diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm
index 6bb049dcb0..d3ba6c1ad7 100644
--- a/code/game/antagonist/station/cultist.dm
+++ b/code/game/antagonist/station/cultist.dm
@@ -11,7 +11,7 @@ var/datum/antagonist/cultist/cult
role_text = "Cultist"
role_text_plural = "Cultists"
bantype = "cultist"
- restricted_jobs = list("Chaplain","AI", "Cyborg", "Internal Affairs Agent", "Head of Security", "Captain")
+ restricted_jobs = list("Chaplain","AI", "Cyborg", "Internal Affairs Agent", "Head of Security", "Station Administrator")
protected_jobs = list("Security Officer", "Warden", "Detective")
role_type = BE_CULTIST
feedback_tag = "cult_objective"
diff --git a/code/game/antagonist/station/revolutionary.dm b/code/game/antagonist/station/revolutionary.dm
index 96e3752991..d2efe7262b 100644
--- a/code/game/antagonist/station/revolutionary.dm
+++ b/code/game/antagonist/station/revolutionary.dm
@@ -29,7 +29,7 @@ var/datum/antagonist/revolutionary/revs
faction_indicator = "rev"
faction_invisible = 1
- restricted_jobs = list("Internal Affairs Agent", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
+ restricted_jobs = list("Internal Affairs Agent", "AI", "Cyborg", "Station Administrator", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
protected_jobs = list("Security Officer", "Warden", "Detective")
/datum/antagonist/revolutionary/New()
diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm
index acc0bd3d8d..ae8925be47 100644
--- a/code/game/antagonist/station/traitor.dm
+++ b/code/game/antagonist/station/traitor.dm
@@ -3,7 +3,7 @@ var/datum/antagonist/traitor/traitors
// Inherits most of its vars from the base datum.
/datum/antagonist/traitor
id = MODE_TRAITOR
- protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Captain")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Station Administrator")
flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
/datum/antagonist/traitor/auto
diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm
index 8905d5fd9a..c904571608 100755
--- a/code/game/area/Space Station 13 areas.dm
+++ b/code/game/area/Space Station 13 areas.dm
@@ -1137,7 +1137,7 @@ area/space/atmosalert()
sound_env = MEDIUM_SOFTFLOOR
/area/crew_quarters/captain
- name = "\improper Command - Captain's Office"
+ name = "\improper Command - Station Administrator's Office"
icon_state = "captain"
sound_env = MEDIUM_SOFTFLOOR
diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm
index 4bf9e808dd..797dddc874 100644
--- a/code/game/gamemodes/events.dm
+++ b/code/game/gamemodes/events.dm
@@ -301,9 +301,9 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE")
if(5)
M << "
"
- M << "THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED"
+ M << "THE STATION ADMINISTRATOR, HOP AND HOS ARE [who2]...LAWS UPDATED"
M << "
"
- M.add_ion_law("THE CAPTAIN, HOP AND HOS ARE [who2]")
+ M.add_ion_law("THE STATION ADMINISTRATOR, HOP AND HOS ARE [who2]")
if(6)
M << "
"
M << "THE STATION IS BUILT FOR [who2]...LAWS UPDATED"
diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 4c390e7c69..7c1f422987 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -288,7 +288,7 @@ var/global/datum/controller/gameticker/ticker
var/captainless=1
for(var/mob/living/carbon/human/player in player_list)
if(player && player.mind && player.mind.assigned_role)
- if(player.mind.assigned_role == "Captain")
+ if(player.mind.assigned_role == "Station Administrator")
captainless=0
if(!player_is_antag(player.mind, only_offstation_roles = 1))
job_master.EquipRank(player, player.mind.assigned_role, 0)
@@ -297,7 +297,7 @@ var/global/datum/controller/gameticker/ticker
if(captainless)
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player))
- M << "Captainship not forced on anyone."
+ M << "Station Administratorship not forced on anyone."
proc/process()
diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index be9f9a1321..c091a599c3 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -69,7 +69,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
faction = "Station"
total_positions = 1
spawn_positions = 1
- supervisors = "the captain"
+ supervisors = "the station administrator"
selection_color = "#2F2F7F"
idtype = /obj/item/weapon/card/id/silver
alt_titles = list("Crew Resources Officer")
diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm
index 1a9351496e..53c642b816 100644
--- a/code/game/jobs/job/engineering.dm
+++ b/code/game/jobs/job/engineering.dm
@@ -7,7 +7,7 @@
faction = "Station"
total_positions = 1
spawn_positions = 1
- supervisors = "the captain"
+ supervisors = "the station administrator"
selection_color = "#7F6E2C"
idtype = /obj/item/weapon/card/id/engineering/head
req_admin_notify = 1
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index 4a58377fc7..69a94f0ade 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -7,7 +7,7 @@
faction = "Station"
total_positions = 1
spawn_positions = 1
- supervisors = "the captain"
+ supervisors = "the station administrator"
selection_color = "#026865"
idtype = /obj/item/weapon/card/id/medical/head
req_admin_notify = 1
diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm
index 7055aa7cb3..2866388a41 100644
--- a/code/game/jobs/job/science.dm
+++ b/code/game/jobs/job/science.dm
@@ -7,7 +7,7 @@
faction = "Station"
total_positions = 1
spawn_positions = 1
- supervisors = "the captain"
+ supervisors = "the station administrator"
selection_color = "#AD6BAD"
idtype = /obj/item/weapon/card/id/science/head
req_admin_notify = 1
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 04adecc322..384b595b0e 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -7,7 +7,7 @@
faction = "Station"
total_positions = 1
spawn_positions = 1
- supervisors = "the captain"
+ supervisors = "the station administrator"
selection_color = "#8E2929"
idtype = /obj/item/weapon/card/id/security/head
req_admin_notify = 1
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 0eb2025450..255c90a163 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -429,9 +429,9 @@ var/global/datum/controller/occupations/job_master
return H.Robotize()
if("AI")
return H
- if("Captain")
+ if("Station Administrator")
var/sound/announce_sound = (ticker.current_state <= GAME_STATE_SETTING_UP)? null : sound('sound/misc/boatswain.ogg', volume=20)
- captain_announcement.Announce("All hands, Captain [H.real_name] on deck!", new_sound=announce_sound)
+ captain_announcement.Announce("All hands, Station Administrator [H.real_name] on deck!", new_sound=announce_sound)
//Deferred item spawning.
if(spawn_in_storage && spawn_in_storage.len)
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index 35026659dd..61324580ff 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -51,7 +51,7 @@ var/list/assistant_occupations = list(
var/list/command_positions = list(
- "Captain",
+ "Station Administrator",
"Head of Personnel",
"Head of Security",
"Chief Engineer",
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index 6868f23343..eda3a3b799 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -496,7 +496,7 @@ What a mess.*/
temp += "
| Command | " - jobs_all += "||
| Special | "//Captain in special because he is head of heads ~Intercross21 - jobs_all += "Captain | " + jobs_all += "|
| Special | "//Station Administrator in special because he is head of heads ~Intercross21 + jobs_all += "Station Administrator | " jobs_all += "Custom | " counter = 0 diff --git a/code/game/machinery/computer3/computers/security.dm b/code/game/machinery/computer3/computers/security.dm index e6f19b8588..a335cf1c73 100644 --- a/code/game/machinery/computer3/computers/security.dm +++ b/code/game/machinery/computer3/computers/security.dm @@ -513,7 +513,7 @@ What a mess.*/ temp += "