[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>

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",
+	)

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

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.'"

modular_skyrat/modules/departmentization/quartermaster.dm

@@ -0,0 +1,2 @@
+/datum/outfit/job/quartermaster
+	uniform = /obj/item/clothing/under/rank/cargo/qm/skyrat/turtleneck

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

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,

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"