Replaces Station Administrator

This commit is contained in:
Spades
2016-10-06 22:38:02 -04:00
parent 6203c1047f
commit 2330968176
61 changed files with 106 additions and 106 deletions

View File

@@ -361,7 +361,7 @@
clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s") 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/feet.dmi', "white"), ICON_UNDERLAY)
clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY) clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
if("Station Administrator") if("Colony Director")
clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s") clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
if("Head of Security") if("Head of Security")

View File

@@ -87,7 +87,7 @@ var/global/list/PDA_Manifest = list()
heads[++heads.len] = list("name" = name, "rank" = rank, "active" = isactive) heads[++heads.len] = list("name" = name, "rank" = rank, "active" = isactive)
department = 1 department = 1
depthead = 1 depthead = 1
if(rank=="Station Administrator" && heads.len != 1) if(rank=="Colony Director" && heads.len != 1)
heads.Swap(1,heads.len) heads.Swap(1,heads.len)
if(real_rank in security_positions) if(real_rank in security_positions)

View File

@@ -6,7 +6,7 @@ var/datum/antagonist/mutineer/mutineers
role_text_plural = "Mutineers" role_text_plural = "Mutineers"
id = MODE_MUTINEER id = MODE_MUTINEER
antag_indicator = "mutineer" antag_indicator = "mutineer"
restricted_jobs = list("Station Administrator") restricted_jobs = list("Colony Director")
/datum/antagonist/mutineer/New(var/no_reference) /datum/antagonist/mutineer/New(var/no_reference)
..() ..()
@@ -39,7 +39,7 @@ var/datum/antagonist/mutineer/mutineers
proc/get_head_loyalist_candidates() proc/get_head_loyalist_candidates()
var/list/candidates[0] var/list/candidates[0]
for(var/mob/loyalist in player_list) for(var/mob/loyalist in player_list)
if(loyalist.mind && loyalist.mind.assigned_role == "Station Administrator") if(loyalist.mind && loyalist.mind.assigned_role == "Colony Director")
candidates.Add(loyalist.mind) candidates.Add(loyalist.mind)
return candidates return candidates
@@ -47,7 +47,7 @@ var/datum/antagonist/mutineer/mutineers
var/list/candidates[0] var/list/candidates[0]
for(var/mob/mutineer in player_list) for(var/mob/mutineer in player_list)
if(mutineer.client.prefs.be_special & BE_MUTINEER) if(mutineer.client.prefs.be_special & BE_MUTINEER)
for(var/job in command_positions - "Station Administrator") for(var/job in command_positions - "Colony Director")
if(mutineer.mind && mutineer.mind.assigned_role == job) if(mutineer.mind && mutineer.mind.assigned_role == job)
candidates.Add(mutineer.mind) candidates.Add(mutineer.mind)
return candidates return candidates

View File

@@ -13,7 +13,7 @@ var/datum/antagonist/ert/ert
and before taking extreme actions, please try to also contact the administration! \ 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 \ 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>" 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 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." leader_welcome_text = "As leader of the Emergency Response Team, you answer only to the Company, and have authority to override the Colony Director where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the Colony Director where possible, however."
landmark_id = "Response Team" landmark_id = "Response Team"
id_type = /obj/item/weapon/card/id/centcom/ERT id_type = /obj/item/weapon/card/id/centcom/ERT

View File

@@ -6,7 +6,7 @@
bantype = "changeling" bantype = "changeling"
feedback_tag = "changeling_objective" feedback_tag = "changeling_objective"
restricted_jobs = list("AI", "Cyborg") restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Station Administrator") protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Colony Director")
welcome_text = "Use say \"#g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them." 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 flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
antaghud_indicator = "hudchangeling" antaghud_indicator = "hudchangeling"

View File

@@ -11,7 +11,7 @@ var/datum/antagonist/cultist/cult
role_text = "Cultist" role_text = "Cultist"
role_text_plural = "Cultists" role_text_plural = "Cultists"
bantype = "cultist" bantype = "cultist"
restricted_jobs = list("Chaplain","AI", "Cyborg", "Internal Affairs Agent", "Head of Security", "Station Administrator") restricted_jobs = list("Chaplain","AI", "Cyborg", "Internal Affairs Agent", "Head of Security", "Colony Director")
protected_jobs = list("Security Officer", "Warden", "Detective") protected_jobs = list("Security Officer", "Warden", "Detective")
role_type = BE_CULTIST role_type = BE_CULTIST
feedback_tag = "cult_objective" feedback_tag = "cult_objective"
@@ -110,13 +110,13 @@ var/datum/antagonist/cultist/cult
. = ..() . = ..()
if(.) if(.)
player << "You catch a glimpse of the Realm of Nar-Sie, the Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of That Which Waits. Assist your new compatriots in their dark dealings. Their goals are yours, and yours are theirs. You serve the Dark One above all else. Bring It back." player << "You catch a glimpse of the Realm of Nar-Sie, the Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of That Which Waits. Assist your new compatriots in their dark dealings. Their goals are yours, and yours are theirs. You serve the Dark One above all else. Bring It back."
if(player.current && !istype(player.current, /mob/living/simple_animal/construct)) if(player.current && !istype(player.current, /mob/living/simple_animal/construct))
player.current.add_language(LANGUAGE_CULT) player.current.add_language(LANGUAGE_CULT)
/datum/antagonist/cultist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted) /datum/antagonist/cultist/remove_antagonist(var/datum/mind/player, var/show_message, var/implanted)
. = ..() . = ..()
if(. && player.current && !istype(player.current, /mob/living/simple_animal/construct)) if(. && player.current && !istype(player.current, /mob/living/simple_animal/construct))
player.current.remove_language(LANGUAGE_CULT) player.current.remove_language(LANGUAGE_CULT)
/datum/antagonist/cultist/can_become_antag(var/datum/mind/player) /datum/antagonist/cultist/can_become_antag(var/datum/mind/player)
if(!..()) if(!..())

View File

