[WIP] mars sec (#856)

* housekeeping * detective > PI * hos > security marshal * remove det access * migrate prefs * work in progress sec stuff * single action revolver * MAP CHANGES + DET OFFICE + MORE !!! * remove chunky fingers from electrical gloves * mapfix * LAST MINUTE FIXES * tweaks * armory fix * oops * i hate this shade of brown * no det sec headset * map fixes * disposals fix (hopefully?) * screenshot fix * map fixes 2 --------- Co-authored-by: Kapu1178 <[email protected]>
DaedalusDock · Apr 13, 2024 · 8c8af1c · 8c8af1c
1 parent 314fe16
commit 8c8af1c
Show file tree

Hide file tree

Showing 100 changed files with 26,283 additions and 13,120 deletions.
diff --git a/_maps/map_files/Theseus/Theseus.dmm b/_maps/map_files/Theseus/Theseus.dmm
diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
@@ -33,17 +33,17 @@
 //Command
 #define JOB_CAPTAIN "Captain"
 #define JOB_HEAD_OF_PERSONNEL "Head of Personnel"
-#define JOB_HEAD_OF_SECURITY "Head of Security"
+#define JOB_SECURITY_MARSHAL "Security Marshal"
 #define JOB_RESEARCH_DIRECTOR "Research Director"
 #define JOB_CHIEF_ENGINEER "Chief Engineer"
-#define JOB_CHIEF_MEDICAL_OFFICER "Medical Director"
+#define JOB_MEDICAL_DIRECTOR "Medical Director"
 //Silicon
 #define JOB_AI "AI"
 #define JOB_CYBORG "Cyborg"
 #define JOB_PERSONAL_AI "Personal AI"
 //Security
-#define JOB_WARDEN "Warden"
-#define JOB_DETECTIVE "Detective"
+#define JOB_WARDEN "Brig Lieutenant"
+#define JOB_DETECTIVE "Private Investigator"
 #define JOB_SECURITY_OFFICER "Security Officer"
 #define JOB_SECURITY_OFFICER_MEDICAL "Security Officer (Medical)"
 #define JOB_SECURITY_OFFICER_ENGINEERING "Security Officer (Engineering)"
@@ -53,7 +53,7 @@
 #define JOB_STATION_ENGINEER "Station Engineer"
 #define JOB_ATMOSPHERIC_TECHNICIAN "Atmospheric Technician"
 //Medical
-#define JOB_MEDICAL_DOCTOR "Medical Doctor"
+#define JOB_MEDICAL_DOCTOR "General Practitioner"
 #define JOB_PARAMEDIC "Paramedic"
 #define JOB_CHEMIST "Chemist"
 #define JOB_VIROLOGIST "Virologist"
@@ -63,7 +63,7 @@
 #define JOB_GENETICIST "Geneticist"
 //Supply
 #define JOB_QUARTERMASTER "Quartermaster"
-#define JOB_CARGO_TECHNICIAN "Cargo Technician"
+#define JOB_DECKHAND "Deckhand"
 #define JOB_PROSPECTOR "Prospector"
 //Service
 #define JOB_BARTENDER "Bartender"
@@ -72,7 +72,7 @@
 #define JOB_JANITOR "Janitor"
 #define JOB_CLOWN "Clown"
 #define JOB_MIME "Mime"
-#define JOB_CURATOR "Curator"
+#define JOB_ARCHIVIST "Archivist"
 #define JOB_LAWYER "Lawyer"
 #define JOB_CHAPLAIN "Chaplain"
 #define JOB_PSYCHOLOGIST "Psychologist"

diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm
@@ -17,7 +17,7 @@
 #define LANGUAGE_APHASIA "aphasia"
 #define LANGUAGE_CTF "ctf"
 #define LANGUAGE_CULTIST "cultist"
-#define LANGUAGE_CURATOR "curator"
+#define LANGUAGE_ARCHIVIST "archivist"
 #define LANGUAGE_GLAND "gland"
 #define LANGUAGE_HAT "hat"
 #define LANGUAGE_MALF "malf"

diff --git a/code/__DEFINES/paint.dm b/code/__DEFINES/paint.dm
@@ -8,6 +8,10 @@
 #define PAINT_WALL_PRIAPUS "#74b274"
 #define PAINT_STRIPE_PRIAPUS PAINT_STRIPE_DAEDALUS
 
+//Mars Executive Outcomes
+#define PAINT_WALL_MARSEXECUTIVE PAINT_WALL_DAEDALUS
+#define PAINT_STRIPE_MARSEXECUTIVE "#683822"
+
 //Medical
 #define PAINT_WALL_MEDICAL "#FFFFFF"
 #define PAINT_STRIPE_MEDICAL "#FFFFFF"

diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm
@@ -166,13 +166,13 @@ SUBSYSTEM_DEF(id_access)
 		),
 		"[ACCESS_HOS]" = list(
 			"regions" = list(REGION_SECURITY),
-			"head" = JOB_HEAD_OF_SECURITY,
+			"head" = JOB_SECURITY_MARSHAL,
 			"templates" = list(),
 			"pdas" = list(),
 		),
 		"[ACCESS_CMO]" = list(
 			"regions" = list(REGION_MEDBAY),
-			"head" = JOB_CHIEF_MEDICAL_OFFICER,
+			"head" = JOB_MEDICAL_DIRECTOR,
 			"templates" = list(),
 			"pdas" = list(),
 		),
