Merge remote-tracking branch 'upstream/master'

modular_sand/code/modules/jobs/job_types/_job_alt_titles.dm

@@ -1,97 +1,201 @@
 //Command
 /datum/job/captain
-	alt_titles = list("Colony Overseer", "Senator", "Consul")
+	alt_titles = list(
+		"Colony Overseer",
+		"Senator",
+		"Consul"
+		)
 
 /datum/job/chief_engineer
-	alt_titles = list("Senior Engineer")
+	alt_titles = list(
+		"Senior Engineer"
+		)
 
 /datum/job/hop
-	alt_titles = list("Crew Resource Officer", "Executive Officer")
+	alt_titles = list(
+		"Crew Resource Officer",
+		"Executive Officer"
+		)
 
 /datum/job/hos
-	alt_titles = list("Chief of Security", "Sheriff", "Praetor")
+	alt_titles = list(
+		"Chief of Security",
+		"Sheriff",
+		"Praetor"
+		)
 
 /datum/job/qm
-	alt_titles = list("Resource Manager", "Logistics Supervisor")
+	alt_titles = list(
+		"Resource Manager",
+		"Logistics Supervisor"
+		)
 
 /datum/job/rd
-	alt_titles = list("Chief Science Officer", "Research Overseer")
+	alt_titles = list(
+		"Chief Science Officer",
+		"Research Overseer"
+		)
 
 //Engineering
 /datum/job/atmos
-	alt_titles = list("Firefighter", "Life Support Specialist")
+	alt_titles = list(
+		"Firefighter",
+		"Life Support Specialist"
+		)
 
 /datum/job/engineer
-	alt_titles = list("Maintenance Technician", "Engine Technician", "Electrician")
+	alt_titles = list(
+		"Maintenance Technician",
+		"Engine Technician",
+		"Electrician"
+		)
 
 //Service
 /datum/job/assistant
-	alt_titles = list("Civilian", "Visitor", "Businessman", "Trader", "Entertainer", "Intern", "Off-Duty Civilian")
+	alt_titles = list(
+		"Civilian",
+		"Visitor",
+		"Businessman",
+		"Trader",
+		"Entertainer",
+		"Intern",
+		"Off-Duty Civilian"
+		)
 
 /datum/job/bartender
-	alt_titles = list("Barista")
+	alt_titles = list(
+		"Barista"
+		)
 
 /datum/job/chaplain
-	alt_titles = list("Priest", "Cult Leader", "Pope", "Bichop", "Pontiff")
+	alt_titles = list(
+		"Priest",
+		"Cult Leader",
+		"Pope",
+		"Bishop", // How about you actually say something about it instead of crying on a downstream's comments i won't read.
+		"Pontiff"
+		)
 
 /datum/job/clown //The most useless role in the game, delet this
-	alt_titles = list("Entertainer")
+	alt_titles = list(
+		"Entertainer"
+		)
 
 /datum/job/cook
-	alt_titles = list("Culinary Artist", "Butcher", "Chef", "Nutritionist")
+	alt_titles = list(
+		"Culinary Artist",
+		"Butcher",
+		"Chef",
+		"Nutritionist"
+		)
 
 /datum/job/curator
-	alt_titles = list("Journalist", "Librarian")
+	alt_titles = list(
+		"Journalist",
+		"Librarian"
+		)
 
 /datum/job/hydro
-	alt_titles = list("Gardener", "Herbalist", "Botanical Researcher", "Florist")
+	alt_titles = list(
+		"Gardener",
+		"Herbalist",
+		"Botanical Researcher",
+		"Florist"
+		)
 
 /datum/job/janitor
-	alt_titles = list("Custodian", "Sanitation Technician", "Maid")
+	alt_titles = list(
+		"Custodian",
+		"Sanitation Technician",
+		"Maid"
+		)
 
 /datum/job/lawyer
-	alt_titles = list("Human Resources Agent", "Internal Affairs Agent")
+	alt_titles = list(
+		"Human Resources Agent",
+		"Internal Affairs Agent"
+		)
 
 /datum/job/mime
-	alt_titles = list("Performer")
+	alt_titles = list(
+		"Performer"
+		)
 
 //Science
 /datum/job/roboticist