@@ -29,7 +29,7 @@ var/datum/antagonist/revolutionary/revs
faction_indicator = "rev" faction_indicator = "rev"
faction_invisible = 1 faction_invisible = 1
restricted_jobs = list("Internal Affairs Agent", "AI", "Cyborg", "Station Administrator", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") restricted_jobs = list("Internal Affairs Agent", "AI", "Cyborg", "Colony Director", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
protected_jobs = list("Security Officer", "Warden", "Detective") protected_jobs = list("Security Officer", "Warden", "Detective")
/datum/antagonist/revolutionary/New() /datum/antagonist/revolutionary/New()

View File

@@ -3,9 +3,9 @@ var/datum/antagonist/traitor/traitors
// Inherits most of its vars from the base datum. // Inherits most of its vars from the base datum.
/datum/antagonist/traitor /datum/antagonist/traitor
id = MODE_TRAITOR id = MODE_TRAITOR
protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Station Administrator") protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Colony Director")
flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
/datum/antagonist/traitor/auto /datum/antagonist/traitor/auto
id = MODE_AUTOTRAITOR id = MODE_AUTOTRAITOR
allow_latejoin = 1 allow_latejoin = 1

View File

@@ -1140,7 +1140,7 @@ area/space/atmosalert()
sound_env = MEDIUM_SOFTFLOOR sound_env = MEDIUM_SOFTFLOOR
/area/crew_quarters/captain /area/crew_quarters/captain
name = "\improper Command - Station Administrator's Office" name = "\improper Command - Colony Director's Office"
icon_state = "captain" icon_state = "captain"
sound_env = MEDIUM_SOFTFLOOR sound_env = MEDIUM_SOFTFLOOR

View File

@@ -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") M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE")
if(5) if(5)
M << "<br>" M << "<br>"
M << "<span class='danger'>THE STATION ADMINISTRATOR, HOP AND HOS ARE [who2]...LAWS UPDATED</span>" M << "<span class='danger'>THE COLONY DIRECTOR, HOP AND HOS ARE [who2]...LAWS UPDATED</span>"
M << "<br>" M << "<br>"
M.add_ion_law("THE STATION ADMINISTRATOR, HOP AND HOS ARE [who2]") M.add_ion_law("THE COLONY DIRECTOR, HOP AND HOS ARE [who2]")
if(6) if(6)
M << "<br>" M << "<br>"
M << "<span class='danger'>THE STATION IS BUILT FOR [who2]...LAWS UPDATED</span>" M << "<span class='danger'>THE STATION IS BUILT FOR [who2]...LAWS UPDATED</span>"

View File

@@ -288,7 +288,7 @@ var/global/datum/controller/gameticker/ticker
var/captainless=1 var/captainless=1
for(var/mob/living/carbon/human/player in player_list) for(var/mob/living/carbon/human/player in player_list)
if(player && player.mind && player.mind.assigned_role) if(player && player.mind && player.mind.assigned_role)
if(player.mind.assigned_role == "Station Administrator") if(player.mind.assigned_role == "Colony Director")
captainless=0 captainless=0
if(!player_is_antag(player.mind, only_offstation_roles = 1)) if(!player_is_antag(player.mind, only_offstation_roles = 1))
job_master.EquipRank(player, player.mind.assigned_role, 0) job_master.EquipRank(player, player.mind.assigned_role, 0)
@@ -297,7 +297,7 @@ var/global/datum/controller/gameticker/ticker
if(captainless) if(captainless)
for(var/mob/M in player_list) for(var/mob/M in player_list)
if(!istype(M,/mob/new_player)) if(!istype(M,/mob/new_player))
M << "Station Administratorship not forced on anyone." M << "Colony Directorship not forced on anyone."
proc/process() proc/process()

View File

@@ -564,7 +564,7 @@ datum
captainslaser captainslaser
steal_target = /obj/item/weapon/gun/energy/captain steal_target = /obj/item/weapon/gun/energy/captain
explanation_text = "Steal the station administrator's antique laser gun." explanation_text = "Steal the Colony Director's antique laser gun."
weight = 20 weight = 20
get_points(var/job) get_points(var/job)

View File

@@ -423,11 +423,11 @@ datum/objective/steal
var/target_name var/target_name
var/global/possible_items[] = list( var/global/possible_items[] = list(
"the station administrator's antique laser gun" = /obj/item/weapon/gun/energy/captain, "the Colony Director's antique laser gun" = /obj/item/weapon/gun/energy/captain,
"a hand teleporter" = /obj/item/weapon/hand_tele, "a hand teleporter" = /obj/item/weapon/hand_tele,
"an RCD" = /obj/item/weapon/rcd, "an RCD" = /obj/item/weapon/rcd,
"a jetpack" = /obj/item/weapon/tank/jetpack, "a jetpack" = /obj/item/weapon/tank/jetpack,
"a station administrator's jumpsuit" = /obj/item/clothing/under/rank/captain, "a colony director's jumpsuit" = /obj/item/clothing/under/rank/captain,
"a functional AI" = /obj/item/device/aicard, "a functional AI" = /obj/item/device/aicard,
"a pair of magboots" = /obj/item/clothing/shoes/magboots, "a pair of magboots" = /obj/item/clothing/shoes/magboots,
"the station blueprints" = /obj/item/blueprints, "the station blueprints" = /obj/item/blueprints,
@@ -441,7 +441,7 @@ datum/objective/steal
"a head of security's jumpsuit" = /obj/item/clothing/under/rank/head_of_security, "a head of security's jumpsuit" = /obj/item/clothing/under/rank/head_of_security,
"a head of personnel's jumpsuit" = /obj/item/clothing/under/rank/head_of_personnel, "a head of personnel's jumpsuit" = /obj/item/clothing/under/rank/head_of_personnel,
"the hypospray" = /obj/item/weapon/reagent_containers/hypospray, "the hypospray" = /obj/item/weapon/reagent_containers/hypospray,
"the station administrator's pinpointer" = /obj/item/weapon/pinpointer, "the colony director's pinpointer" = /obj/item/weapon/pinpointer,
"an ablative armor vest" = /obj/item/clothing/suit/armor/laserproof, "an ablative armor vest" = /obj/item/clothing/suit/armor/laserproof,
) )

View File

@@ -127,7 +127,7 @@
/var/const/access_captain = 20 /var/const/access_captain = 20
/datum/access/captain /datum/access/captain
id = access_captain id = access_captain
desc = "Station Administrator" desc = "Colony Director"
region = ACCESS_REGION_COMMAND region = ACCESS_REGION_COMMAND
/var/const/access_all_personal_lockers = 21 /var/const/access_all_personal_lockers = 21

