Merge remote-tracking branch 'upstream/merge-upstream' into merge-ups…

…tream

_maps/RandomRuins/SpaceRuins/interdyne.dmm

@@ -104,7 +104,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
 "eJ" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/structure/cable,
@@ -496,7 +496,7 @@
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
 "uy" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
 "vd" = (
@@ -656,7 +656,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/interdyne)
 "By" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/interdyne)
@@ -672,7 +672,7 @@
 /turf/open/floor/iron/smooth,
 /area/ruin/space/has_grav/interdyne)
 "DA" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
@@ -719,7 +719,7 @@
 /area/ruin/space/has_grav/interdyne)
 "Ft" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)
@@ -732,7 +732,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/interdyne)
 "FC" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /obj/structure/cable,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/space/has_grav/interdyne)

_maps/RandomRuins/SpaceRuins/meatderelict.dmm

@@ -1008,7 +1008,7 @@
 /area/ruin/space/has_grav/powered/biooutpost)
 "tv" = (
 /obj/effect/decal/cleanable/blood/tracks,
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /turf/open/indestructible/white{
 	icon_state = "showroomfloor"
 	},

_maps/map_files/NebulaStation/NebulaStation.dmm

@@ -81457,12 +81457,6 @@
 /obj/item/reagent_containers/cup/rag,
 /turf/open/floor/iron/white/textured_large,
 /area/station/maintenance/department/medical)
-"mdT" = (
-/obj/structure/disposalpipe/segment{
-	dir = 4
-	},
-/turf/closed/wall,
-/area/station/maintenance/fore/lesser)
 "mec" = (
 /obj/effect/turf_decal/siding/wood{
 	dir = 6
@@ -118778,10 +118772,6 @@
 /obj/effect/turf_decal/siding/thinplating_new/dark/corner,
 /turf/open/floor/iron/dark/herringbone,
 /area/station/service/chapel/funeral)
-"rDY" = (
-/obj/structure/disposalpipe/segment,
-/turf/closed/wall,
-/area/station/maintenance/fore/greater)
 "rEc" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
@@ -196595,7 +196585,7 @@ fQE
 cUZ
 xGl
 pjP
-mdT
+iEt
 xnA
 pQW
 hAK
@@ -266242,7 +266232,7 @@ bzt
 jkE
 nLg
 cij
-rDY
+bYy
 loK
 kCi
 nKp
@@ -294174,4 +294164,4 @@ txW
 txW
 txW
 txW
-"}
+"}

_maps/shuttles/whiteship_box.dmm

@@ -273,15 +273,7 @@
 	dir = 9
 	},
 /obj/structure/cable,
-/mob/living/simple_animal/hostile/zombie{
-	desc = "This undead fiend looks to be badly decomposed.";
-	environment_smash = 0;
-	health = 60;
-	melee_damage_lower = 11;
-	melee_damage_upper = 11;
-	name = "Rotting Carcass";
-	outfit = /datum/outfit/corpse_assistant
-	},
+/mob/living/basic/zombie/rotten/assistant,
 /turf/open/floor/iron/white/corner{
 	dir = 1
 	},
@@ -360,14 +352,7 @@
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
-/mob/living/simple_animal/hostile/zombie{
-	desc = "This undead fiend looks to be badly decomposed.";
-	environment_smash = 0;
-	health = 60;
-	melee_damage_lower = 11;
-	melee_damage_upper = 11;
-	name = "Rotting Carcass"
-	},
+/mob/living/basic/zombie/rotten,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/crew)
 "aQ" = (
@@ -841,14 +826,7 @@
 	},
 /obj/effect/decal/cleanable/blood/old,
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/zombie{
-	desc = "This undead fiend looks to be badly decomposed.";
-	environment_smash = 0;
-	health = 60;
-	melee_damage_lower = 11;
-	melee_damage_upper = 11;
-	name = "Rotting Carcass"
-	},
+/mob/living/basic/zombie/rotten,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/medbay)
 "bT" = (
@@ -1449,15 +1427,7 @@
 	},
 /obj/effect/decal/cleanable/blood/gibs/old,
 /obj/structure/cable,
