Skip to content

Commit

Permalink
Fixes #2352
Browse files Browse the repository at this point in the history
  • Loading branch information
SinTwo committed Aug 27, 2016
1 parent 75ebc54 commit a2a2f58
Show file tree
Hide file tree
Showing 59 changed files with 96 additions and 96 deletions.
2 changes: 1 addition & 1 deletion code/datums/datacore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion code/defines/obj.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions code/game/antagonist/mutiny/mutineer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down Expand Up @@ -39,15 +39,15 @@ 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
proc/get_head_mutineer_candidates()
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
Expand Down
2 changes: 1 addition & 1 deletion code/game/antagonist/outsider/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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! <b>Please remember all \
rules aside from those without explicit exceptions apply to the ERT.</b>"
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

Expand Down
2 changes: 1 addition & 1 deletion code/game/antagonist/station/changeling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/game/antagonist/station/cultist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/game/antagonist/station/revolutionary.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion code/game/antagonist/station/traitor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/area/Space Station 13 areas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions code/game/gamemodes/events.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 << "<br>"
M << "<span class='danger'>THE CAPTAIN, HOP AND HOS ARE [who2]...LAWS UPDATED</span>"
M << "<span class='danger'>THE STATION ADMINISTRATOR, HOP AND HOS ARE [who2]...LAWS UPDATED</span>"
M << "<br>"
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 << "<br>"
M << "<span class='danger'>THE STATION IS BUILT FOR [who2]...LAWS UPDATED</span>"
Expand Down
4 changes: 2 additions & 2 deletions code/game/gamemodes/gameticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/captain.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/science.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/job/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/job_controller.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/jobs/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ What a mess.*/
temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=released'>Released</a></li>"
temp += "</ul>"
if("rank")
var/list/L = list( "Head of Personnel", "Captain", "AI" )
var/list/L = list( "Head of Personnel", "Station Administrator", "AI" )
//This was so silly before the change. Now it actually works without beating your head against the keyboard. /N
if ((istype(active1, /datum/data/record) && L.Find(rank)))
temp = "<h5>Rank:</h5>"
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer/skills.dm
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ What a mess.*/
return
active1.fields["age"] = t1
if("rank")
var/list/L = list( "Head of Personnel", "Captain", "AI" )
var/list/L = list( "Head of Personnel", "Station Administrator", "AI" )
//This was so silly before the change. Now it actually works without beating your head against the keyboard. /N
if ((istype(active1, /datum/data/record) && L.Find(rank)))
temp = "<h5>Rank:</h5>"
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/computer3/computers/card.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
var jobs_all = ""
jobs_all += "<table><tr><td></td><td><b>Command</b></td>"

jobs_all += "</tr><tr height='20'><td><b>Special</b></td>"//Captain in special because he is head of heads ~Intercross21
jobs_all += "<td weight='100'><a href='?src=\ref[src];;assign=Captain'>Captain</a></td>"
jobs_all += "</tr><tr height='20'><td><b>Special</b></td>"//Station Administrator in special because he is head of heads ~Intercross21
jobs_all += "<td weight='100'><a href='?src=\ref[src];;assign=Captain'>Station Administrator</a></td>"
jobs_all += "<td weight='100'><a href='?src=\ref[src];;assign=Custom'>Custom</a></td>"

counter = 0
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/computer3/computers/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ What a mess.*/
temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=released'>Released</a></li>"
temp += "</ul>"
if("rank")
var/list/L = list( "Head of Personnel", "Captain", "AI" )
var/list/L = list( "Head of Personnel", "Station Administrator", "AI" )
//This was so silly before the change. Now it actually works without beating your head against the keyboard. /N
if ((istype(active1, /datum/data/record) && L.Find(rank)))
temp = "<h5>Rank:</h5>"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/radio/encryptionkey.dm
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
channels = list("Command" = 1)

/obj/item/device/encryptionkey/heads/captain
name = "captain's encryption key"
name = "station administrator's encryption key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 0, "Science" = 0, "Medical" = 0, "Supply" = 0, "Service" = 0)

Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/devices/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -158,14 +158,14 @@


/obj/item/device/radio/headset/heads/captain
name = "captain's headset"
name = "station administrator's headset"
desc = "The headset of the boss."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/captain

/obj/item/device/radio/headset/heads/captain/alt
name = "captain's bowman headset"
name = "station administrator's bowman headset"
desc = "The headset of the boss."
icon_state = "com_headset_alt"
item_state = "headset"
Expand Down Expand Up @@ -244,14 +244,14 @@