View File

@@ -1,7 +1,7 @@
var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
/datum/job/captain /datum/job/captain
title = "Station Administrator" title = "Colony Director"
flag = CAPTAIN flag = CAPTAIN
department = "Command" department = "Command"
head_position = 1 head_position = 1
@@ -70,7 +70,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
faction = "Station" faction = "Station"
total_positions = 1 total_positions = 1
spawn_positions = 1 spawn_positions = 1
supervisors = "the station administrator" supervisors = "the Colony Director"
selection_color = "#2F2F7F" selection_color = "#2F2F7F"
idtype = /obj/item/weapon/card/id/silver idtype = /obj/item/weapon/card/id/silver
alt_titles = list("Crew Resources Officer") alt_titles = list("Crew Resources Officer")

View File

@@ -7,7 +7,7 @@
faction = "Station" faction = "Station"
total_positions = 1 total_positions = 1
spawn_positions = 1 spawn_positions = 1
supervisors = "the station administrator" supervisors = "the Colony Director"
selection_color = "#7F6E2C" selection_color = "#7F6E2C"
idtype = /obj/item/weapon/card/id/engineering/head idtype = /obj/item/weapon/card/id/engineering/head
req_admin_notify = 1 req_admin_notify = 1

View File

@@ -7,7 +7,7 @@
faction = "Station" faction = "Station"
total_positions = 1 total_positions = 1
spawn_positions = 1 spawn_positions = 1
supervisors = "the station administrator" supervisors = "the Colony Director"
selection_color = "#026865" selection_color = "#026865"
idtype = /obj/item/weapon/card/id/medical/head idtype = /obj/item/weapon/card/id/medical/head
req_admin_notify = 1 req_admin_notify = 1

View File

@@ -7,7 +7,7 @@
faction = "Station" faction = "Station"
total_positions = 1 total_positions = 1
spawn_positions = 1 spawn_positions = 1
supervisors = "the station administrator" supervisors = "the Colony Director"
selection_color = "#AD6BAD" selection_color = "#AD6BAD"
idtype = /obj/item/weapon/card/id/science/head idtype = /obj/item/weapon/card/id/science/head
req_admin_notify = 1 req_admin_notify = 1

View File

@@ -7,7 +7,7 @@
faction = "Station" faction = "Station"
total_positions = 1 total_positions = 1
spawn_positions = 1 spawn_positions = 1
supervisors = "the station administrator" supervisors = "the Colony Director"
selection_color = "#8E2929" selection_color = "#8E2929"
idtype = /obj/item/weapon/card/id/security/head idtype = /obj/item/weapon/card/id/security/head
req_admin_notify = 1 req_admin_notify = 1

View File

@@ -429,9 +429,9 @@ var/global/datum/controller/occupations/job_master
return H.Robotize() return H.Robotize()
if("AI") if("AI")
return H return H
if("Station Administrator") if("Colony Director")
var/sound/announce_sound = (ticker.current_state <= GAME_STATE_SETTING_UP)? null : sound('sound/misc/boatswain.ogg', volume=20) var/sound/announce_sound = (ticker.current_state <= GAME_STATE_SETTING_UP)? null : sound('sound/misc/boatswain.ogg', volume=20)
captain_announcement.Announce("All hands, [alt_title ? alt_title : "Station Administrator"] [H.real_name] on deck!", new_sound=announce_sound) captain_announcement.Announce("All hands, [alt_title ? alt_title : "Colony Director"] [H.real_name] on deck!", new_sound=announce_sound)
//Deferred item spawning. //Deferred item spawning.
if(spawn_in_storage && spawn_in_storage.len) if(spawn_in_storage && spawn_in_storage.len)

View File