-/mob/living/simple_animal/hostile/zombie{
-	desc = "This undead fiend looks to be badly decomposed.";
-	environment_smash = 0;
-	health = 60;
-	melee_damage_lower = 11;
-	melee_damage_upper = 11;
-	name = "Rotting Carcass";
-	outfit = /datum/outfit/corpse_assistant
-	},
+/mob/living/basic/zombie/rotten/assistant,
 /turf/open/floor/iron,
 /area/shuttle/abandoned/medbay)
 "dc" = (

_maps/shuttles/whiteship_personalshuttle.dmm

@@ -162,15 +162,7 @@
 /obj/structure/cable,
 /obj/effect/decal/cleanable/blood/splatter,
 /obj/effect/decal/cleanable/dirt,
-/mob/living/simple_animal/hostile/zombie{
-	desc = "This undead fiend looks to be badly decomposed.";
-	environment_smash = 0;
-	health = 60;
-	melee_damage_lower = 11;
-	melee_damage_upper = 11;
-	name = "Rotting Carcass";
-	outfit = /datum/outfit/corpse_assistant
-	},
+/mob/living/basic/zombie/rotten/assistant,
 /turf/open/floor/mineral/titanium,
 /area/shuttle/abandoned/engine)
 "gG" = (
@@ -195,15 +187,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/cable,
 /obj/effect/decal/cleanable/blood/splatter,
-/mob/living/simple_animal/hostile/zombie{
-	desc = "This undead fiend looks to be badly decomposed.";
-	environment_smash = 0;
-	health = 60;
-	melee_damage_lower = 11;
-	melee_damage_upper = 11;
-	name = "Rotting Carcass";
-	outfit = /datum/outfit/corpse_assistant
-	},
+/mob/living/basic/zombie/rotten/assistant,
 /turf/open/floor/plating,
 /area/shuttle/abandoned/engine)
 "nI" = (
@@ -260,15 +244,7 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/blood/splatter,
 /obj/structure/chair/comfy/shuttle,
-/mob/living/simple_animal/hostile/zombie{
-	desc = "This undead fiend looks to be badly decomposed.";
-	environment_smash = 0;
-	health = 60;
-	melee_damage_lower = 11;
-	melee_damage_upper = 11;
-	name = "Rotting Carcass";
-	outfit = /datum/outfit/corpse_assistant
-	},
+/mob/living/basic/zombie/rotten/assistant,
 /turf/open/floor/mineral/plastitanium,
 /area/shuttle/abandoned/bridge)
 "pS" = (

_maps/virtual_domains/psyker_zombies.dmm

@@ -114,7 +114,7 @@
 /turf/open/indestructible/dark,
 /area/virtual_domain)
 "X" = (
-/mob/living/simple_animal/hostile/zombie,
+/mob/living/basic/zombie,
 /turf/open/indestructible/dark,
 /area/virtual_domain)
 "Y" = (

code/__DEFINES/id_cards.dm

@@ -42,3 +42,22 @@
  * Used to crop the ID card's transparency away when chaching the icon for better use in tgui chat.
  */
 #define ID_ICON_BORDERS 1, 9, 32, 24
+
+///Honorific will display next to the first name.
+#define HONORIFIC_POSITION_FIRST (1<<0)
+///Honorific will display next to the last name.
+#define HONORIFIC_POSITION_LAST (1<<1)
+///Honorific will not be displayed.
+#define HONORIFIC_POSITION_NONE (1<<2)
+///Honorific will be appended to the full name at the start.
+#define HONORIFIC_POSITION_FIRST_FULL (1<<3)
+///Honorific will be appended to the full name at the end.
+#define HONORIFIC_POSITION_LAST_FULL (1<<4)
+
+#define HONORIFIC_POSITION_BITFIELDS(...) list( \
+	"Honorific + First Name" = HONORIFIC_POSITION_FIRST, \
+	"Honorific + Last Name" = HONORIFIC_POSITION_LAST, \
+	"Honorific + Full Name" = HONORIFIC_POSITION_FIRST_FULL, \
+	"Full Name + Honorific" = HONORIFIC_POSITION_LAST_FULL, \
+	"Disable Honorific" = HONORIFIC_POSITION_NONE, \
+)