-	alt_titles = list("Biomechanical Engineer", "Mechatronic Engineer", "Mechanic", "Robotics Operator")
+	alt_titles = list(
+		"Biomechanical Engineer",
+		"Mechatronic Engineer",
+		"Mechanic",
+		"Robotics Operator"
+		)
 
 /datum/job/scientist
-	alt_titles = list("Circuitry Designer", "Xenobiologist", "Xenobotanist", "Chemical Researcher")
+	alt_titles = list(
+		"Circuitry Designer",
+		"Xenobiologist",
+		"Xenobotanist",
+		"Chemical Researcher"
+		)
 
 //Medical
 /datum/job/chemist
-	alt_titles = list("Pharmacist", "Pharmacologist")
+	alt_titles = list(
+		"Pharmacist",
+		"Pharmacologist"
+		)
 
 /datum/job/doctor
-	alt_titles = list("Nurse", "Surgeon", "Medical Secretary")
+	alt_titles = list(
+		"Nurse",
+		"Surgeon",
+		"Medical Secretary"
+		)
 
 /datum/job/geneticist
-	alt_titles = list("Genetic Therapist")
+	alt_titles = list(
+		"Genetic Therapist"
+		)
 
 /datum/job/paramedic
-	alt_titles = list("Emergency Medical Technician")
+	alt_titles = list(
+		"Emergency Medical Technician"
+		)
 
 /datum/job/virologist
-	alt_titles = list("Pathologist")
+	alt_titles = list(
+		"Pathologist"
+		)
 
 //Security
 /datum/job/detective
-	alt_titles = list("Forensics Technician", "Private Investigator")
+	alt_titles = list(
+		"Forensics Technician",
+		"Private Investigator"
+		)
 
 /datum/job/officer
-	alt_titles = list("Security Agent", "Security Guard", "Guardsman", "Enforcer", "Police Officer")
+	alt_titles = list(
+		"Security Cadet",
+		"Security Guard",
+		"Peacekeeper",
+		"Enforcer"
+		)
 
 /datum/job/warden
-	alt_titles = list("Brig Chief")
+	alt_titles = list(
+		"Brig Chief"
+		)
 
 //Cargo
 
 /datum/job/cargo_tech
-	alt_titles = list("Shipping Specialist", "Delivery Manager")
+	alt_titles = list(
+		"Shipping Specialist",
+		"Delivery Manager"
+		)
 
 /datum/job/mining
-	alt_titles = list("Explorer")
+	alt_titles = list(
+		"Explorer"
+		)

modular_sand/code/modules/mob/dead/new_player/sprite_accessories/ears.dm

@@ -9,3 +9,10 @@
 	icon = 'modular_sand/icons/mob/mam_ears.dmi'
 	icon_state = "cobraears"
 	matrixed_sections = MATRIX_RED_GREEN
+
+/datum/sprite_accessory/ears/mam_ears/zorgoia //Ported from ARFS-Coyote
+	name = "Zorgoia"
+	icon_state = "zorgoia"
+	icon = 'modular_sand/icons/mob/mam_ears.dmi'
+	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED

modular_sand/code/modules/mob/dead/new_player/sprite_accessories/tails.dm

@@ -9,3 +9,24 @@
 	icon = 'modular_sand/icons/mob/mam_tails.dmi'
 	icon_state = "demonspade"
 	matrixed_sections = MATRIX_RED
+
+/datum/sprite_accessory/tails/mam_tails/zorgoia //Ported from ARFS-Coyote
+	name = "Zorgoia"
+	icon_state = "zorgoia"
+	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+	matrixed_sections = MATRIX_ALL
+
+/datum/sprite_accessory/tails/mam_tails/fennecdown //Ported from ARFS-Coyote
+	name = "Downward Fennec Tail"
+	icon_state = "downwardfennec"
+	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN
+
+/datum/sprite_accessory/tails/human/fennecdown //Ported from ARFS-Coyote
+	name = "Downward Fennec Tail"
+	icon_state = "downwardfennec"
+	icon = 'modular_sand/icons/mob/mam_tails.dmi'
+	color_src = MATRIXED
+	matrixed_sections = MATRIX_RED_GREEN