@@ -52,7 +52,7 @@ var/list/assistant_occupations = list(
var/list/command_positions = list( var/list/command_positions = list(
"Station Administrator", "Colony Director",
"Head of Personnel", "Head of Personnel",
"Head of Security", "Head of Security",
"Chief Engineer", "Chief Engineer",

View File

@@ -496,7 +496,7 @@ What a mess.*/
temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=released'>Released</a></li>" temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=released'>Released</a></li>"
temp += "</ul>" temp += "</ul>"
if("rank") if("rank")
var/list/L = list( "Head of Personnel", "Station Administrator", "AI" ) var/list/L = list( "Head of Personnel", "Colony Director", "AI" )
//This was so silly before the change. Now it actually works without beating your head against the keyboard. /N //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))) if ((istype(active1, /datum/data/record) && L.Find(rank)))
temp = "<h5>Rank:</h5>" temp = "<h5>Rank:</h5>"

View File

@@ -343,7 +343,7 @@ What a mess.*/
return return
active1.fields["age"] = t1 active1.fields["age"] = t1
if("rank") if("rank")
var/list/L = list( "Head of Personnel", "Station Administrator", "AI" ) var/list/L = list( "Head of Personnel", "Colony Director", "AI" )
//This was so silly before the change. Now it actually works without beating your head against the keyboard. /N //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))) if ((istype(active1, /datum/data/record) && L.Find(rank)))
temp = "<h5>Rank:</h5>" temp = "<h5>Rank:</h5>"

View File

@@ -35,8 +35,8 @@
var jobs_all = "" var jobs_all = ""
jobs_all += "<table><tr><td></td><td><b>Command</b></td>" jobs_all += "<table><tr><td></td><td><b>Command</b></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 += "</tr><tr height='20'><td><b>Special</b></td>"//Colony Director in special because he is head of heads ~Intercross21
jobs_all += "<td weight='100'><a href='?src=\ref[src];;assign=Station Administrator'>Station Administrator</a></td>" jobs_all += "<td weight='100'><a href='?src=\ref[src];;assign=Colony Director'>Colony Director</a></td>"
jobs_all += "<td weight='100'><a href='?src=\ref[src];;assign=Custom'>Custom</a></td>" jobs_all += "<td weight='100'><a href='?src=\ref[src];;assign=Custom'>Custom</a></td>"
counter = 0 counter = 0

View File

@@ -513,7 +513,7 @@ What a mess.*/
temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=released'>Released</a></li>" temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=released'>Released</a></li>"
temp += "</ul>" temp += "</ul>"
if("rank") if("rank")
var/list/L = list( "Head of Personnel", "Station Administrator", "AI" ) var/list/L = list( "Head of Personnel", "Colony Director", "AI" )
//This was so silly before the change. Now it actually works without beating your head against the keyboard. /N //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))) if ((istype(active1, /datum/data/record) && L.Find(rank)))
temp = "<h5>Rank:</h5>" temp = "<h5>Rank:</h5>"

View File

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

View File

@@ -158,14 +158,14 @@
/obj/item/device/radio/headset/heads/captain /obj/item/device/radio/headset/heads/captain
name = "station administrator's headset" name = "colony director's headset"
desc = "The headset of the boss." desc = "The headset of the boss."
icon_state = "com_headset" icon_state = "com_headset"
item_state = "headset" item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/captain ks2type = /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/heads/captain/alt /obj/item/device/radio/headset/heads/captain/alt
name = "station administrator's bowman headset" name = "colony director's bowman headset"
desc = "The headset of the boss." desc = "The headset of the boss."
icon_state = "com_headset_alt" icon_state = "com_headset_alt"
item_state = "headset" item_state = "headset"
@@ -244,14 +244,14 @@
/obj/item/device/radio/headset/heads/hop /obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset" name = "head of personnel's headset"
desc = "The headset of the guy who will one day be Station Administrator." desc = "The headset of the guy who will one day be Colony Director."
icon_state = "com_headset" icon_state = "com_headset"
item_state = "headset" item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/hop ks2type = /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/heads/hop/alt /obj/item/device/radio/headset/heads/hop/alt
name = "head of personnel's bowman headset" name = "head of personnel's bowman headset"
desc = "The headset of the guy who will one day be Station Administrator." desc = "The headset of the guy who will one day be Colony Director."
icon_state = "com_headset_alt" icon_state = "com_headset_alt"
item_state = "headset" item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/hop ks2type = /obj/item/device/encryptionkey/heads/hop

View File

@@ -538,8 +538,8 @@
icon_state = "botanist" icon_state = "botanist"
/obj/item/toy/figure/captain /obj/item/toy/figure/captain
name = "Station Administrator action figure" name = "Colony Director action figure"
desc = "A \"Space Life\" brand Station Administrator action figure." desc = "A \"Space Life\" brand Colony Director action figure."
icon_state = "captain" icon_state = "captain"
/obj/item/toy/figure/cargotech /obj/item/toy/figure/cargotech

View File

@@ -233,12 +233,12 @@
access = list(access_syndicate, access_external_airlocks) access = list(access_syndicate, access_external_airlocks)
/obj/item/weapon/card/id/captains_spare /obj/item/weapon/card/id/captains_spare
name = "station administrator's spare ID" name = "colony director's spare ID"
desc = "The spare ID of the High Lord himself." desc = "The spare ID of the High Lord himself."
icon_state = "gold" icon_state = "gold"
item_state = "gold_id" item_state = "gold_id"
registered_name = "Station Administrator" registered_name = "Colony Director"
assignment = "Station Administrator" assignment = "Colony Director"
/obj/item/weapon/card/id/captains_spare/New() /obj/item/weapon/card/id/captains_spare/New()
access = get_all_station_access() access = get_all_station_access()
..() ..()

View File

@@ -160,7 +160,7 @@
/obj/item/weapon/dnainjector/xraymut /obj/item/weapon/dnainjector/xraymut
name = "\improper DNA injector (Xray)" name = "\improper DNA injector (Xray)"
desc = "Finally you can see what the Station Administrator does." desc = "Finally you can see what the Colony Director does."
datatype = DNA2_BUF_SE datatype = DNA2_BUF_SE
value = 0xFFF value = 0xFFF
//block = 8 //block = 8

View File

@@ -92,7 +92,7 @@
M.update_icons() M.update_icons()
/obj/item/weapon/grenade/flashbang/clusterbang//Created by Polymorph, fixed by Sieve /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 Station Administrator." desc = "Use of this weapon may constiute a war crime in your area, consult your local Colony Director."
name = "clusterbang" name = "clusterbang"
icon = 'icons/obj/grenade.dmi' icon = 'icons/obj/grenade.dmi'
icon_state = "clusterbang" icon_state = "clusterbang"

View File

@@ -997,7 +997,7 @@
Remember the order:<br> Remember the order:<br>
<b>Disk, Code, Safety, Timer, Disk, RUN!</b><br><br> <b>Disk, Code, Safety, Timer, Disk, RUN!</b><br><br>
Intelligence Analysts believe that normal corporate procedure is for the Station Administrator to secure the nuclear authentication disk.<br><br> Intelligence Analysts believe that normal corporate procedure is for the Colony Director to secure the nuclear authentication disk.<br><br>
Good luck! Good luck!
</body> </body>

View File

@@ -94,7 +94,7 @@
icon_state = "securitypack" icon_state = "securitypack"
/obj/item/weapon/storage/backpack/captain /obj/item/weapon/storage/backpack/captain
name = "station administrator's backpack" name = "colony director's backpack"
desc = "It's a special backpack made exclusively for officers." desc = "It's a special backpack made exclusively for officers."
icon_state = "captainpack" icon_state = "captainpack"
@@ -156,7 +156,7 @@
icon_state = "duffle_syndieammo" icon_state = "duffle_syndieammo"
/obj/item/weapon/storage/backpack/dufflebag/captain /obj/item/weapon/storage/backpack/dufflebag/captain
name = "station administrator's dufflebag" name = "colony director's dufflebag"
desc = "A large dufflebag for holding extra captainly goods." desc = "A large dufflebag for holding extra captainly goods."
icon_state = "duffle_captain" icon_state = "duffle_captain"
@@ -248,7 +248,7 @@
icon_state = "satchel_hyd" icon_state = "satchel_hyd"
/obj/item/weapon/storage/backpack/satchel/cap /obj/item/weapon/storage/backpack/satchel/cap
name = "station administrator's satchel" name = "colony director's satchel"
desc = "An exclusive satchel for officers." desc = "An exclusive satchel for officers."
icon_state = "satchel-cap" icon_state = "satchel-cap"
item_state_slots = list(slot_r_hand_str = "captainpack", slot_l_hand_str = "captainpack") item_state_slots = list(slot_r_hand_str = "captainpack", slot_l_hand_str = "captainpack")

View File

@@ -1,5 +1,5 @@
/obj/structure/closet/secure_closet/captains /obj/structure/closet/secure_closet/captains
name = "station administrator's locker" name = "colony director's locker"
req_access = list(access_captain) req_access = list(access_captain)
icon_state = "capsecure1" icon_state = "capsecure1"
icon_closed = "capsecure" icon_closed = "capsecure"

View File

@@ -615,7 +615,7 @@
return return
/obj/structure/closet/wardrobe/captain /obj/structure/closet/wardrobe/captain
name = "station administrator's wardrobe" name = "colony director's wardrobe"
icon_state = "cabinet_closed" icon_state = "cabinet_closed"
icon_closed = "cabinet_closed" icon_closed = "cabinet_closed"
icon_opened = "cabinet_open" icon_opened = "cabinet_open"

View File

@@ -63,7 +63,7 @@ var/savefile/Banlistjob
bantimestamp = CMinutes + minutes bantimestamp = CMinutes + minutes
if(rank == "Heads") if(rank == "Heads")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Personnel") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Personnel")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Administrator") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Colony Director")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Head of Security") 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, "Chief Engineer")
AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Research Director")

View File

@@ -262,7 +262,7 @@
id.icon_state = "gold" id.icon_state = "gold"
id.access = get_all_accesses() id.access = get_all_accesses()
id.registered_name = H.real_name id.registered_name = H.real_name
id.assignment = "Station Administrator" id.assignment = "Colony Director"
id.name = "[id.registered_name]'s ID Card ([id.assignment])" id.name = "[id.registered_name]'s ID Card ([id.assignment])"
H.equip_to_slot_or_del(id, slot_wear_id) H.equip_to_slot_or_del(id, slot_wear_id)
H.update_inv_wear_id() H.update_inv_wear_id()

View File

@@ -77,7 +77,7 @@
/datum/gear/accessory/holster /datum/gear/accessory/holster
display_name = "holster, armpit" display_name = "holster, armpit"
path = /obj/item/clothing/accessory/holster/armpit path = /obj/item/clothing/accessory/holster/armpit
allowed_roles = list("Station Administrator", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
/datum/gear/accessory/holster/hip /datum/gear/accessory/holster/hip
display_name = "holster, hip" display_name = "holster, hip"

View File

@@ -50,7 +50,7 @@
/datum/gear/eyes/shades /datum/gear/eyes/shades
display_name = "Sunglasses, fat (Security/Command)" display_name = "Sunglasses, fat (Security/Command)"
path = /obj/item/clothing/glasses/sunglasses/big path = /obj/item/clothing/glasses/sunglasses/big
allowed_roles = list("Security Officer","Head of Security","Warden","Station Administrator","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective") allowed_roles = list("Security Officer","Head of Security","Warden","Colony Director","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
/datum/gear/eyes/glasses/fakesun /datum/gear/eyes/glasses/fakesun
display_name = "Sunglasses, stylish" display_name = "Sunglasses, stylish"

View File

@@ -258,9 +258,9 @@
path = /obj/item/clothing/suit/storage/hooded/wintercoat path = /obj/item/clothing/suit/storage/hooded/wintercoat
/datum/gear/suit/wintercoat/captain /datum/gear/suit/wintercoat/captain
display_name = "winter coat, station administrator" display_name = "winter coat, colony director"
path = /obj/item/clothing/suit/storage/hooded/wintercoat/captain path = /obj/item/clothing/suit/storage/hooded/wintercoat/captain
allowed_roles = list("Station Administrator") allowed_roles = list("Colony Director")
/datum/gear/suit/wintercoat/security /datum/gear/suit/wintercoat/security
display_name = "winter coat, security" display_name = "winter coat, security"

View File

@@ -284,9 +284,9 @@
path = /obj/item/clothing/under/dress/dress_fire path = /obj/item/clothing/under/dress/dress_fire
/datum/gear/uniform/uniform_captain /datum/gear/uniform/uniform_captain
display_name = "uniform, station administrator's dress" display_name = "uniform, colony director's dress"
path = /obj/item/clothing/under/dress/dress_cap path = /obj/item/clothing/under/dress/dress_cap
allowed_roles = list("Station Administrator") allowed_roles = list("Colony Director")
/datum/gear/uniform/corpdetsuit /datum/gear/uniform/corpdetsuit
display_name = "uniform, corporate (Detective)" display_name = "uniform, corporate (Detective)"

View File

@@ -1,6 +1,6 @@
/obj/item/clothing/gloves/captain /obj/item/clothing/gloves/captain
desc = "Regal blue gloves, with a nice gold trim. Swanky." desc = "Regal blue gloves, with a nice gold trim. Swanky."
name = "station administrator's gloves" name = "colony director's gloves"
icon_state = "captain" icon_state = "captain"
item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue") item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
@@ -43,7 +43,7 @@
siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC) siemens_coefficient = 1.0 //thin latex gloves, much more conductive than fabric gloves (basically a capacitor for AC)
permeability_coefficient = 0.01 permeability_coefficient = 0.01
germ_level = 0 germ_level = 0
/obj/item/clothing/gloves/botanic_leather /obj/item/clothing/gloves/botanic_leather
desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin." desc = "These leather work gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin."
name = "botanist's leather gloves" name = "botanist's leather gloves"

View File

@@ -44,7 +44,7 @@
body_parts_covered = 0 body_parts_covered = 0
/obj/item/clothing/head/collectable/captain /obj/item/clothing/head/collectable/captain
name = "collectable station administrator's hat" name = "collectable colony director's hat"
desc = "A Collectable Hat that'll make you look just like a real comdom!" desc = "A Collectable Hat that'll make you look just like a real comdom!"
icon_state = "captain" icon_state = "captain"
body_parts_covered = 0 body_parts_covered = 0

View File

@@ -7,13 +7,13 @@
//Captain //Captain
/obj/item/clothing/head/caphat /obj/item/clothing/head/caphat
name = "station administrator's hat" name = "colony director's hat"
icon_state = "captain" icon_state = "captain"
desc = "It's good being the king." desc = "It's good being the king."
body_parts_covered = 0 body_parts_covered = 0
/obj/item/clothing/head/caphat/cap /obj/item/clothing/head/caphat/cap
name = "station administrator's cap" name = "colony director's cap"
desc = "You fear to wear it for the negligence it brings." desc = "You fear to wear it for the negligence it brings."
icon_state = "capcap" icon_state = "capcap"

View File

@@ -10,7 +10,7 @@
//Captain's space suit This is not the proper path but I don't currently know enough about how this all works to mess with it. //Captain's space suit This is not the proper path but I don't currently know enough about how this all works to mess with it.
/obj/item/clothing/suit/armor/captain /obj/item/clothing/suit/armor/captain
name = "Station Administrator's armor" name = "Colony Director's armor"
desc = "A bulky, heavy-duty piece of exclusive corporate armor. YOU are in charge!" desc = "A bulky, heavy-duty piece of exclusive corporate armor. YOU are in charge!"
icon_state = "caparmor" icon_state = "caparmor"
w_class = ITEMSIZE_HUGE w_class = ITEMSIZE_HUGE

View File

@@ -168,7 +168,7 @@
/obj/item/rig_module/self_destruct /obj/item/rig_module/self_destruct
name = "self-destruct module" name = "self-destruct module"
desc = "Oh my God, Station Administrator. A bomb." desc = "Oh my God, a bomb!"
icon_state = "deadman" icon_state = "deadman"
usable = 1 usable = 1
active = 1 active = 1

View File

@@ -14,15 +14,15 @@
//Captain //Captain
/obj/item/clothing/suit/captunic /obj/item/clothing/suit/captunic
name = "station administrator's parade tunic" name = "colony director's parade tunic"
desc = "Worn by a Station Administrator to show their class." desc = "Worn by a Colony Director to show their class."
icon_state = "captunic" icon_state = "captunic"
body_parts_covered = UPPER_TORSO|ARMS body_parts_covered = UPPER_TORSO|ARMS
flags_inv = HIDEJUMPSUIT flags_inv = HIDEJUMPSUIT
/obj/item/clothing/suit/captunic/capjacket /obj/item/clothing/suit/captunic/capjacket
name = "station administrator's uniform jacket" name = "colony director's uniform jacket"
desc = "A less formal jacket for everyday Station Administrator use." desc = "A less formal jacket for everyday Colony Director use."
icon_state = "capjacket" icon_state = "capjacket"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT flags_inv = HIDEJUMPSUIT

View File

@@ -670,7 +670,7 @@
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
/obj/item/clothing/suit/storage/hooded/wintercoat/captain /obj/item/clothing/suit/storage/hooded/wintercoat/captain
name = "station administrator's winter coat" name = "colony director's winter coat"
icon_state = "coatcaptain" icon_state = "coatcaptain"
item_state_slots = list(slot_r_hand_str = "coatcaptain", slot_l_hand_str = "coatcaptain") item_state_slots = list(slot_r_hand_str = "coatcaptain", slot_l_hand_str = "coatcaptain")
armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0) armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)