/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the guy who will one day be captain."
desc = "The headset of the guy who will one day be Station Administrator."
icon_state = "com_headset"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/hop

/obj/item/device/radio/headset/heads/hop/alt
name = "head of personnel's bowman headset"
desc = "The headset of the guy who will one day be captain."
desc = "The headset of the guy who will one day be Station Administrator."
icon_state = "com_headset_alt"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/hop
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,8 @@
icon_state = "botanist"

/obj/item/toy/figure/captain
name = "Captain action figure"
desc = "A \"Space Life\" brand Captain action figure."
name = "Station Administrator action figure"
desc = "A \"Space Life\" brand Station Administrator action figure."
icon_state = "captain"

/obj/item/toy/figure/cargotech
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/weapons/cards_ids.dm
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,12 @@
access = list(access_syndicate, access_external_airlocks)

/obj/item/weapon/card/id/captains_spare
name = "captain's spare ID"
name = "station administrator's spare ID"
desc = "The spare ID of the High Lord himself."
icon_state = "gold"
item_state = "gold_id"
registered_name = "Captain"
assignment = "Captain"
registered_name = "Station Administrator"
assignment = "Station Administrator"
/obj/item/weapon/card/id/captains_spare/New()
access = get_all_station_access()
..()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/dna_injector.dm
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@

/obj/item/weapon/dnainjector/xraymut
name = "\improper DNA injector (Xray)"
desc = "Finally you can see what the Captain does."
desc = "Finally you can see what the Station Administrator does."
datatype = DNA2_BUF_SE
value = 0xFFF
//block = 8
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/grenades/flashbang.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
M.update_icons()

/obj/item/weapon/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve
desc = "Use of this weapon may constiute a war crime in your area, consult your local captain."
desc = "Use of this weapon may constiute a war crime in your area, consult your local Station Administrator."
name = "clusterbang"
icon = 'icons/obj/grenade.dmi'
icon_state = "clusterbang"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/manuals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@

Remember the order:<br>
<b>Disk, Code, Safety, Timer, Disk, RUN!</b><br><br>
Intelligence Analysts believe that normal corporate procedure is for the Captain to secure the nuclear authentication disk.<br><br>
Intelligence Analysts believe that normal corporate procedure is for the Station Administrator to secure the nuclear authentication disk.<br><br>

Good luck!
</body>
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/weapons/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
icon_state = "securitypack"

/obj/item/weapon/storage/backpack/captain
name = "captain's backpack"
name = "station administrator's backpack"
desc = "It's a special backpack made exclusively for officers."
icon_state = "captainpack"

Expand Down Expand Up @@ -154,7 +154,7 @@
icon_state = "duffle_syndieammo"

/obj/item/weapon/storage/backpack/dufflebag/captain
name = "captain's dufflebag"
name = "station administrator's dufflebag"
desc = "A large dufflebag for holding extra captainly goods."
icon_state = "duffle_captain"

Expand Down Expand Up @@ -246,7 +246,7 @@
icon_state = "satchel_hyd"

/obj/item/weapon/storage/backpack/satchel/cap
name = "captain's satchel"
name = "station administrator's satchel"
desc = "An exclusive satchel for officers."
icon_state = "satchel-cap"
item_state_slots = list(slot_r_hand_str = "captainpack", slot_l_hand_str = "captainpack")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/captains
name = "captain's locker"
name = "station administrator's locker"
req_access = list(access_captain)
icon_state = "capsecure1"
icon_closed = "capsecure"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@
return

/obj/structure/closet/wardrobe/captain
name = "captain's wardrobe"
name = "station administrator's wardrobe"
icon_state = "cabinet_closed"
icon_closed = "cabinet_closed"
icon_opened = "cabinet_open"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/newbanjob.dm
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ var/savefile/Banlistjob
bantimestamp = CMinutes + minutes
if(rank == "Heads")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Personnel")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Captain")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Administrator")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Security")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/debug.dm
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
id.icon_state = "gold"
id.access = get_all_accesses()
id.registered_name = H.real_name
id.assignment = "Captain"
id.assignment = "Station Administrator"
id.name = "[id.registered_name]'s ID Card ([id.assignment])"
H.equip_to_slot_or_del(id, slot_wear_id)
H.update_inv_wear_id()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
/datum/gear/accessory/holster
display_name = "holster, armpit"
path = /obj/item/clothing/accessory/holster/armpit
allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
allowed_roles = list("Station Administrator", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")

/datum/gear/accessory/holster/hip
display_name = "holster, hip"
Expand Down

0 comments on commit a2a2f58

Please sign in to comment.