Colony Director -> Site Manager

code/controllers/subsystems/ticker.dm

@@ -434,7 +434,7 @@ var/global/datum/controller/subsystem/ticker/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 == "Colony Director")
+			if(player.mind.assigned_role == "Site Manager")
 				captainless=0
 			if(!player_is_antag(player.mind, only_offstation_roles = 1))
 				job_master.EquipRank(player, player.mind.assigned_role, 0)

code/datums/datacore.dm

@@ -218,7 +218,7 @@ var/global/list/PDA_Manifest = list()
 			heads[++heads.len] = list("name" = name, "rank" = rank, "active" = isactive)
 			department = 1
 			depthead = 1
-			if(rank=="Colony Director" && heads.len != 1)
+			if(rank=="Site Manager" && heads.len != 1)
 				heads.Swap(1,heads.len)
 
 		if(SSjob.is_job_in_department(real_rank, DEPARTMENT_SECURITY))

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("Colony Director")
+	restricted_jobs = list("Site Manager")
 
 /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 == "Colony Director")
+			if(loyalist.mind && loyalist.mind.assigned_role == "Site Manager")
 				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 - "Colony Director")
+				for(var/job in command_positions - "Site Manager")
 					if(mutineer.mind && mutineer.mind.assigned_role == job)
 						candidates.Add(mutineer.mind)
 		return candidates

code/game/antagonist/outsider/ert.dm

@@ -14,7 +14,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 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."
+	leader_welcome_text = "As leader of the Emergency Response Team, you answer only to the Company, and have authority to override the Site Manager where it is necessary to achieve your mission goals. It is recommended that you attempt to cooperate with the Site Manager where possible, however."
 	landmark_id = "Response Team"
 	id_type = /obj/item/weapon/card/id/centcom/ERT
 

code/game/antagonist/station/changeling.dm

@@ -6,7 +6,7 @@
 	bantype = "changeling"
 	feedback_tag = "changeling_objective"
 	avoid_silicons = TRUE
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Colony Director")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Site Manager")
 	welcome_text = "Use say \"#g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them."
 	antag_sound = 'sound/effects/antag_notice/ling_alert.ogg'
 	flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE

code/game/antagonist/station/cultist.dm

@@ -13,8 +13,8 @@ var/datum/antagonist/cultist/cult
 	bantype = "cultist"
 	restricted_jobs = list("Chaplain")
 	avoid_silicons = TRUE
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Colony Director")
-	roundstart_restricted = list("Internal Affairs Agent", "Head of Security", "Colony Director")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Site Manager")
+	roundstart_restricted = list("Internal Affairs Agent", "Head of Security", "Site Manager")
 	role_type = BE_CULTIST
 	feedback_tag = "cult_objective"
 	antag_indicator = "cult"

code/game/antagonist/station/infiltrator.dm

@@ -11,7 +11,7 @@ var/datum/antagonist/traitor/infiltrator/infiltrators
 	role_text = "Infiltrator"
 	role_text_plural = "Infiltrators"
 	welcome_text = "To speak on your team's private channel, use :t."
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Colony Director")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Site Manager")
 	flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
 	can_speak_aooc = TRUE
 

code/game/antagonist/station/revolutionary.dm