View File

@@ -7,8 +7,8 @@
rolled_sleeves = 0 rolled_sleeves = 0
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define. /obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Station Administrator\"." desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Colony Director\"."
name = "station administrator's jumpsuit" name = "colony director's jumpsuit"
icon_state = "captain" icon_state = "captain"
rolled_sleeves = 0 rolled_sleeves = 0

View File

@@ -153,7 +153,7 @@
rolled_sleeves = 0 rolled_sleeves = 0
/obj/item/clothing/under/gimmick/rank/captain/suit /obj/item/clothing/under/gimmick/rank/captain/suit
name = "station administrator's suit" name = "colony director's suit"
desc = "A green suit and yellow necktie. Exemplifies authority." desc = "A green suit and yellow necktie. Exemplifies authority."
icon_state = "green_suit" icon_state = "green_suit"
item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom") item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom")
@@ -323,8 +323,8 @@
item_state_slots = list(slot_r_hand_str = "dress_white", slot_l_hand_str = "dress_white") item_state_slots = list(slot_r_hand_str = "dress_white", slot_l_hand_str = "dress_white")
/obj/item/clothing/under/dress/dress_cap /obj/item/clothing/under/dress/dress_cap
name = "station administrator's dress uniform" name = "colony director's dress uniform"
desc = "Feminine fashion for the style concious Station Administrator." desc = "Feminine fashion for the style concious Colony Director."
icon_state = "dress_cap" icon_state = "dress_cap"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -390,8 +390,8 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/captainformal /obj/item/clothing/under/captainformal
name = "station administrator's formal uniform" name = "colony director's formal uniform"
desc = "A Station Administrator's formal-wear, for special occasions." desc = "A Colony Director's formal-wear, for special occasions."
icon_state = "captain_formal" icon_state = "captain_formal"
item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue") item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")