@@ -248,7 +248,7 @@ SUBSYSTEM_DEF(id_access)
 	desc_by_access["[ACCESS_SECURITY]"] = "Security"
 	desc_by_access["[ACCESS_BRIG]"] = "Holding Cells"
 	desc_by_access["[ACCESS_COURT]"] = "Courtroom"
-	desc_by_access["[ACCESS_FORENSICS]"] = "Forensics"
+	desc_by_access["[ACCESS_FORENSICS]"] = "P.I's Office"
 	desc_by_access["[ACCESS_MEDICAL]"] = "Medical"
 	desc_by_access["[ACCESS_GENETICS]"] = "Genetics Lab"
 	desc_by_access["[ACCESS_MORGUE]"] = "Morgue"

diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
@@ -48,8 +48,8 @@ SUBSYSTEM_DEF(job)
 		JOB_HEAD_OF_PERSONNEL = 2,
 		JOB_RESEARCH_DIRECTOR = 3,
 		JOB_CHIEF_ENGINEER = 4,
-		JOB_CHIEF_MEDICAL_OFFICER = 5,
-		JOB_HEAD_OF_SECURITY = 6,
+		JOB_MEDICAL_DIRECTOR = 5,
+		JOB_SECURITY_MARSHAL = 6,
 		JOB_QUARTERMASTER = 7,
 	)
 

diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm
@@ -148,7 +148,7 @@
 	return ..()
 
 /datum/id_trim/job/cargo_technician
-	assignment = "Cargo Technician"
+	assignment = JOB_DECKHAND
 	trim_state = "trim_cargotechnician"
 	sechud_icon_state = SECHUD_CARGO_TECHNICIAN
 	extra_access = list(ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION)
@@ -178,8 +178,8 @@
 	job = /datum/job/chemist
 
 /datum/id_trim/job/chief_engineer
-	assignment = "Chief Engineer"
-	intern_alt_name = "Chief Engineer-in-Training"
+	assignment = JOB_CHIEF_ENGINEER
+	intern_alt_name = JOB_CHIEF_ENGINEER + "-in-Training"
 	trim_state = "trim_chiefengineer"
 	sechud_icon_state = SECHUD_CHIEF_ENGINEER
 	extra_access = list(ACCESS_TELEPORTER)
@@ -232,7 +232,7 @@
 	sechud_icon_state = SECHUD_CHEF
 
 /datum/id_trim/job/curator
-	assignment = "Curator"
+	assignment = JOB_ARCHIVIST
 	trim_state = "trim_curator"
 	sechud_icon_state = SECHUD_CURATOR
 	extra_access = list()
@@ -242,12 +242,17 @@
 	job = /datum/job/curator
 
 /datum/id_trim/job/detective
-	assignment = "Detective"
+	assignment = JOB_DETECTIVE
 	trim_state = "trim_detective"
 	sechud_icon_state = SECHUD_DETECTIVE
 	extra_access = list()
-	minimal_access = list(ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS, ACCESS_BRIG_ENTRANCE,ACCESS_MAINT_TUNNELS, ACCESS_MORGUE,
-					ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_WEAPONS)
+	minimal_access = list(
+		ACCESS_FORENSICS,
+		ACCESS_MAINT_TUNNELS,
+		ACCESS_MORGUE,
+		ACCESS_MINERAL_STOREROOM,
+		ACCESS_WEAPONS
+	)
 	config_job = "detective"
 	template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS)
 	job = /datum/job/detective
@@ -291,8 +296,8 @@
 	job = /datum/job/head_of_personnel
 
 /datum/id_trim/job/head_of_security
-	assignment = "Head of Security"
-	intern_alt_name = "Head of Security-in-Training"
+	assignment = JOB_SECURITY_MARSHAL
+	intern_alt_name = JOB_SECURITY_MARSHAL + "-in-Training"
 	trim_state = "trim_headofsecurity"
 	sechud_icon_state = SECHUD_HEAD_OF_SECURITY
 	extra_access = list(ACCESS_TELEPORTER)
