Merge remote-tracking branch 'upstream/master' into Races-port

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -980,7 +980,8 @@
 		"BootyM" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "bootypeaceM"), // SPLURT Addon (Hyper Port)
 		"BootyS" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "bootypeaceS"), // SPLURT Addon (Hyper Port)
 		"Vale" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "valepeace-b"), // SPLURT Adoon (Skyrat Port)
-		"Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakepeacebox")
+		"Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakepeacebox"),
+		"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_peacekeeper"), // SPLURT Adoon
 		))
 	var/peace_borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
 	switch(peace_borg_icon)
@@ -1038,6 +1039,10 @@
 			sleeper_overlay = "drakepeacesleeper"
 			cyborg_icon_override = 'modular_sand/icons/mob/cyborg/drakemech.dmi'
 			dogborg = TRUE
+		if("Assaultron") // SPLURT Addon
+			cyborg_base_icon = "assaultron_peacekeeper"
+			cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
+			hat_offset = 3
 		else
 			return FALSE
 	return ..()
@@ -1204,7 +1209,8 @@
 		"(Janitor) Borgi" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "borgi-jani-b"), // SPLURT Addon (Skyrat Port)
 		"(Janitor) Otie" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "otiej-b"), // SPLURT Addon (Skyrat Port)
 		"(Janitor) Fembot" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "fembot-service"), // SPLURT Addon
-		"(Janitor) Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakejanitbox")
+		"(Janitor) Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakejanitbox"),
+		"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_service"), // SPLURT Addon
 		)
 		var/list/L = list("(Service) DarkK9" = "k50", "(Service) Vale" = "valeserv", "(Service) ValeDark" = "valeservdark",
 						"(Janitor) Scrubpuppy" = "scrubpup")
@@ -1385,6 +1391,10 @@
 			cyborg_icon_override = 'modular_sand/icons/mob/cyborg/drakemech.dmi'
 			sleeper_overlay = "drakesecsleeper"
 			dogborg = TRUE
+		if("Assaultron") // SPLURT Addon
+			cyborg_base_icon = "assaultron_service"
+			cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
+			hat_offset = 3
 		else
 			return FALSE
 	return ..()
@@ -1445,7 +1455,8 @@
 		"Cargohound" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "cargohound-b"), // SPLURT Adoon (Skyrat Port)
 		"Cargohound Dark" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "cargohounddark-b"), // SPLURT Adoon (Skyrat Port)
 		"Otie" = image(icon = 'modular_splurt/icons/mob/widerobot.dmi', icon_state = "otiec-b"), // SPLURT Adoon (Skyrat Port)
-		"Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakeminebox")
+		"Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakeminebox"),
+		"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "assaultron_mining"), // SPLURT
 		)
 		var/list/L = list("Blade" = "blade", "Vale" = "valemine")
 		for(var/a in L)
@@ -1545,6 +1556,10 @@
 			cyborg_icon_override = 'modular_sand/icons/mob/cyborg/drakemech.dmi'
 			sleeper_overlay = "drakeminesleeper"
 			dogborg = TRUE
+		if("Assaultron") // SPLURT Addon
+			cyborg_base_icon = "assaultron_mining"
+			cyborg_icon_override = 'modular_splurt/icons/mob/robots.dmi'
+			hat_offset = 3
 		else
 			return FALSE
 	return ..()

html/changelogs/archive/2023-06.yml

@@ -6,3 +6,15 @@
   - rscadd: 'Emotes: *bork, *woof2, *merowr, *hoot, *wurble, *warble, *trill2, *rattle
       (snake rattling), *rpurr (raptor purr), *bawk, *moo.'
   - rscadd: 'Mememotes: *wolf-whistle, *rizz (Suggestions 4648 and 4660).'
+2023-06-09:
+  Anonymous:
+  - bugfix: Renames "Custodian" alt title into "Custodial Technician". This will fix
+      ID, Manifest and HUD icon issues.
+2023-06-11:
+  Zattarra:
+  - rscadd: Adds halos
+2023-06-12:
+  LeChatGuid2:
+  - rscadd: Bigger boobs on the Assaultrons
+  - tweak: Changed existing Assaultron sprites to differentiate them more easily
+  - imageadd: sprites for mining, cargo, peacekeeper and service Assaultrons.

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

@@ -120,10 +120,15 @@
 	LAZYADD(alt_titles, extra_titles)
 	. = ..()
 
-/datum/job/janitor/New()
+/datum/job/janitor/New() // "Custodian" is formally an ERT Janitor's job title. It causes conflict with ID and manifest. Yell at upstream maintainer(s).
+	var/list/rem_titles = list(
+		"Custodian"
+	)
 	var/list/extra_titles = list(
+		"Custodial Technician",
 		"Slutty Maid"
 	)
+	LAZYREMOVE(alt_titles, rem_titles)
 	LAZYADD(alt_titles, extra_titles)
 	. = ..()
 

modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/horns.dm

@@ -101,3 +101,9 @@
 	name = "High-rise Horns"
 	icon = 'modular_splurt/icons/mob/32x48_mutant_bodyparts.dmi'
 	icon_state = "highrisehorns"
+
+/datum/sprite_accessory/horns/halo
+	name = "Halo"
+	icon = 'modular_splurt/icons/mob/mutant_bodyparts.dmi'
+	icon_state = "halo"
+	relevant_layers = list(HORNS_LAYER, BODY_FRONT_LAYER)

modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -171,7 +171,9 @@
 		"MissM" = image(icon = 'modular_splurt/icons/mob/robots_cargo.dmi', icon_state = "missm_cargo"),
 		"Zoomba" = image(icon = 'modular_splurt/icons/mob/robots_cargo.dmi', icon_state = "zoomba_cargo"),
 		"Borgi" = image(icon = 'modular_splurt/icons/mob/widerobots_cargo.dmi', icon_state = "borgi-cargo"),
-		"Drake" = image(icon = 'modular_splurt/icons/mob/widerobots_cargo.dmi', icon_state = "drakecargo")
+		"Drake" = image(icon = 'modular_splurt/icons/mob/widerobots_cargo.dmi', icon_state = "drakecargo"),
+		"Assaultron" = image(icon = 'modular_splurt/icons/mob/robots_cargo.dmi', icon_state = "assaultron_cargo")
+
 		)
 		var/list/L = list("Cargohound" = "cargohound", "Cargohound Dark" = "cargohounddark", "Vale" = "valecargo")
 		for(var/a in L)
@@ -214,6 +216,10 @@
 			cyborg_base_icon = "drakecargo"
 			cyborg_icon_override = 'modular_splurt/icons/mob/widerobots_cargo.dmi'
 			dogborg = TRUE
+		if("Assaultron")
+			cyborg_base_icon = "assaultron_cargo"
+			cyborg_icon_override = 'modular_splurt/icons/mob/robots_cargo.dmi'
+			hat_offset = 3
 		else
 			return FALSE
 	return ..()