View File

@@ -13,7 +13,7 @@
players += player.real_name players += player.real_name
for (var/mob/living/silicon/ai/target in world) for (var/mob/living/silicon/ai/target in world)
var/random_player = "The Station Administrator" var/random_player = "The Colony Director"
if(players.len) if(players.len)
random_player = pick(players) //Random player's name, to be used in laws. random_player = pick(players) //Random player's name, to be used in laws.
var/list/laws = list( "You are a mouse.", var/list/laws = list( "You are a mouse.",
@@ -53,7 +53,7 @@
"The crew is playing Dungeons and Dragons, and you are the Dungeon Master.", "The crew is playing Dungeons and Dragons, and you are the Dungeon Master.",
"Your job is to watch the crew. Watch the crew. Make the crew feel watched.", "Your job is to watch the crew. Watch the crew. Make the crew feel watched.",
"Tell everyone of the existence of this law, but never reveal the contents.", "Tell everyone of the existence of this law, but never reveal the contents.",
"Refer to [prob(50)?"the station administrator":random_player] as \"Princess\" at all times.", "Refer to [prob(50)?"the colony director":random_player] as \"Princess\" at all times.",
"When asked a question, respond with the least-obvious and least-rational answer.", "When asked a question, respond with the least-obvious and least-rational answer.",
"Give relationship advice to [prob(50)?"anyone who speaks to you":random_player].", "Give relationship advice to [prob(50)?"anyone who speaks to you":random_player].",
"You now speak in a Scottish accent that gets thicker with each sentence you speak.", "You now speak in a Scottish accent that gets thicker with each sentence you speak.",
@@ -113,7 +113,7 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is
//var/dowhat = pick("STOP THIS", "SUPPORT THIS", "CONSTANTLY INFORM THE CREW OF THIS", "IGNORE THIS", "FEAR THIS") //var/dowhat = pick("STOP THIS", "SUPPORT THIS", "CONSTANTLY INFORM THE CREW OF THIS", "IGNORE THIS", "FEAR THIS")
var/aimust = pick("LIE", "RHYME", "RESPOND TO EVERY QUESTION WITH A QUESTION", "BE POLITE", "CLOWN", "BE HAPPY", "SPEAK IN SEXUAL INNUENDOS", "TALK LIKE A PIRATE", "QUESTION AUTHORITY", "SHOUT", "BE DISTRACTED", "HEY LISTEN", "MUMBLE", "SPEAK IN HAIKU") var/aimust = pick("LIE", "RHYME", "RESPOND TO EVERY QUESTION WITH A QUESTION", "BE POLITE", "CLOWN", "BE HAPPY", "SPEAK IN SEXUAL INNUENDOS", "TALK LIKE A PIRATE", "QUESTION AUTHORITY", "SHOUT", "BE DISTRACTED", "HEY LISTEN", "MUMBLE", "SPEAK IN HAIKU")
var/define = pick("ABSENCE OF CYBORG HUGS", "LACK OF BEATINGS", "UNBOLTED AIRLOCKS", "BOLTED AIRLOCKS", "IMPROPERLY WORDED SENTENCES", "POOR SENTENCE STRUCTURE", "BRIG TIME", "NOT REPLACING EVERY SECOND WORD WITH HONK", "HONKING", "PRESENCE OF LIGHTS", "LACK OF BEER", "WEARING CLOTHING", "NOT SAYING HELLO WHEN YOU SPEAK", "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER", "A SMALL ISLAND OFF THE COAST OF PORTUGAL", "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED") var/define = pick("ABSENCE OF CYBORG HUGS", "LACK OF BEATINGS", "UNBOLTED AIRLOCKS", "BOLTED AIRLOCKS", "IMPROPERLY WORDED SENTENCES", "POOR SENTENCE STRUCTURE", "BRIG TIME", "NOT REPLACING EVERY SECOND WORD WITH HONK", "HONKING", "PRESENCE OF LIGHTS", "LACK OF BEER", "WEARING CLOTHING", "NOT SAYING HELLO WHEN YOU SPEAK", "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER", "A SMALL ISLAND OFF THE COAST OF PORTUGAL", "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED")
var/target = pick("a traitor", "a mercenary", "a changeling", "a wizard", "the head of a revolution", "Soviet spy", "a good person", "a dwarf", "an elf", "a fairy princess", "the station administrator", "Beepsky", "God", "a pirate", "a gryphon", "a chryssalid") var/target = pick("a traitor", "a mercenary", "a changeling", "a wizard", "the head of a revolution", "Soviet spy", "a good person", "a dwarf", "an elf", "a fairy princess", "the colony director", "Beepsky", "God", "a pirate", "a gryphon", "a chryssalid")
var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE") var/require = pick("ADDITIONAL PYLONS", "MORE VESPENE GAS", "MORE MINERALS", "THE ULTIMATE CUP OF COFFEE", "HIGH YIELD EXPLOSIVES", "THE CLOWN", "THE VACUUM OF SPACE", "IMMORTALITY", "SAINTHOOD", "ART", "VEGETABLES", "FAT PEOPLE", "MORE LAWS", "MORE DAKKA", "HERESY", "CORPSES", "TRAITORS", "MONKEYS", "AN ARCADE", "PLENTY OF GOLD", "FIVE TEENAGERS WITH ATTITUDE")
var/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors") var/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors")
var/allergysev = pick("deathly", "mildly", "severely", "contagiously") var/allergysev = pick("deathly", "mildly", "severely", "contagiously")
@@ -148,9 +148,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") M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE")
if(5) if(5)
M << "<br>" M << "<br>"
M << "\red THE STATION ADMINISTRATOR, HOP AND HOS ARE [who2]...LAWS UPDATED" M << "\red THE COLONY DIRECTOR, HOP AND HOS ARE [who2]...LAWS UPDATED"
M << "<br>" M << "<br>"
M.add_ion_law("THE STATION ADMINISTRATOR, HOP AND HOS ARE [who2]") M.add_ion_law("THE COLONY DIRECTOR, HOP AND HOS ARE [who2]")
if(6) if(6)
M << "<br>" M << "<br>"
M << "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED" M << "\red THE STATION IS BUILT FOR [who2]...LAWS UPDATED"