code/__DEFINES/say.dm

@@ -130,3 +130,6 @@
 ///Defines for priorities for the bubble_icon_override comp
 #define BUBBLE_ICON_PRIORITY_ACCESSORY 2
 #define BUBBLE_ICON_PRIORITY_ORGAN 1
+
+/// Sent from /atom/movable/proc/compose_message() to find an honorific. Compatible with NAME_PART_INDEX: (list/stored_name, mob/living/carbon/carbon_human)
+#define COMSIG_ID_GET_HONORIFIC "id_get_honorific"

code/__DEFINES/status_effects.dm

@@ -26,12 +26,10 @@
 //several flags for the Necropolis curse status effect
 ///makes the edges of the target's screen obscured
 #define CURSE_BLINDING (1<<0)
-///spawns creatures that attack the target only
-#define CURSE_SPAWNING (1<<1)
 ///causes gradual damage
-#define CURSE_WASTING (1<<2)
+#define CURSE_WASTING (1<<1)
 ///hands reach out from the sides of the screen, doing damage and stunning if they hit the target
-#define CURSE_GRASPING (1<<3)
+#define CURSE_GRASPING (1<<2)
 
 //Incapacitated status effect flags
 /// If the mob is normal incapacitated. Should never need this, just avoids issues if we ever overexpand this

code/__HELPERS/names.dm

@@ -374,3 +374,22 @@ GLOBAL_DATUM(syndicate_code_response_regex, /regex)
 			return "a rolling pin"
 		else
 			return "something... but the gods didn't set this up right (Please report this bug)"
+
+///Find the first name of a mob from a passed string with regex
+/proc/first_name(given_name)
+	var/static/regex/firstname = new("^\[^\\s-\]+") //First word before whitespace or "-"
+	firstname.Find(given_name)
+	return firstname.match
+
+/// Find the last name of a mob from a passed string with regex
+/proc/last_name(given_name)
+	var/static/regex/lasttname = new("\[^\\s-\]+$") //First word before whitespace or "-"
+	lasttname.Find(given_name)
+	return lasttname.match
+
+/// Find whitespace or dashes in the passed string with regex and returns TRUE if found
+/proc/is_mononym(given_name)
+	var/static/regex/breaks = regex(@"\s")
+	if(breaks.Find(given_name))
+		return FALSE
+	return TRUE

code/_globalvars/phobias.dm

@@ -107,9 +107,9 @@ GLOBAL_LIST_INIT(phobia_mobs, list(
 		/mob/living/basic/shade,
 		/mob/living/basic/skeleton,
 		/mob/living/basic/wizard,
+		/mob/living/basic/zombie,
 		/mob/living/simple_animal/bot/mulebot/paranormal,
 		/mob/living/simple_animal/hostile/dark_wizard,
-		/mob/living/simple_animal/hostile/zombie,
 	)),
 ))
 

code/_onclick/hud/rendering/plane_masters/plane_master_subtypes.dm

@@ -380,7 +380,7 @@
 
 /atom/movable/screen/plane_master/ghost
 	name = "Ghost"
-	documentation = "Ghosts draw here, so they don't get mixed up in the visuals of the game world. Note, this is not not how we HIDE ghosts from people, that's done with invisible and see_invisible."
+	documentation = "Ghosts draw here, so they don't get mixed up in the visuals of the game world. Note, this is not how we HIDE ghosts from people, that's done with invisible and see_invisible."
 	plane = GHOST_PLANE
 	render_relay_planes = list(RENDER_PLANE_NON_GAME)