@@ -337,7 +342,7 @@
 	job = /datum/job/lawyer
 
 /datum/id_trim/job/medical_doctor
-	assignment = "Medical Doctor"
+	assignment = JOB_MEDICAL_DOCTOR
 	trim_state = "trim_medicaldoctor"
 	sechud_icon_state = SECHUD_MEDICAL_DOCTOR
 	extra_access = list(ACCESS_CHEMISTRY, ACCESS_VIROLOGY)

diff --git a/code/datums/voice_of_god_command.dm b/code/datums/voice_of_god_command.dm
@@ -150,7 +150,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands())
 	for(var/mob/living/carbon/target in listeners)
 		target.vomit(10 * power_multiplier, distance = power_multiplier, stun = FALSE)
 
-/// This command silences the listeners. Thrice as effective is the user is a mime or curator.
+/// This command silences the listeners. Thrice as effective is the user is a mime or archivist.
 /datum/voice_of_god_command/silence
 	trigger = "shut\\s*up|silence|be\\s*silent|ssh|quiet|hush"
 	cooldown = COOLDOWN_STUN

diff --git a/code/game/area/areas/station.dm b/code/game/area/areas/station.dm
@@ -401,7 +401,7 @@
 	icon_state = "hop_office"
 
 /area/station/command/heads_quarters/hos
-	name = "\improper Head of Security's Office"
+	name = "\improper Security Marshal's Office"
 	icon_state = "hos_office"
 
 /area/station/command/heads_quarters/rd
@@ -1080,10 +1080,22 @@
 	name = "\improper Security Office"
 	icon_state = "security"
 
+/area/station/security/office/hall
+	name = "\improper Security Office Hall"
+	icon_state = "security"
+
 /area/station/security/lockers
 	name = "\improper Security Locker Room"
 	icon_state = "securitylockerroom"
 
+/area/station/security/deck
+	name = "\improper Security Observation Deck"
+	icon_state = "security"
+
+/area/station/security/pig
+	name = "\improper Security Pig Pen"
+	icon_state = "security"
+
 /area/station/security/brig
 	name = "\improper Brig"
 	icon_state = "brig"
@@ -1092,6 +1104,10 @@
 	name = "\improper Holding Cell"
 	icon_state = "holding_cell"
 
+/area/station/security/isolation_cells
+	name = "\improper Isolation Cells"
+	icon_state = "holding_cell"
+
 /area/station/security/medical
 	name = "\improper Security Medical"
 	icon_state = "security_medical"
@@ -1170,12 +1186,11 @@
 	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
 /area/station/security/detectives_office
-	name = "\improper Detective's Office"
+	name = "\improper Private Investigator's Office"
 	icon_state = "detective"
 	ambientsounds = list('sound/ambience/ambidet1.ogg','sound/ambience/ambidet2.ogg')
 
 /area/station/security/detectives_office/private_investigators_office
-	name = "\improper Private Investigator's Office"
 	icon_state = "investigate_office"
 	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 

diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
@@ -56,7 +56,7 @@
 		JOB_CAPTAIN,
 		JOB_DETECTIVE,
 		JOB_HEAD_OF_PERSONNEL,
-		JOB_HEAD_OF_SECURITY,
+		JOB_SECURITY_MARSHAL,
 		JOB_SECURITY_OFFICER,
 		JOB_WARDEN,
 	)
@@ -86,11 +86,11 @@
 		JOB_AI,
 		JOB_CAPTAIN,
 		JOB_CHIEF_ENGINEER,
-		JOB_CHIEF_MEDICAL_OFFICER,
+		JOB_MEDICAL_DIRECTOR,
 		JOB_CYBORG,
 		JOB_DETECTIVE,
 		JOB_HEAD_OF_PERSONNEL,
-		JOB_HEAD_OF_SECURITY,
+		JOB_SECURITY_MARSHAL,
 		JOB_PRISONER,
 		JOB_RESEARCH_DIRECTOR,
 		JOB_SECURITY_OFFICER,
@@ -101,7 +101,7 @@
 		JOB_CYBORG,
 		JOB_CAPTAIN,
 		JOB_DETECTIVE,
-		JOB_HEAD_OF_SECURITY,
+		JOB_SECURITY_MARSHAL,
 		JOB_SECURITY_OFFICER,
 		JOB_WARDEN,
 	)
@@ -183,7 +183,7 @@
 		JOB_CAPTAIN,
 		JOB_DETECTIVE,
 		JOB_HEAD_OF_PERSONNEL,
-		JOB_HEAD_OF_SECURITY,
+		JOB_SECURITY_MARSHAL,
 		JOB_PRISONER,
 		JOB_SECURITY_OFFICER,
 		JOB_WARDEN,