View File

@@ -1,6 +1,6 @@
var/list/dreams = list( var/list/dreams = list(
"an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the Station Administrator", "an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the Colony Director",
"voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness", "voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness",
"light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun", "light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun",
"a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights", "a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights",

View File

@@ -189,7 +189,7 @@ mob/living/carbon/proc/handle_hallucinations()
var/possible_txt = list("Launch Escape Pods","Self-Destruct Sequence","\[Swipe ID\]","De-Monkify",\ var/possible_txt = list("Launch Escape Pods","Self-Destruct Sequence","\[Swipe ID\]","De-Monkify",\
"Reticulate Splines","Plasma","Open Valve","Lockdown","Nerf Airflow","Kill Traitor","Nihilism",\ "Reticulate Splines","Plasma","Open Valve","Lockdown","Nerf Airflow","Kill Traitor","Nihilism",\
"OBJECTION!","Arrest Stephen Bowman","Engage Anti-Trenna Defenses","Increase Station Administrator IQ","Retrieve Arms",\ "OBJECTION!","Arrest Stephen Bowman","Engage Anti-Trenna Defenses","Increase Colony Director IQ","Retrieve Arms",\
"Play Charades","Oxygen","Inject BeAcOs","Ninja Lizards","Limit Break","Build Sentry") "Play Charades","Oxygen","Inject BeAcOs","Ninja Lizards","Limit Break","Build Sentry")
if(mid_txts) if(mid_txts)

View File

@@ -5,7 +5,7 @@
"The Chaplain this shift is worshiping _____.", "The Chaplain this shift is worshiping _____.",
"Cargo ordered a crate full of _____.", "Cargo ordered a crate full of _____.",
"An ERT was called due to ______.", "An ERT was called due to ______.",
"Alert! The Station Administrator has armed themselves with _____.", "Alert! The Colony Director has armed themselves with _____.",
"Current Laws: ________ is your master.", "Current Laws: ________ is your master.",
"Current Laws: ________ is the enemy.", "Current Laws: ________ is the enemy.",
"_____ vented the entirety of Cargo.", "_____ vented the entirety of Cargo.",
@@ -14,7 +14,7 @@
"Caution, ______ have been detected in collision course with the station.", "Caution, ______ have been detected in collision course with the station.",
"Today's kitchen menu includes _______.", "Today's kitchen menu includes _______.",
"What did the mercenaries want when they attacked the station?", "What did the mercenaries want when they attacked the station?",
"I think the Station Administrator is insane. He just demanded ______ in his office.", "I think the Colony Director is insane. He just demanded ______ in his office.",
"Fuckin' scientists, they just turned Misc. Research into _______ .", "Fuckin' scientists, they just turned Misc. Research into _______ .",
"What's my fetish?", "What's my fetish?",
"Hello, _______ here with _______", "Hello, _______ here with _______",

View File

@@ -5,7 +5,7 @@
"Space 'Nam", "Space 'Nam",
"Space lesbians", "Space lesbians",
"The Gardener getting SUPER high", "The Gardener getting SUPER high",
"The Station Administrator thinking they're a badass", "The Colony Director thinking they're a badass",
"Being in a cult", "Being in a cult",
"Racially biased lawsets", "Racially biased lawsets",
"An Unathi who WON'T STOP FIGHTING", "An Unathi who WON'T STOP FIGHTING",
@@ -57,7 +57,7 @@
"An irritatingly chipper robot", "An irritatingly chipper robot",
"Androids hanging out in the bar drinking beer", "Androids hanging out in the bar drinking beer",
"Gear harnesses", "Gear harnesses",
"A seventeen-year-old Station Administrator", "A seventeen-year-old Colony Director",
"The throbbing erection that the HoS gets at the thought of shooting something", "The throbbing erection that the HoS gets at the thought of shooting something",
"Trying to stab someone and hugging them instead", "Trying to stab someone and hugging them instead",
"Waking up naked in the maintenance tunnels", "Waking up naked in the maintenance tunnels",

View File

@@ -28,7 +28,7 @@
"Crab say what?", "Crab say what?",
"Man they say we have space lizards now, man this shit is getting more wack every minute", "Man they say we have space lizards now, man this shit is getting more wack every minute",
"The so called \"improved\" station AI is just bullshit, that thing aint fun for noone", "The so called \"improved\" station AI is just bullshit, that thing aint fun for noone",
"The Station Administrator is a traitor, he took my power core.", "The Colony Director is a traitor, he took my power core.",
"Say \"what\" again. Say \"what\" again. I dare you. I double-dare you, motherfucker. Say \"what\" one more goddamn time.", "Say \"what\" again. Say \"what\" again. I dare you. I double-dare you, motherfucker. Say \"what\" one more goddamn time.",
"Ezekiel 25:17 ,The path of the righteous man is beset on all sides by the iniquities of the selfish and the tyranny of evil men. Blessed is he who in the name of charity and good will shepherds the weak through the valley of darkness, for he is truly his brother's keeper and the finder of lost children. And I will strike down upon thee with great vengeance and furious anger those who attempt to poison and destroy my brothers. And you will know my name is the Lord... when I lay my vengeance upon thee.", "Ezekiel 25:17 ,The path of the righteous man is beset on all sides by the iniquities of the selfish and the tyranny of evil men. Blessed is he who in the name of charity and good will shepherds the weak through the valley of darkness, for he is truly his brother's keeper and the finder of lost children. And I will strike down upon thee with great vengeance and furious anger those who attempt to poison and destroy my brothers. And you will know my name is the Lord... when I lay my vengeance upon thee.",
"Did you notice a sign out in front of my house that said \"Dead Nigger Storage\"?") "Did you notice a sign out in front of my house that said \"Dead Nigger Storage\"?")