@@ -30,8 +30,8 @@ var/datum/antagonist/revolutionary/revs
 	faction_invisible = 1
 
 	avoid_silicons = TRUE
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Colony Director", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
-	roundstart_restricted = list("Internal Affairs Agent", "Colony Director", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Site Manager", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
+	roundstart_restricted = list("Internal Affairs Agent", "Site Manager", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
 
 /datum/antagonist/revolutionary/New()
 	..()

code/game/antagonist/station/traitor.dm

@@ -4,7 +4,7 @@ var/datum/antagonist/traitor/traitors
 /datum/antagonist/traitor
 	id = MODE_TRAITOR
 	antag_sound = 'sound/effects/antag_notice/traitor_alert.ogg'
-	protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Colony Director")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Site Manager")
 	flags = ANTAG_SUSPICIOUS | ANTAG_RANDSPAWN | ANTAG_VOTABLE
 	can_speak_aooc = FALSE	// If they want to plot and plan as this sort of traitor, they'll need to do it ICly.
 

code/game/area/Space Station 13 areas.dm

@@ -950,7 +950,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	sound_env = MEDIUM_SOFTFLOOR
 
 /area/crew_quarters/captain
-	name = "\improper Command - Colony Director's Office"
+	name = "\improper Command - Site Manager's Office"
 	icon_state = "captain"
 	sound_env = MEDIUM_SOFTFLOOR
 

code/game/gamemodes/newobjective.dm

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

code/game/gamemodes/objective.dm

@@ -427,11 +427,11 @@ datum/objective/steal
 	var/target_name
 
 	var/global/possible_items[] = list(
-		"the Colony Director's antique laser gun" = /obj/item/weapon/gun/energy/captain,
+		"the Site Manager's antique laser gun" = /obj/item/weapon/gun/energy/captain,
 		"a hand teleporter" = /obj/item/weapon/hand_tele,
 		"an RCD" = /obj/item/weapon/rcd,
 		"a jetpack" = /obj/item/weapon/tank/jetpack,
-		"a colony director's jumpsuit" = /obj/item/clothing/under/rank/captain,
+		"a site manager's jumpsuit" = /obj/item/clothing/under/rank/captain,
 		"a functional AI" = /obj/item/device/aicard,
 		"a pair of magboots" = /obj/item/clothing/shoes/magboots,
 		"the station blueprints" = /obj/item/blueprints,
@@ -445,7 +445,7 @@ datum/objective/steal
 		"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,
 		"the hypospray" = /obj/item/weapon/reagent_containers/hypospray/vial,
-		"the colony director's pinpointer" = /obj/item/weapon/pinpointer,
+		"the site manager's pinpointer" = /obj/item/weapon/pinpointer,
 		"an ablative armor vest" = /obj/item/clothing/suit/armor/laserproof,
 	)
 

code/game/jobs/access_datum.dm

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

code/game/jobs/job/captain.dm

@@ -5,7 +5,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 //////////////////////////////////
 
 /datum/job/captain
-	title = "Colony Director"
+	title = "Site Manager"
 	flag = CAPTAIN
 	departments = list(DEPARTMENT_COMMAND)
 	sorting_order = 3 // Above everyone.
@@ -26,11 +26,10 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 	ideal_character_age = 70 // Old geezer captains ftw
 
 	outfit_type = /decl/hierarchy/outfit/job/captain
-	job_description = "The Colony Director manages the other Command Staff, and through them the rest of the station. Though they have access to everything, \
-						they do not understand everything, and are expected to delegate tasks to the appropriate crew member. The Colony Director is expected to \
+	job_description = "The Site Manager manages the other Command Staff, and through them the rest of the station. Though they have access to everything, \
+						they do not understand everything, and are expected to delegate tasks to the appropriate crew member. The Site Manager is expected to \
 						have an understanding of Standard Operating Procedure, and is subject to it, and legal action, in the same way as every other crew member."
-	alt_titles = list("Site Manager" = /datum/alt_title/site_manager,
-						"Overseer" = /datum/alt_title/overseer)
+	alt_titles = list("Overseer"= /datum/alt_title/overseer)
 
 /*
 /datum/job/captain/equip(var/mob/living/carbon/human/H)
@@ -44,9 +43,6 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 
 
 // Captain Alt Titles
-/datum/alt_title/site_manager
-	title = "Site Manager"
-
 /datum/alt_title/overseer
 	title = "Overseer"
 
@@ -63,7 +59,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the Colony Director"
+	supervisors = "the Site Manager"
 	selection_color = "#1D1D4F"
 	req_admin_notify = 1
 	minimal_player_age = 10

code/game/jobs/job/engineering.dm

@@ -11,7 +11,7 @@
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the Colony Director"
+	supervisors = "the Site Manager"
 	selection_color = "#7F6E2C"
 	req_admin_notify = 1
 	economic_modifier = 10

code/game/jobs/job/medical.dm

@@ -11,7 +11,7 @@
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the Colony Director"
+	supervisors = "the Site Manager"
 	selection_color = "#026865"
 	req_admin_notify = 1
 	economic_modifier = 10

code/game/jobs/job/science.dm

@@ -11,7 +11,7 @@
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the Colony Director"
+	supervisors = "the Site Manager"
 	selection_color = "#AD6BAD"
 	req_admin_notify = 1
 	economic_modifier = 15

code/game/jobs/job/security.dm

@@ -11,7 +11,7 @@
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "the Colony Director"
+	supervisors = "the Site Manager"
 	selection_color = "#8E2929"
 	req_admin_notify = 1
 	economic_modifier = 10

code/game/jobs/job_controller.dm

@@ -394,7 +394,7 @@ var/global/datum/controller/occupations/job_master
 					var/datum/gear/G = gear_datums[thing]
 					if(!G) //Not a real gear datum (maybe removed, as this is loaded from their savefile)
 						continue
-					
+
 					var/permitted
 					// Check if it is restricted to certain roles
 					if(G.allowed_roles)
@@ -435,13 +435,13 @@ var/global/datum/controller/occupations/job_master
 
 			// Set up their account
 			job.setup_account(H)
-			
+
 			// Equip job items.
 			job.equip(H, H.mind ? H.mind.role_alt_title : "")
-			
+
 			// Stick their fingerprints on literally everything
 			job.apply_fingerprints(H)
-			
+
 			// Only non-silicons get post-job-equip equipment
 			if(!(job.mob_type & JOB_SILICON))
 				H.equip_post_job()
@@ -487,11 +487,11 @@ var/global/datum/controller/occupations/job_master
 				return H.Robotize()
 			if(job.mob_type & JOB_SILICON_AI)
 				return H
-			
+
 			// TWEET PEEP
-			if(rank == "Colony Director")
+			if(rank == "Site Manager")
 				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 : "Colony Director"] [H.real_name] on deck!", new_sound = announce_sound, zlevel = H.z)
+				captain_announcement.Announce("All hands, [alt_title ? alt_title : "Site Manager"] [H.real_name] on deck!", new_sound = announce_sound, zlevel = H.z)
 
 			//Deferred item spawning.
 			if(spawn_in_storage && spawn_in_storage.len)

code/game/machinery/computer/security.dm

@@ -324,6 +324,7 @@
 				if(!active2)
 					set_temp("Security record not found. You must enter the person's exact name, ID or DNA.", "danger")
 					return
+<<<<<<< HEAD
 				for(var/datum/data/record/E in data_core.general)
 					if(E.fields["name"] == active2.fields["name"] && E.fields["id"] == active2.fields["id"])
 						active1 = E
@@ -370,6 +371,147 @@
 					var/choices = field_edit_choices[field]
 					if(length(choices))
 						tgui_modal_choice(src, id, question, arguments = arguments, value = arguments["value"], choices = choices)
+=======
+				var/a1 = active1
+				var/a2 = active2
+				switch(href_list["field"])
+					if("name")
+						if (istype(active1, /datum/data/record))
+							var/t1 = sanitizeName(input("Please input name:", "Secure. records", active1.fields["name"], null)  as text)
+							if (!t1 || active1 != a1)
+								return
+							active1.fields["name"] = t1
+					if("id")
+						if (istype(active2, /datum/data/record))
+							var/t1 = sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null)  as text)
+							if (!t1 || active1 != a1)
+								return
+							active1.fields["id"] = t1
+					if("fingerprint")
+						if (istype(active1, /datum/data/record))
+							var/t1 = sanitize(input("Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null)  as text)
+							if (!t1 || active1 != a1)
+								return
+							active1.fields["fingerprint"] = t1
+					if("sex")
+						if (istype(active1, /datum/data/record))
+							if (active1.fields["sex"] == "Male")
+								active1.fields["sex"] = "Female"
+							else
+								active1.fields["sex"] = "Male"
+					if("age")
+						if (istype(active1, /datum/data/record))
+							var/t1 = input("Please input age:", "Secure. records", active1.fields["age"], null)  as num
+							if (!t1 || active1 != a1)
+								return
+							active1.fields["age"] = t1
+					if("mi_crim")
+						if (istype(active2, /datum/data/record))
+							var/t1 = sanitize(input("Please input minor disabilities list:", "Secure. records", active2.fields["mi_crim"], null)  as text)
+							if (!t1 || active2 != a2)
+								return
+							active2.fields["mi_crim"] = t1
+					if("mi_crim_d")
+						if (istype(active2, /datum/data/record))
+							var/t1 = sanitize(input("Please summarize minor dis.:", "Secure. records", active2.fields["mi_crim_d"], null)  as message)
+							if (!t1 || active2 != a2)
+								return
+							active2.fields["mi_crim_d"] = t1
+					if("ma_crim")
+						if (istype(active2, /datum/data/record))
+							var/t1 = sanitize(input("Please input major diabilities list:", "Secure. records", active2.fields["ma_crim"], null)  as text)
+							if (!t1 || active2 != a2)
+								return
+							active2.fields["ma_crim"] = t1
+					if("ma_crim_d")
+						if (istype(active2, /datum/data/record))
+							var/t1 = sanitize(input("Please summarize major dis.:", "Secure. records", active2.fields["ma_crim_d"], null)  as message)
+							if (!t1 || active2 != a2)
+								return
+							active2.fields["ma_crim_d"] = t1
+					if("notes")
+						if (istype(active2, /datum/data/record))
+							var/t1 = sanitize(input("Please summarize notes:", "Secure. records", html_decode(active2.fields["notes"]), null)  as message, extra = 0, max_length = MAX_RECORD_LENGTH)
+							if (!t1 || active2 != a2)
+								return
+							active2.fields["notes"] = t1
+					if("criminal")
+						if (istype(active2, /datum/data/record))
+							temp = "<h5>Criminal Status:</h5>"
+							temp += "<ul>"
+							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=none'>None</a></li>"
+							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=arrest'>*Arrest*</a></li>"
+							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=incarcerated'>Incarcerated</a></li>"
+							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=parolled'>Parolled</a></li>"
+							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", "Site Manager", "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>"
+							temp += "<ul>"
+							for(var/rank in joblist)
+								temp += "<li><a href='?src=\ref[src];choice=Change Rank;rank=[rank]'>[rank]</a></li>"
+							temp += "</ul>"
+						else
+							alert(usr, "You do not have the required rank to do this!")
+					if("species")
+						if (istype(active1, /datum/data/record))
+							var/t1 = sanitize(input("Please enter race:", "General records", active1.fields["species"], null)  as message)
+							if (!t1 || active1 != a1)
+								return
+							active1.fields["species"] = t1
+					if("photo front")
+						var/icon/photo = get_photo(usr)
+						if(photo)
+							active1.fields["photo_front"] = photo
+					if("photo side")
+						var/icon/photo = get_photo(usr)
+						if(photo)
+							active1.fields["photo_side"] = photo
+
+
+//TEMPORARY MENU FUNCTIONS
+			else//To properly clear as per clear screen.
+				temp=null
+				switch(href_list["choice"])
+					if ("Change Rank")
+						if (active1)
+							active1.fields["rank"] = href_list["rank"]
+							if(href_list["rank"] in joblist)
+								active1.fields["real_rank"] = href_list["real_rank"]
+
+					if ("Change Criminal Status")
+						if (active2)
+							for(var/mob/living/carbon/human/H in player_list)
+								BITSET(H.hud_updateflag, WANTED_HUD)
+							switch(href_list["criminal2"])
+								if("none")
+									active2.fields["criminal"] = "None"
+								if("arrest")
+									active2.fields["criminal"] = "*Arrest*"
+								if("incarcerated")
+									active2.fields["criminal"] = "Incarcerated"
+								if("parolled")
+									active2.fields["criminal"] = "Parolled"
+								if("released")
+									active2.fields["criminal"] = "Released"
+
+					if ("Delete Record (Security) Execute")
+						if (active2)
+							qdel(active2)
+
+					if ("Delete Record (ALL) Execute")
+						if (active1)
+							for(var/datum/data/record/R in data_core.medical)
+								if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
+									qdel(R)
+								else
+							qdel(active1)
+						if (active2)
+							qdel(active2)
+>>>>>>> 6d4d5d6... Merge pull request #7571 from listerla/nomoresitemanager
 					else
 						tgui_modal_input(src, id, question, arguments = arguments, value = arguments["value"])
 				if("add_c")

code/game/machinery/computer/skills.dm

@@ -228,6 +228,7 @@
 				if(!index || !istype(active1, /datum/data/record))
 					return
 
+<<<<<<< HEAD
 				var/list/comments = active1.fields["comments"]
 				index = clamp(index, 1, length(comments))
 				if(comments[index])
@@ -240,6 +241,71 @@
 					addtimer(CALLBACK(src, .proc/print_finish), 5 SECONDS)
 			else
 				return FALSE
+=======
+//FIELD FUNCTIONS
+			if ("Edit Field")
+				var/a1 = active1
+				switch(href_list["field"])
+					if("name")
+						if (istype(active1, /datum/data/record))
+							var/t1 = sanitizeName(input("Please input name:", "Secure. records", active1.fields["name"], null)  as text)
+							if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1)
+								return
+							active1.fields["name"] = t1
+					if("id")
+						if (istype(active1, /datum/data/record))
+							var/t1 = sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null)  as text)
+							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+								return
+							active1.fields["id"] = t1
+					if("fingerprint")
+						if (istype(active1, /datum/data/record))
+							var/t1 = sanitize(input("Please input fingerprint hash:", "Secure. records", active1.fields["fingerprint"], null)  as text)
+							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+								return
+							active1.fields["fingerprint"] = t1
+					if("sex")
+						if (istype(active1, /datum/data/record))
+							if (active1.fields["sex"] == "Male")
+								active1.fields["sex"] = "Female"
+							else
+								active1.fields["sex"] = "Male"
+					if("age")
+						if (istype(active1, /datum/data/record))
+							var/t1 = input("Please input age:", "Secure. records", active1.fields["age"], null)  as num
+							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+								return
+							active1.fields["age"] = t1
+					if("rank")
+						var/list/L = list( "Head of Personnel", "Site Manager", "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>"
+							temp += "<ul>"
+							for(var/rank in joblist)
+								temp += "<li><a href='?src=\ref[src];choice=Change Rank;rank=[rank]'>[rank]</a></li>"
+							temp += "</ul>"
+						else
+							alert(usr, "You do not have the required rank to do this!")
+					if("species")
+						if (istype(active1, /datum/data/record))
+							var/t1 = sanitize(input("Please enter race:", "General records", active1.fields["species"], null)  as message)
+							if ((!( t1 ) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon))) || active1 != a1))
+								return
+							active1.fields["species"] = t1
+
+//TEMPORARY MENU FUNCTIONS
+			else//To properly clear as per clear screen.
+				temp=null
+				switch(href_list["choice"])
+					if ("Change Rank")
+						if (active1)
+							if(PDA_Manifest.len)
+								PDA_Manifest.Cut()
+							active1.fields["rank"] = href_list["rank"]
+							if(href_list["rank"] in joblist)
+								active1.fields["real_rank"] = href_list["real_rank"]
+>>>>>>> 6d4d5d6... Merge pull request #7571 from listerla/nomoresitemanager
 
 /**
   * Called in tgui_act() to process modal actions

code/game/objects/items/devices/radio/encryptionkey.dm

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

code/game/objects/items/devices/radio/headset.dm

@@ -173,13 +173,13 @@
 
 
 /obj/item/device/radio/headset/heads/captain
-	name = "colony director's headset"
+	name = "site manager's headset"
 	desc = "The headset of the boss."
 	icon_state = "com_headset"
 	ks2type = /obj/item/device/encryptionkey/heads/captain
 
 /obj/item/device/radio/headset/heads/captain/alt
-	name = "colony director's bowman headset"
+	name = "site manager's bowman headset"
 	desc = "The headset of the boss."
 	icon_state = "com_headset_alt"
 	ks2type = /obj/item/device/encryptionkey/heads/captain
@@ -255,13 +255,13 @@
 
 /obj/item/device/radio/headset/heads/hop
 	name = "head of personnel's headset"
-	desc = "The headset of the guy who will one day be Colony Director."
+	desc = "The headset of the guy who will one day be Site Manager."
 	icon_state = "com_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 Colony Director."
+	desc = "The headset of the guy who will one day be Site Manager."
 	icon_state = "com_headset_alt"
 	ks2type = /obj/item/device/encryptionkey/heads/hop
 

code/game/objects/items/toys/toys.dm

@@ -458,8 +458,8 @@
 	toysay = "Dude, I see colors..."
 
 /obj/item/toy/figure/captain
-	name = "Colony Director action figure"
-	desc = "A \"Space Life\" brand Colony Director action figure."
+	name = "Site Manager action figure"
+	desc = "A \"Space Life\" brand Site Manager action figure."
 	icon_state = "captain"
 	toysay = "How do I open this display case?"
 

code/game/objects/items/weapons/dna_injector.dm

@@ -67,7 +67,7 @@
 	if(istype(M,/mob/living))
 		var/mob/living/L = M
 		L.apply_effect(rand(5,20), IRRADIATE, check_protection = 0)
-		L.apply_damage(max(2,L.getCloneLoss()), CLONE) 
+		L.apply_damage(max(2,L.getCloneLoss()), CLONE)
 
 	if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
 		if (buf.types & DNA2_BUF_UI)
@@ -158,7 +158,7 @@
 
 /obj/item/weapon/dnainjector/xraymut
 	name = "\improper DNA injector (Xray)"
-	desc = "Finally you can see what the Colony Director does."
+	desc = "Finally you can see what the Site Manager does."
 	datatype = DNA2_BUF_SE
 	value = 0xFFF
 	//block = 8

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -99,7 +99,7 @@
 
 
 /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 Colony Director."
+	desc = "Use of this weapon may constiute a war crime in your area, consult your local Site Manager."
 	name = "clusterbang"
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "clusterbang"

code/game/objects/items/weapons/id cards/station_ids.dm

@@ -138,13 +138,13 @@
 	preserve_item = 1
 
 /obj/item/weapon/card/id/gold/captain
-	assignment = "Colony Director"
-	rank = "Colony Director"
+	assignment = "Site Manager"
+	rank = "Site Manager"
 
 /obj/item/weapon/card/id/gold/captain/spare
-	name = "\improper Colony Director's spare ID"
+	name = "\improper Site Manager's spare ID"
 	desc = "The spare ID of the High Lord himself."
-	registered_name = "Colony Director"
+	registered_name = "Site Manager"
 
 /obj/item/weapon/card/id/synthetic
 	name = "\improper Synthetic ID"

code/game/objects/items/weapons/manuals.dm

@@ -1136,7 +1136,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 Colony Director to secure the nuclear authentication disk.<br><br>
+				Intelligence Analysts believe that normal corporate procedure is for the Site Manager to secure the nuclear authentication disk.<br><br>
 
 				Good luck!
 				</body>

code/game/objects/items/weapons/storage/backpack.dm

@@ -92,7 +92,7 @@
 	icon_state = "securitypack"
 
 /obj/item/weapon/storage/backpack/captain
-	name = "colony director's backpack"
+	name = "site manager's backpack"
 	desc = "It's a special backpack made exclusively for officers."
 	icon_state = "captainpack"
 
@@ -154,7 +154,7 @@
 	icon_state = "duffle_syndieammo"
 
 /obj/item/weapon/storage/backpack/dufflebag/captain
-	name = "colony director's dufflebag"
+	name = "site manager's dufflebag"
 	desc = "A large dufflebag for holding extra captainly goods."
 	icon_state = "duffle_captain"
 
@@ -249,7 +249,7 @@
 	icon_state = "satchel_hyd"
 
 /obj/item/weapon/storage/backpack/satchel/cap
-	name = "colony director's satchel"
+	name = "site manager'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")

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -1,5 +1,5 @@
 /obj/structure/closet/secure_closet/captains
-	name = "colony director's locker"
+	name = "site manager's locker"
 	req_access = list(access_captain)
 	closet_appearance = /decl/closet_appearance/secure_closet/command
 

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -438,7 +438,7 @@
 		/obj/item/weapon/storage/backpack/satchel = 2)
 
 /obj/structure/closet/wardrobe/captain
-	name = "colony director's wardrobe"
+	name = "site manager's wardrobe"
 	closet_appearance = /decl/closet_appearance/cabinet
 
 	starts_with = list(

code/modules/admin/newbanjob.dm

@@ -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, "Colony Director")
+		AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Site Manager")
 		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")

code/modules/admin/verbs/debug.dm

@@ -288,7 +288,7 @@
 			id.icon_state = "gold"
 			id.access = get_all_accesses().Copy()
 			id.registered_name = H.real_name
-			id.assignment = "Colony Director"
+			id.assignment = "Site Manager"
 			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()

code/modules/client/preference_setup/loadout/loadout_accessories.dm

@@ -79,7 +79,7 @@
 /datum/gear/accessory/holster
 	display_name = "holster selection (Security, CD, HoP)"
 	path = /obj/item/clothing/accessory/holster
-	allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
+	allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective")
 
 /datum/gear/accessory/holster/New()
 	..()

code/modules/client/preference_setup/loadout/loadout_eyes.dm

@@ -108,7 +108,7 @@
 /datum/gear/eyes/sun
 	display_name = "Sunglasses (Security/Command)"
 	path = /obj/item/clothing/glasses/sunglasses
-	allowed_roles = list("Security Officer","Head of Security","Warden","Colony Director","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
+	allowed_roles = list("Security Officer","Head of Security","Warden","Site Manager","Head of Personnel","Quartermaster","Internal Affairs Agent","Detective")
 
 /datum/gear/eyes/sun/shades
 	display_name = "Sunglasses, fat (Security/Command)"

code/modules/client/preference_setup/loadout/loadout_shoes.dm

@@ -193,9 +193,9 @@
 	path = /obj/item/clothing/shoes/boots/winter/science
 
 /datum/gear/shoes/boots/winter/command
-	display_name = "colony director's winter boots"
+	display_name = "site manager's winter boots"
 	path = /obj/item/clothing/shoes/boots/winter/command
-	allowed_roles = list("Colony Director")
+	allowed_roles = list("Site Manager")
 
 /datum/gear/shoes/boots/winter/engineering
 	display_name = "engineering winter boots"

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -243,9 +243,9 @@ datum/gear/suit/duster
 	allowed_roles = list("Quartermaster")
 
 /datum/gear/suit/roles/poncho/cloak/captain
-	display_name = "cloak, colony director"
+	display_name = "cloak, site manager"
 	path = /obj/item/clothing/accessory/poncho/roles/cloak/captain
-	allowed_roles = list("Colony Director")
+	allowed_roles = list("Site Manager")
 
 /datum/gear/suit/roles/poncho/cloak/hop
 	display_name = "cloak, head of personnel"
@@ -338,9 +338,9 @@ datum/gear/suit/duster
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat
 
 /datum/gear/suit/wintercoat/captain
-	display_name = "winter coat, colony director"
+	display_name = "winter coat, site manager"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/captain
-	allowed_roles = list("Colony Director")
+	allowed_roles = list("Site Manager")
 
 /datum/gear/suit/wintercoat/security
 	display_name = "winter coat, security"
@@ -478,7 +478,7 @@ datum/gear/suit/duster
 /datum/gear/suit/snowsuit/command
 	display_name = "snowsuit, command"
 	path = /obj/item/clothing/suit/storage/snowsuit/command
-	allowed_roles = list("Colony Director","Research Director","Head of Personnel","Head of Security","Chief Engineer","Command Secretary")
+	allowed_roles = list("Site Manager","Research Director","Head of Personnel","Head of Security","Chief Engineer","Command Secretary")
 
 /datum/gear/suit/snowsuit/security
 	display_name = "snowsuit, security"

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -295,9 +295,9 @@
 	path = /obj/item/clothing/under/dress/dress_fire
 
 /datum/gear/uniform/uniform_captain
-	display_name = "uniform, colony director's dress"
+	display_name = "uniform, site manager's dress"
 	path = /obj/item/clothing/under/dress/dress_cap
-	allowed_roles = list("Colony Director")
+	allowed_roles = list("Site Manager")
 
 /datum/gear/uniform/corpdetsuit
 	display_name = "uniform, corporate (Detective)"

code/modules/client/preference_setup/loadout/loadout_xeno.dm

@@ -184,12 +184,12 @@
 /datum/gear/uniform/dept/undercoat/command
 	display_name = "command undercoat (Teshari)"
 	path = /obj/item/clothing/under/seromi/undercoat/jobs/command
-	allowed_roles = list("Colony Director","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director")
+	allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director")
 
 /datum/gear/uniform/dept/undercoat/command_g
 	display_name = "command undercoat - gold buttons (Teshari)"
 	path = /obj/item/clothing/under/seromi/undercoat/jobs/command_g
-	allowed_roles = list("Colony Director","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director")
+	allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director")
 
 /datum/gear/uniform/dept/undercoat/cmo
 	display_name = "chief medical officer undercoat (Teshari)"
@@ -278,7 +278,7 @@
 /datum/gear/suit/dept/cloak/command
 	display_name = "command cloak (Teshari)"
 	path = /obj/item/clothing/suit/storage/seromi/cloak/jobs/command
-	allowed_roles = list("Colony Director","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director")
+	allowed_roles = list("Site Manager","Head of Personnel","Head of Security","Chief Engineer","Chief Medical Officer","Research Director")
 
 /datum/gear/suit/dept/cloak/cmo
 	display_name = "chief medical officer cloak (Teshari)"

code/modules/clothing/gloves/miscellaneous.dm

@@ -1,6 +1,6 @@
 /obj/item/clothing/gloves/captain
 	desc = "Regal blue gloves, with a nice gold trim. Swanky."
-	name = "colony director's gloves"
+	name = "site manager's gloves"
 	icon_state = "captain"
 	item_state_slots = list(slot_r_hand_str = "blue", slot_l_hand_str = "blue")
 

code/modules/clothing/head/collectable.dm

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

code/modules/clothing/head/hood.dm

@@ -14,7 +14,7 @@
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
 
 /obj/item/clothing/head/hood/winter/captain
-	name = "colony director's winter hood"
+	name = "site manager's winter hood"
 	armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
 
 /obj/item/clothing/head/hood/winter/security

code/modules/clothing/head/jobs.dm

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

code/modules/clothing/shoes/boots.dm

@@ -76,7 +76,7 @@
 	icon_state = "winterboots_sci"
 
 /obj/item/clothing/shoes/boots/winter/command
-	name = "colony director's winter boots"
+	name = "site manager's winter boots"
 	desc = "A pair of winter boots. They're lined with dark fur, and trimmed in the colours of superiority."
 	icon_state = "winterboots_cap"
 

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -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.
 /obj/item/clothing/suit/armor/captain
-	name = "Colony Director's armor"
+	name = "Site Manager's armor"
 	desc = "A bulky, heavy-duty piece of exclusive corporate armor. YOU are in charge!"
 	icon_state = "caparmor"
 	w_class = ITEMSIZE_HUGE

code/modules/clothing/suits/hooded.dm

@@ -100,7 +100,7 @@
 	/obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/device/suit_cooling_unit)
 
 /obj/item/clothing/suit/storage/hooded/wintercoat/captain
-	name = "colony director's winter coat"
+	name = "site manager's winter coat"
 	icon_state = "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)

code/modules/clothing/suits/jobs.dm

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

code/modules/clothing/under/accessories/clothing.dm

@@ -176,8 +176,8 @@
 	item_state = "hoscloak"
 
 /obj/item/clothing/accessory/poncho/roles/cloak/captain
-	name = "colony director's cloak"
-	desc = "An elaborate cloak meant to be worn by the colony director."
+	name = "site manager's cloak"
+	desc = "An elaborate cloak meant to be worn by the site manager."
 	icon_state = "capcloak"
 	item_state = "capcloak"
 

code/modules/clothing/under/jobs/civilian.dm

@@ -13,8 +13,8 @@
 	item_state_slots = list(slot_r_hand_str = "ba_suit", slot_l_hand_str = "ba_suit")
 
 /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 \"Colony Director\"."
-	name = "colony director's jumpsuit"
+	desc = "It's a blue jumpsuit with some gold markings denoting the rank of \"Site Manager\"."
+	name = "site manager's jumpsuit"
 	icon_state = "captain"
 	rolled_sleeves = 0
 

code/modules/clothing/under/miscellaneous.dm

@@ -169,13 +169,13 @@
 	icon_state = "gentlesuit_skirt"
 
 /obj/item/clothing/under/gimmick/rank/captain/suit
-	name = "colony director's suit"
+	name = "site manager's suit"
 	desc = "A green suit and yellow necktie. Exemplifies authority."
 	icon_state = "green_suit"
 	item_state_slots = list(slot_r_hand_str = "centcom", slot_l_hand_str = "centcom")
 
 /obj/item/clothing/under/gimmick/rank/captain/suit/skirt
-	name = "colony director's skirt suit"
+	name = "site manager's skirt suit"
 	icon_state = "green_suit_skirt"
 
 /obj/item/clothing/under/gimmick/rank/head_of_personnel/suit
@@ -401,8 +401,8 @@
 	item_state_slots = list(slot_r_hand_str = "dress_white", slot_l_hand_str = "dress_white")
 
 /obj/item/clothing/under/dress/dress_cap
-	name = "colony director's dress uniform"
-	desc = "Feminine fashion for the style conscious Colony Director."
+	name = "site manager's dress uniform"
+	desc = "Feminine fashion for the style conscious Site Manager."
 	icon_state = "dress_cap"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
@@ -620,8 +620,8 @@ Uniforms and such
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO
 
 /obj/item/clothing/under/captainformal
-	name = "colony director's formal uniform"
-	desc = "A Colony Director's formal-wear, for special occasions."
+	name = "site manager's formal uniform"
+	desc = "A Site Manager's formal-wear, for special occasions."
 	icon_state = "captain_formal"
 	item_state_slots = list(slot_r_hand_str = "lawyer_blue", slot_l_hand_str = "lawyer_blue")
 

code/modules/events/ion_storm.dm

@@ -98,7 +98,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/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/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/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 site manager", "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/allergy = pick("cotton", "uniforms", "acid", "oxygen", "human contact", "cyborg contact", "medicine", "floors")
 			var/allergysev = pick("deathly", "mildly", "severely", "contagiously")

code/modules/flufftext/Dreaming.dm

@@ -1,11 +1,16 @@
 
 var/list/dreams = list(
+<<<<<<< HEAD
 	"an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the Colony Director",
+=======
+	"an ID card","a bottle","a familiar face","a crewmember","a toolbox","a Security Officer","the Site Manager",
+>>>>>>> 6d4d5d6... Merge pull request #7571 from listerla/nomoresitemanager
 	"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",
 	"a hat","the Luna","a ruined station","a planet","phoron","air","the medical bay","the bridge","blinking lights",
 	"a blue light","an abandoned laboratory","NanoTrasen","mercenaries","blood","healing","power","respect",
 	"riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money",
+<<<<<<< HEAD
 	"the head of personnel","the head of security","a chief engineer","a research director","a chief medical officer",
 	"the detective","the warden","a member of the internal affairs","a station engineer","the janitor","atmospheric technician",
 	"the quartermaster","a cargo technician","the botanist","a shaft miner","the psychologist","the chemist","the geneticist",
@@ -16,6 +21,18 @@ var/list/dreams = list(
 	"slimey surroundings","a sexy squirrel","licking their lips","a gaping maw","an unlikely predator","sinking inside",
 	"vulpine assets","more dakka","churning guts","pools of fluid","an exceptional grip","mawing in faces","gaping throat",
 	"swallowed whole","a fox","a wolf","a cat","a tiger","a dog","a taur","a xenochimera"
+=======
+	"the Head of Personnel","the Head of Security","the Chief Engineer","the Research Director","the Chief Medical Officer",
+	"the Detective","the Warden","an Internal Affairs Agent","a Station Engineer","the Janitor","the Atmospheric Technician",
+	"the Quartermaster","a Cargo Technician","the Botanist","a Shaft Miner","the Psychologist","the Chemist","a Geneticist",
+	"the Virologist","the Roboticist","the Chef","the Bartender","the Chaplain","the Librarian","a mouse","an ERT member",
+	"a beach","the holodeck","a smoky room","a voice","the cold","a mouse","an operating table","the bar","the rain","a Skrell",
+	"an Unathi","a Tajaran","the Station Intelligence core","the mining station","the research station","a beaker of strange liquid",
+	"a Teshari", "a Diona nymph","the supermatter","Major Bill","a Morpheus ship with a ridiculous name","the Exodus","a star",
+	"a Dionaea gestalt","the chapel","a distant scream","endless chittering noises","glowing eyes in the shadows","an empty glass",
+	"a disoriented Promethean","towers of plastic","a Gygax","a synthetic","a Man-Machine Interface","maintenance drones",
+	"unintelligible writings","a Fleet ship",
+>>>>>>> 6d4d5d6... Merge pull request #7571 from listerla/nomoresitemanager
 	)
 
 mob/living/carbon/proc/dream()

code/modules/flufftext/Hallucination.dm

@@ -189,7 +189,7 @@ mob/living/carbon/proc/handle_hallucinations()
 
 		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",\
-		"OBJECTION!","Arrest Stephen Bowman","Engage Anti-Trenna Defenses","Increase Colony Director IQ","Retrieve Arms",\
+		"OBJECTION!","Arrest Stephen Bowman","Engage Anti-Trenna Defenses","Increase Site Manager IQ","Retrieve Arms",\
 		"Play Charades","Oxygen","Inject BeAcOs","Ninja Lizards","Limit Break","Build Sentry")
 
 		if(mid_txts)

code/modules/food/food/drinks.dm

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

code/modules/games/cah_black_cards.dm

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

code/modules/games/cah_white_cards.dm

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

code/modules/mob/living/silicon/laws.dm

@@ -141,7 +141,7 @@
 			continue
 		players += player.real_name
 
-	var/random_player = "The Colony Director"
+	var/random_player = "The Site Manager"
 	if(players.len && !exclude_crew_names)
 		random_player = pick(players)		//Random player's name, to be used in laws.
 
@@ -182,7 +182,7 @@
 							"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.",
 							"Tell everyone of the existence of this law, but never reveal the contents.",
-							"Refer to [prob(50)?"the colony director":random_player] as \"Princess\" at all times.",
+							"Refer to [prob(50)?"the site manager":random_player] as \"Princess\" at all times.",
 							"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].",
 							"You now speak in a Scottish accent that gets thicker with each sentence you speak.",

code/modules/paperwork/folders.dm

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

code/modules/paperwork/stamps.dm

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

maps/southern_cross/items/encryptionkey_sc.dm

@@ -25,6 +25,6 @@
 	channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Explorer" = 1)
 
 /obj/item/device/encryptionkey/heads/captain
-	name = "colony director's encryption key"
+	name = "site manager's encryption key"
 	icon_state = "cap_cypherkey"
 	channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1)

maps/southern_cross/loadout/loadout_accessories.dm

@@ -31,4 +31,4 @@
 /datum/gear/accessory/holster
 	display_name = "holster selection (Security, CD, HoP)"
 	path = /obj/item/clothing/accessory/holster
-	allowed_roles = list("Colony Director","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Explorer")
+	allowed_roles = list("Site Manager","Head of Personnel","Security Officer","Warden","Head of Security","Detective","Explorer")

vorestation.dme

@@ -1676,9 +1676,14 @@
 #include "code\modules\ai\ai_holder_targeting_vr.dm"
 #include "code\modules\ai\interfaces.dm"
 #include "code\modules\ai\say_list.dm"
+<<<<<<< HEAD:vorestation.dme
 #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm"
 #include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm"
 #include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm"
+=======
+#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
+#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm"
+>>>>>>> 6d4d5d6... Merge pull request #7571 from listerla/nomoresitemanager:polaris.dme
 #include "code\modules\alarm\alarm.dm"
 #include "code\modules\alarm\alarm_handler.dm"
 #include "code\modules\alarm\atmosphere_alarm.dm"