From bf95cd0d0ad103690f975a282feaead40cc14524 Mon Sep 17 00:00:00 2001
From: RatFromTheJungle <62520989+RatFromTheJungle@users.noreply.github.com>
Date: Tue, 24 Jan 2023 17:28:54 -0500
Subject: [PATCH] [awh hell naw] the first step of the great cargo renamen-ing
 (#18670)

* Update alt_job_titles.dm

* Create cargo_technician.dm

* Create quartermaster.dm

* Update tgstation.dme

* Update wardrobes.dm

* Update loadout_datum_heads.dm

* Create clothing_overrides

* Update tgstation.dme

* despite claims to the contrary, I did not forget to put a .dm when transplanting this from where it was before

* so be it

* does the entire list like that

* why didn't this fail on local

* Update alt_job_titles.dm

* Delete screenshot_antag_icons_bloodbrother.png

* Add files via upload

* Update modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* pressed tab 68x, also, removes or edits two redundant comments

* Update cargo_technician.dm

* Update quartermaster.dm

* Update alt_job_titles.dm

* oop

* vile wretched ghoul released a plague upon this wo

rld and then the evil when the when he

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
---
 .../screenshot_antag_icons_bloodbrother.png   | Bin 2438 -> 2424 bytes
 .../code/alt_job_titles.dm                    | 323 +++++++++++++++---
 .../departmentization/cargo_technician.dm     |   2 +
 .../departmentization/clothing_overrides.dm   |   7 +
 .../departmentization/quartermaster.dm        |   2 +
 .../loadout_items/loadout_datum_heads.dm      |   5 +
 .../modules/modular_vending/code/wardrobes.dm |   1 +
 tgstation.dme                                 |   3 +
 8 files changed, 301 insertions(+), 42 deletions(-)
 create mode 100644 modular_skyrat/modules/departmentization/cargo_technician.dm
 create mode 100644 modular_skyrat/modules/departmentization/clothing_overrides.dm
 create mode 100644 modular_skyrat/modules/departmentization/quartermaster.dm

diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_bloodbrother.png
index 075dd5aefcd93d29e6bb38e2970f215ff45cd80a..6efd4c919db99294766c8b234f58e1835819b1ab 100644
GIT binary patch
delta 2294
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
b-QB%6or%8L(TG95?`3Uef3D)}wU~bc#yEH1

delta 2308
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

diff --git a/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm b/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm
index 803a9eef344..4b7fb72945b 100644
--- a/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm
+++ b/modular_skyrat/modules/alternative_job_titles/code/alt_job_titles.dm
@@ -10,114 +10,317 @@
 
 
 /datum/job/ai
-	alt_titles = list("AI", "Station Intelligence", "Automated Overseer")
+	alt_titles = list(
+		"AI",
+		"Station Intelligence", 
+		"Automated Overseer"
+	)
 
 /datum/job/assistant
-	alt_titles = list("Assistant", "Civilian", "Tourist", "Businessman", "Businesswoman", "Trader", "Entertainer", "Freelancer", "Artist", "Off-Duty Staff", "Off-Duty Crew")
+	alt_titles = list(
+		"Assistant", 
+		"Civilian", 
+		"Tourist", 
+		"Businessman", 
+		"Businesswoman", 
+		"Trader", 
+		"Entertainer", 
+		"Freelancer", 
+		"Artist", 
+		"Off-Duty Staff", 
+		"Off-Duty Crew",
+	)
 
 /datum/job/atmospheric_technician
-	alt_titles = list("Atmospheric Technician", "Life Support Technician", "Emergency Fire Technician", "Firefighter")
+	alt_titles = list(
+		"Atmospheric Technician", 
+		"Life Support Technician", 
+		"Emergency Fire Technician", 
+		"Firefighter",
+	)
 
 /datum/job/barber
-	alt_titles = list("Barber", "Salon Manager", "Salon Technician", "Stylist", "Colorist")
+	alt_titles = list(
+		"Barber",
+		"Salon Manager",
+		"Salon Technician",
+		"Stylist", 
+		"Colorist",
+	)
 
 /datum/job/bartender
-	alt_titles = list("Bartender", "Mixologist", "Barkeeper", "Barista")
+	alt_titles = list(
+		"Bartender", 
+		"Mixologist", 
+		"Barkeeper", 
+		"Barista",
+	)
 
 /datum/job/blueshield
-	alt_titles = list("Blueshield", "Command Bodyguard", "Executive Protection Agent")
+	alt_titles = list(
+		"Blueshield", 
+		"Command Bodyguard", 
+		"Executive Protection Agent",
+	)
 
 /datum/job/botanist
-	alt_titles = list("Botanist", "Hydroponicist", "Gardener", "Botanical Researcher", "Herbalist", "Florist")
+	alt_titles = list(
+		"Botanist", 
+		"Hydroponicist", 
+		"Gardener",
+		"Botanical Researcher",
+		"Herbalist", 
+		"Florist",
+	)
 
 /datum/job/bouncer
-	alt_titles = list("Bouncer", "Service Guard")
+	alt_titles = list(
+		"Bouncer", 
+		"Service Guard",
+	)
 
 /datum/job/corrections_officer
-	alt_titles = list("Corrections Officer", "Brig Officer", "Prison Guard")
+	alt_titles = list(
+		"Corrections Officer", 
+		"Brig Officer", 
+		"Prison Guard",
+	)
 
 /datum/job/captain
-	alt_titles = list("Captain", "Station Commander", "Commanding Officer", "Site Manager")
+	alt_titles = list(
+		"Captain", 
+		"Station Commander", 
+		"Commanding Officer", 
+		"Site Manager",
+	)
 
 /datum/job/cargo_technician
-	alt_titles = list("Cargo Technician", "Deck Worker", "Mailman")
+	alt_titles = list(
+		"Warehouse Technician", 
+		"Deck Worker", 
+		"Mailman", 
+		"Union Associate",
+		"Inventory Associate",
+	)
 
 /datum/job/chaplain
-	alt_titles = list("Chaplain", "Priest", "Preacher", "Reverend", "Oracle", "Pontifex", "Magister", "High Priest", "Imam", "Rabbi", "Monk") //i would add OT III but honestly, thats way too specific
+	alt_titles = list(
+		"Chaplain", 
+		"Priest", 
+		"Preacher", 
+		"Reverend", 
+		"Oracle", 
+		"Pontifex", 
+		"Magister", 
+		"High Priest", 
+		"Imam", 
+		"Rabbi", 
+		"Monk",
+	) 
 
 /datum/job/chemist
-	alt_titles = list("Chemist", "Pharmacist", "Pharmacologist", "Trainee Pharmacist")
+	alt_titles = list(
+		"Chemist", 
+		"Pharmacist", 
+		"Pharmacologist", 
+		"Trainee Pharmacist",
+	)
 
 /datum/job/chief_engineer
-	alt_titles = list("Chief Engineer", "Engineering Foreman", "Head of Engineering")
+	alt_titles = list(
+		"Chief Engineer", 
+		"Engineering Foreman", 
+		"Head of Engineering",
+	)
 
 /datum/job/chief_medical_officer
-	alt_titles = list("Chief Medical Officer", "Medical Director", "Head of Medical", "Chief Physician", "Head Physician")
+	alt_titles = list(
+		"Chief Medical Officer", 
+		"Medical Director", 
+		"Head of Medical", 
+		"Chief Physician", 
+		"Head Physician",
+	)
 
 /datum/job/clown
-	alt_titles = list("Clown", "Jester", "Joker", "Comedian")
+	alt_titles = list(
+		"Clown", 
+		"Jester", 
+		"Joker", 
+		"Comedian",
+	)
 
 /datum/job/cook
-	alt_titles = list("Cook", "Chef", "Butcher", "Culinary Artist", "Sous-Chef")
+	alt_titles = list(
+		"Cook", 
+		"Chef", 
+		"Butcher", 
+		"Culinary Artist", 
+		"Sous-Chef",
+	)
 
 /datum/job/curator
-	alt_titles = list("Curator", "Librarian", "Journalist", "Archivist")
+	alt_titles = list(
+		"Curator", 
+		"Librarian", 
+		"Journalist", 
+		"Archivist",
+	)
 
 /datum/job/customs_agent
-	alt_titles = list("Customs Agent", "Customs Guard", "Supply Guard")
+	alt_titles = list(
+		"Customs Agent", 
+		"Supply Guard",
+	)
 
 /datum/job/cyborg
-	alt_titles = list("Cyborg", "Robot", "Android")
+	alt_titles = list(
+		"Cyborg", 
+		"Robot", 
+		"Android",
+	)
 
 /datum/job/detective
-	alt_titles = list("Detective", "Forensic Technician", "Private Investigator", "Forensic Scientist")
+	alt_titles = list(
+		"Detective", 
+		"Forensic Technician", 
+		"Private Investigator", 
+		"Forensic Scientist",
+	)
 
 /datum/job/doctor
-	alt_titles = list("Medical Doctor", "Surgeon", "Nurse", "General Practitioner", "Medical Resident", "Physician")
+	alt_titles = list(
+		"Medical Doctor", 
+		"Surgeon", 
+		"Nurse", 
+		"General Practitioner", 
+		"Medical Resident", 
+		"Physician",
+	)
 
 /datum/job/engineering_guard //see orderly
 
 /datum/job/geneticist
-	alt_titles = list("Geneticist", "Mutation Researcher")
+	alt_titles = list(
+		"Geneticist", 
+		"Mutation Researcher",
+	)
 
 /datum/job/head_of_personnel
-	alt_titles = list("Head of Personnel", "Executive Officer", "Employment Officer", "Crew Supervisor")
+	alt_titles = list(
+		"Head of Personnel", 
+		"Executive Officer", 
+		"Employment Officer", 
+		"Crew Supervisor",
+	)
 
 /datum/job/head_of_security
-	alt_titles = list("Head of Security", "Security Commander", "Chief Constable", "Chief of Security", "Sheriff")
+	alt_titles = list(
+		"Head of Security", 
+		"Security Commander", 
+		"Chief Constable", 
+		"Chief of Security", 
+		"Sheriff",
+	)
 
 /datum/job/janitor
-	alt_titles = list("Janitor", "Custodian", "Custodial Technician", "Sanitation Technician", "Maintenance Technician", "Concierge", "Maid")
+	alt_titles = list(
+		"Janitor", 
+		"Custodian", 
+		"Custodial Technician", 
+		"Sanitation Technician", 
+		"Maintenance Technician", 
+		"Concierge", 
+		"Maid",
+	)
 
 /datum/job/lawyer
-	alt_titles = list("Lawyer", "Internal Affairs Agent", "Human Resources Agent", "Defence Attorney", "Public Defender", "Barrister", "Prosecutor", "Legal Clerk")
+	alt_titles = list(
+		"Lawyer", 
+		"Internal Affairs Agent", 
+		"Human Resources Agent", 
+		"Defence Attorney", 
+		"Public Defender", 
+		"Barrister", 
+		"Prosecutor", 
+		"Legal Clerk",
+	)
 
 /datum/job/mime
-	alt_titles = list("Mime", "Pantomimist")
+	alt_titles = list(
+		"Mime", 
+		"Pantomimist",
+	)
 
 /datum/job/nanotrasen_consultant
-	alt_titles = list("Nanotrasen Consultant", "Nanotrasen Diplomat", "Central Command Consultant", "Nanotrasen Representative", "Central Command Representative")
+	alt_titles = list(
+		"Nanotrasen Consultant", 
+		"Nanotrasen Diplomat", 
+		"Central Command Consultant", 
+		"Nanotrasen Representative", 
+		"Central Command Representative",
+	)
 
 /datum/job/orderly
-	alt_titles = list("Orderly", "Medical Guard") //other dept guards' alt-titles should be kept to [department] guard to avoid confusion
+	alt_titles = list(
+		"Orderly", 
+		"Medical Guard",
+	) //other dept guards' alt-titles should be kept to [department] guard to avoid confusion, unless the department gets a re-do.
 
 /datum/job/paramedic
-	alt_titles = list("Paramedic", "Emergency Medical Technician", "Search and Rescue Technician")
+	alt_titles = list(
+		"Paramedic", 
+		"Emergency Medical Technician", 
+		"Search and Rescue Technician",
+	)
 
 /datum/job/prisoner
-	alt_titles = list("Prisoner", "Minimum Security Prisoner", "Maximum Security Prisoner", "SuperMax Security Prisoner", "Protective Custody Prisoner", "Convict", "Felon", "Inmate")
+	alt_titles = list(
+		"Prisoner", 
+		"Minimum Security Prisoner", 
+		"Maximum Security Prisoner", 
+		"SuperMax Security Prisoner", 
+		"Protective Custody Prisoner", 
+		"Convict", 
+		"Felon", 
+		"Inmate",
+	)
 
 /datum/job/psychologist
-	alt_titles = list("Psychologist", "Psychiatrist", "Therapist", "Counsellor")
+	alt_titles = list(
+		"Psychologist", 
+		"Psychiatrist", 
+		"Therapist", 
+		"Counsellor",
+	)
 
 /datum/job/quartermaster
-	alt_titles = list("Quartermaster", "Deck Chief", "Supply Foreman", "Head of Supply", "Chief Requisition Officer", "Logistics Officer")
+	alt_titles = list(
+		"Union Requisitions Officer", 
+		"Deck Chief",
+		"Warehouse Supervisor",
+		"Supply Foreman", 
+		"Head of Supply", 
+		"Logistics Coordinator",
+	)
 
 /datum/job/research_director
-	alt_titles = list("Research Director", "Silicon Administrator", "Lead Researcher", "Biorobotics Director", "Research Supervisor", "Chief Science Officer")
+	alt_titles = list(
+		"Research Director", 
+		"Silicon Administrator", 
+		"Lead Researcher", 
+		"Biorobotics Director", 
+		"Research Supervisor", 
+		"Chief Science Officer",
+	)
 
 /datum/job/roboticist
-	alt_titles = list("Roboticist", "Biomechanical Engineer", "Mechatronic Engineer", "Apprentice Roboticist")
+	alt_titles = list(
+		"Roboticist", 
+		"Biomechanical Engineer", 
+		"Mechatronic Engineer", 
+		"Apprentice Roboticist",
+	)
 
 /datum/job/science_guard //See orderly
 
@@ -138,19 +341,55 @@
 	)
 
 /datum/job/security_medic
-	alt_titles = list("Security Medic", "Field Medic", "Security Corpsman", "Brig Physician", "Combat Medic")
+	alt_titles = list(
+		"Security Medic", 
+		"Field Medic", 
+		"Security Corpsman", 
+		"Brig Physician", 
+		"Combat Medic",
+	)
 
 /datum/job/security_officer
-	alt_titles = list("Security Officer", "Security Operative", "Peacekeeper", "Security Cadet")
+	alt_titles = list(
+		"Security Officer", 
+		"Security Operative", 
+		"Peacekeeper", 
+		"Security Cadet",
+	)
 
 /datum/job/shaft_miner
-	alt_titles = list("Shaft Miner", "Excavator", "Spelunker", "Drill Technician", "Prospector")
+	alt_titles = list(
+		"Union Miner", 
+		"Excavator", 
+		"Spelunker", 
+		"Drill Technician", 
+		"Prospector",
+	)
 
 /datum/job/station_engineer
-	alt_titles = list("Station Engineer", "Emergency Damage Control Technician", "Electrician", "Engine Technician", "EVA Technician", "Mechanic", "Apprentice Engineer", "Engineering Trainee")
+	alt_titles = list(
+		"Station Engineer", 
+		"Emergency Damage Control Technician", 
+		"Electrician", 
+		"Engine Technician", 
+		"EVA Technician", 
+		"Mechanic", 
+		"Apprentice Engineer", 
+		"Engineering Trainee",
+	)
 
 /datum/job/virologist
-	alt_titles = list("Virologist", "Pathologist", "Junior Pathologist")
+	alt_titles = list(
+		"Virologist", 
+		"Pathologist", 
+		"Junior Pathologist",
+	)
 
 /datum/job/warden
-	alt_titles = list("Warden", "Brig Sergeant", "Dispatch Officer", "Brig Governor", "Jailer")
+	alt_titles = list(
+		"Warden", 
+		"Brig Sergeant", 
+		"Dispatch Officer", 
+		"Brig Governor",
+		"Jailer",
+	)
diff --git a/modular_skyrat/modules/departmentization/cargo_technician.dm b/modular_skyrat/modules/departmentization/cargo_technician.dm
new file mode 100644
index 00000000000..c32ab60affc
--- /dev/null
+++ b/modular_skyrat/modules/departmentization/cargo_technician.dm
@@ -0,0 +1,2 @@
+/datum/outfit/job/cargo_tech
+	uniform = /obj/item/clothing/under/rank/cargo/tech/skyrat/turtleneck
diff --git a/modular_skyrat/modules/departmentization/clothing_overrides.dm b/modular_skyrat/modules/departmentization/clothing_overrides.dm
new file mode 100644
index 00000000000..6de4a1dd9e1
--- /dev/null
+++ b/modular_skyrat/modules/departmentization/clothing_overrides.dm
@@ -0,0 +1,7 @@
+/obj/item/clothing/under/rank/cargo/tech
+	name = "cargo technician's jumpsuit"
+	desc = "A jumpsuit from the previous supply-department, a tag on the collar says, 'Production Line: 2557, Product of Nanotrasen.'"
+  
+/obj/item/clothing/under/rank/cargo/tech/skirt
+	name = "cargo technician's jumpskirt"
+	desc = "A jumpskirt from the previous supply-department, a tag on the collar says, 'Production Line: 2557, Product of Nanotrasen.'"
diff --git a/modular_skyrat/modules/departmentization/quartermaster.dm b/modular_skyrat/modules/departmentization/quartermaster.dm
new file mode 100644
index 00000000000..5ca4528ecab
--- /dev/null
+++ b/modular_skyrat/modules/departmentization/quartermaster.dm
@@ -0,0 +1,2 @@
+/datum/outfit/job/quartermaster
+	uniform = /obj/item/clothing/under/rank/cargo/qm/skyrat/turtleneck
diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm
index 1b140ed9e11..ace45ec3f57 100644
--- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm
+++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_heads.dm
@@ -557,6 +557,11 @@ GLOBAL_LIST_INIT(loadout_helmets, generate_loadout_items(/datum/loadout_item/hea
 	item_path = /obj/item/clothing/head/beret/engi
 	restricted_roles = list(JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_CHIEF_ENGINEER, JOB_ENGINEERING_GUARD)
 
+/datum/loadout_item/head/cargo_beret
+	name = "Supply Beret"
+	item_path = /obj/item/clothing/head/beret/cargo
+	restricted_roles = list(JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_SHAFT_MINER, JOB_CUSTOMS_AGENT)
+
 /datum/loadout_item/head/beret_med
 	name = "Medical Beret"
 	item_path = /obj/item/clothing/head/beret/medical
diff --git a/modular_skyrat/modules/modular_vending/code/wardrobes.dm b/modular_skyrat/modules/modular_vending/code/wardrobes.dm
index 62ef6f35a8c..93c1c856b03 100644
--- a/modular_skyrat/modules/modular_vending/code/wardrobes.dm
+++ b/modular_skyrat/modules/modular_vending/code/wardrobes.dm
@@ -37,6 +37,7 @@
 		/obj/item/clothing/under/rank/cargo/tech/skyrat/long = 3,
 		/obj/item/clothing/under/rank/cargo/tech/skyrat/gorka = 3,
 		/obj/item/clothing/under/rank/cargo/tech/skyrat/turtleneck = 3,
+		/obj/item/clothing/under/rank/cargo/tech/skyrat/turtleneck/skirt = 3,
 		/obj/item/clothing/under/rank/cargo/tech/skyrat/utility = 3,
 		/obj/item/clothing/under/rank/cargo/tech/skyrat/casualman = 3,
 		/obj/item/clothing/suit/gorka/supply = 3,
diff --git a/tgstation.dme b/tgstation.dme
index 839575b10d9..44c570e5edb 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5838,6 +5838,9 @@
 #include "modular_skyrat\modules\decay_subsystem\code\decaySS.dm"
 #include "modular_skyrat\modules\decay_subsystem\code\nests.dm"
 #include "modular_skyrat\modules\decay_subsystem\code\spawn_nest.dm"
+#include "modular_skyrat\modules\departmentization\cargo_technician.dm"
+#include "modular_skyrat\modules\departmentization\clothing_overrides.dm"
+#include "modular_skyrat\modules\departmentization\quartermaster.dm"
 #include "modular_skyrat\modules\digi_bloodsole\code\_shoes.dm"
 #include "modular_skyrat\modules\dogfashion\code\head.dm"
 #include "modular_skyrat\modules\drone_adjustments\drone.dm"