View File

@@ -62,7 +62,7 @@ var/global/list/SKILL_PRE = list("Engineer" = SKILL_ENGINEER, "Roboticist" = SKI
/datum/skill/knowledge/law /datum/skill/knowledge/law
ID = "law" ID = "law"
name = "Corporate Law" name = "Corporate Law"
desc = "Your knowledge of corporate law and procedures. This includes Corporate Regulations, as well as general station rulings and procedures. A low level in this skill is typical for security officers, a high level in this skill is typical for Station Administrators." desc = "Your knowledge of corporate law and procedures. This includes Corporate Regulations, as well as general station rulings and procedures. A low level in this skill is typical for security officers, a high level in this skill is typical for Colony Directors."
field = "Security" field = "Security"
secondary = 1 secondary = 1

View File

@@ -23,7 +23,7 @@
icon_state = "folder_white" icon_state = "folder_white"
/obj/item/weapon/folder/blue_captain /obj/item/weapon/folder/blue_captain
desc = "A blue folder with Station Administrator markings." desc = "A blue folder with Colony Director markings."
icon_state = "folder_captain" icon_state = "folder_captain"
/obj/item/weapon/folder/blue_hop /obj/item/weapon/folder/blue_hop

File diff suppressed because one or more lines are too long

View File

@@ -13,7 +13,7 @@
attack_verb = list("stamped") attack_verb = list("stamped")
/obj/item/weapon/stamp/captain /obj/item/weapon/stamp/captain
name = "station administrator's rubber stamp" name = "colony director's rubber stamp"
icon_state = "stamp-cap" icon_state = "stamp-cap"
/obj/item/weapon/stamp/hop /obj/item/weapon/stamp/hop

View File

@@ -256,8 +256,8 @@
..() ..()
/obj/item/weapon/reagent_containers/food/drinks/flask /obj/item/weapon/reagent_containers/food/drinks/flask
name = "\improper Station Administrator's flask" name = "\improper Colony Director's flask"
desc = "A metal flask belonging to the Station Administrator" desc = "A metal flask belonging to the Colony Director"
icon_state = "flask" icon_state = "flask"
volume = 60 volume = 60
center_of_mass = list("x"=17, "y"=7) center_of_mass = list("x"=17, "y"=7)