Merge branch 'main' into tg-update-october-one

.github/CODEOWNERS

@@ -13,5 +13,5 @@
 /code/ @CliffracerX @Ephemeralis @honkpocket
 
 # Maptainers
-/_maps/ @DawsonKeyes @SylvetteSylph
+/_maps/ @DawsonKeyes
 

_maps/map_files/Mining/Iceland.dmm

@@ -205,9 +205,7 @@
 /turf/open/floor/iron/dark/textured_large,
 /area/mine/production/middle)
 "bD" = (
-/obj/structure/fence/corner{
-	dir = 2
-	},
+/obj/structure/fence/corner,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/underground/explored)
 "bH" = (
@@ -1002,6 +1000,17 @@
 /obj/structure/cable,
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/rack,
+/obj/item/stock_parts/power_store/cell/high{
+	pixel_x = 6;
+	pixel_y = 7
+	},
+/obj/item/stock_parts/power_store/cell/high{
+	pixel_x = -3;
+	pixel_y = 5
+	},
+/obj/item/stock_parts/power_store/cell/high{
+	pixel_x = 3
+	},
 /turf/open/floor/plating,
 /area/mine/maintenance/service)
 "gs" = (
@@ -1851,10 +1860,7 @@
 /turf/open/floor/iron/dark,
 /area/mine/production/middle)
 "lD" = (
-/obj/structure/fence{
-	dir = 2;
-	pixel_y = 0
-	},
+/obj/structure/fence,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/underground/explored)
 "lE" = (
@@ -2313,10 +2319,7 @@
 	},
 /area/mine/mechbay)
 "oM" = (
-/obj/structure/fence{
-	dir = 2;
-	pixel_y = 0
-	},
+/obj/structure/fence,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "oN" = (
@@ -2677,15 +2680,11 @@
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "re" = (
-/obj/structure/fence/corner{
-	dir = 2
-	},
+/obj/structure/fence/corner,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/underground/explored)
 "rf" = (
-/obj/structure/fence/corner{
-	dir = 2
-	},
+/obj/structure/fence/corner,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "rm" = (
@@ -5150,10 +5149,7 @@
 /turf/open/floor/plating,
 /area/mine/maintenance/labor)
 "ID" = (
-/obj/structure/fence{
-	dir = 2;
-	pixel_y = 0
-	},
+/obj/structure/fence,
 /turf/open/misc/asteroid/snow/icemoon,
 /area/icemoon/underground/explored)
 "IH" = (
@@ -5801,9 +5797,9 @@
 /turf/open/floor/plating/snowed/icemoon,
 /area/icemoon/surface/outdoors/nospawn)
 "LW" = (
-/obj/structure/fence{
-	dir = 2
-	},
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/underground/explored)
 "LY" = (
@@ -114162,8 +114158,8 @@ pY
 yV
 yV
 yV
-LW
-LW
+lD
+lD
 Cy
 NL
 NL
@@ -114676,7 +114672,7 @@ Vy
 MA
 bc
 WW
-Zy
+LW
 Zy
 uM
 pU

_maps/shuttles/~doppler_shuttles/pirate_sapper.dmm

@@ -16,6 +16,7 @@
 	id = "pirate_sapper_shutter_L";
 	dir = 8
 	},
+/obj/structure/fans/tiny/shield,
 /turf/open/floor/plating,
 /area/shuttle/pirate/sapper)
 "fK" = (
@@ -105,6 +106,7 @@
 /obj/docking_port/mobile/pirate/sapper{
 	dir = 4
 	},
+/obj/structure/fans/tiny/shield,
 /turf/open/floor/plating,
 /area/shuttle/pirate/sapper)
 "pt" = (
@@ -212,11 +214,11 @@
 /turf/open/floor/plating/airless,
 /area/shuttle/pirate/sapper)
 "uD" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/mask/gas/atmos/sapper{
 	pixel_x = -2;
 	pixel_y = -3
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/pirate/sapper)
 "vB" = (
@@ -237,6 +239,14 @@
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/pirate/sapper)
 "xf" = (
+/obj/machinery/ore_silo/colony_lathe,
+/obj/structure/sign/poster/contraband/power/directional/north,
+/obj/effect/turf_decal/stripes/box,
+/obj/effect/decal/cleanable/dirt,
+/obj/item/hypernoblium_crystal,
+/obj/item/hypernoblium_crystal,
+/obj/item/hypernoblium_crystal,
+/obj/item/hypernoblium_crystal,
 /obj/item/stack/sheet/iron/twenty,
 /obj/item/stack/sheet/glass{
 	amount = 20
@@ -248,13 +258,9 @@
 /obj/item/stack/sheet/mineral/gold{
 	amount = 5
 	},
-/obj/machinery/ore_silo/colony_lathe,
 /obj/item/stack/sheet/mineral/silver{
 	amount = 5
 	},
-/obj/structure/sign/poster/contraband/power/directional/north,
-/obj/effect/turf_decal/stripes/box,
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/engine,
 /area/shuttle/pirate/sapper)
 "xA" = (
@@ -280,9 +286,9 @@
 /area/shuttle/pirate/sapper)
 "zk" = (
 /obj/structure/cable,
-/obj/item/storage/toolbox/emergency/turret{
-	pixel_x = 10;
-	pixel_y = 9
+/obj/item/storage/toolbox/emergency/turret/sapper{
+	pixel_x = 3;
+	pixel_y = 4
 	},
 /turf/open/floor/catwalk_floor/iron_white,
 /area/shuttle/pirate/sapper)
@@ -337,6 +343,7 @@
 	id = "pirate_sapper_shutter_L";
 	dir = 8
 	},
+/obj/structure/fans/tiny/shield,
 /turf/open/floor/plating,
 /area/shuttle/pirate/sapper)
 "DT" = (
@@ -390,19 +397,19 @@
 /obj/item/stack/sheet/rglass{
 	amount = 20
 	},
-/obj/item/holosign_creator/atmos,
 /obj/item/radio/intercom/directional/west,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/stack/sheet/mineral/wood{
 	amount = 20
 	},
+/obj/item/forcefield_projector,
 /turf/open/floor/catwalk_floor/iron_white,
 /area/shuttle/pirate/sapper)
 "JD" = (
 /obj/structure/cable,
-/obj/item/storage/toolbox/emergency/turret{
-	pixel_x = -8;
-	pixel_y = -4
+/obj/item/storage/toolbox/emergency/turret/sapper{
+	pixel_x = -6;
+	pixel_y = -6
 	},
 /turf/open/floor/catwalk_floor/iron_white,
 /area/shuttle/pirate/sapper)
@@ -467,12 +474,12 @@
 /obj/item/stack/sheet/rglass{
 	amount = 20
 	},
-/obj/item/holosign_creator/atmos,
 /obj/item/radio/intercom/directional/east,
 /obj/effect/decal/cleanable/dirt,
 /obj/item/stack/sheet/mineral/wood{
 	amount = 20
 	},
+/obj/item/forcefield_projector,
 /turf/open/floor/catwalk_floor/iron_white,
 /area/shuttle/pirate/sapper)
 "Sa" = (
@@ -491,6 +498,7 @@
 	id = "pirate_sapper_shutter_R";
 	dir = 4
 	},
+/obj/structure/fans/tiny/shield,
 /turf/open/floor/plating,
 /area/shuttle/pirate/sapper)
 "TF" = (
@@ -507,11 +515,11 @@
 /turf/open/floor/plating,
 /area/shuttle/pirate/sapper)
 "Wo" = (
+/obj/effect/decal/cleanable/dirt,
 /obj/item/clothing/mask/gas/atmos/sapper/partner{
 	pixel_x = 2;
 	pixel_y = 4
 	},
-/obj/effect/decal/cleanable/dirt,
 /turf/open/floor/mineral/titanium/white,
 /area/shuttle/pirate/sapper)
 "WY" = (

code/__DEFINES/living.dm

@@ -4,6 +4,12 @@
 /// Always does *deathgasp when they die
 /// If unset mobs will only deathgasp if supplied a death sound or custom death message
 #define ALWAYS_DEATHGASP (1<<1)
+/**
+ * For carbons, this stops bodypart overlays being added to bodyparts from calling mob.update_body_parts().
+ * This is useful for situations like initialization or species changes, where
+ * update_body_parts() is going to be called ONE time once everything is done.
+ */
+#define STOP_OVERLAY_UPDATE_BODY_PARTS (1<<2)
 
 /// Getter for a mob/living's lying angle, otherwise protected
 #define GET_LYING_ANGLE(mob) (UNLINT(mob.lying_angle))

code/__DEFINES/~doppler_defines/dopplerboops.dm

@@ -0,0 +1,6 @@
+#define DOPPLERBOOP_DEFAULT_DURATION 1.5
+#define DOPPLERBOOP_DEFAULT_VOLUME 40
+#define DOPPLERBOOP_DEFAULT_PITCH 0
+#define DOPPLERBOOP_DEFAULT_FALLOFF 6
+#define DOPPLERBOOP_DEFAULT_FREQUENCY 1
+#define MAX_DOPPLERBOOP_CHARACTERS 75

code/__DEFINES/~doppler_defines/signals.dm

@@ -15,3 +15,7 @@
 #define COMSIG_PULSATING_TUMOR_REMOVED "pulsating_tumor_removed"
 /// From /obj/item/organ/internal/stomach/after_eat(atom/edible)
 #define COMSIG_STOMACH_AFTER_EAT "stomach_after_eat"
+/// Whenever a baton successfully executes its nonlethal attack. WARNING wonderful FUCKING CODE by niko THIS IS peak AAAAAAAAAAAAH
+#define COMSIG_PRE_BATON_FINALIZE_ATTACK "pre_baton_finalize_attack"
+// For after a user has sent a say message
+#define COMSIG_MOB_POST_SAY "mob_post_say"

code/__DEFINES/~doppler_defines/traits.dm

@@ -35,6 +35,8 @@
 #define TRAIT_LEFT_HANDED "left_handed"
 /// Trait for people with the cybernetic quirk
 #define TRAIT_PERMITTED_CYBERNETIC "permitted_cybernetic"
+/// No step on glass
+#define TRAIT_HARD_SOLES "hard_soles"
 
 ////
 // Jobs

code/_globalvars/lists/names.dm

@@ -33,6 +33,11 @@ GLOBAL_LIST_INIT(guardian_fantasy_surnames, world.file2list("strings/names/guard
 GLOBAL_LIST_INIT(operative_aliases, world.file2list("strings/names/operative_alias.txt"))
 GLOBAL_LIST_INIT(voidwalker_names, world.file2list("strings/names/voidwalker.txt"))
 GLOBAL_LIST_INIT(ramatan_last, world.file2list("strings/names/ramatan_last.txt")) //DOPPLER EDIT ADDITION
+GLOBAL_LIST_INIT(hearthkin_names_female, world.file2list("strings/names/hearthkin_female.txt")) //DOPPLER EDIT ADDITION
+GLOBAL_LIST_INIT(hearthkin_names_male, world.file2list("strings/names/hearthkin_male.txt")) //DOPPLER EDIT ADDITION
+GLOBAL_LIST_INIT(hearthkin_names_neutral, world.file2list("strings/names/hearthkin_neutral.txt")) //DOPPLER EDIT ADDITION
+GLOBAL_LIST_INIT(hearthkin_names_surname, world.file2list("strings/names/hearthkin_surname.txt")) //DOPPLER EDIT ADDITION
+GLOBAL_LIST_INIT(hearthkin_names_title, world.file2list("strings/names/hearthkin_title.txt")) //DOPPLER EDIT ADDITION
 
 GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt"))
 GLOBAL_LIST_INIT(ing_verbs, world.file2list("strings/names/ing_verbs.txt"))

code/_globalvars/~doppler_globalvars/regexes.dm

@@ -0,0 +1,5 @@
+//Does the line end in any EOL char that isn't appropriate punctuation OR does it end in a chat-formatted markdown sequence (+bold+, etc) without a period?
+GLOBAL_DATUM_INIT(needs_eol_autopunctuation, /regex, regex(@"([a-zA-Z\d]|[^.?!~-][+|_])$"))
+
+//All non-capitalized 'i' surrounded with whitespace (aka, 'hello >i< am a cat')
+GLOBAL_DATUM_INIT(noncapital_i, /regex, regex(@"\b[i]\b", "g"))

code/_globalvars/~doppler_globalvars/text.dm

@@ -0,0 +1,9 @@
+/// Ensures sentences end in appropriate punctuation (a period if none exist) and that all whitespace-bounded 'i' characters are capitalized.
+/// If the sentence ends in chat-flavored markdown for bolds, italics or underscores and does not have a preceding period, exclamation mark or other flavored sentence terminator, add a period.
+/// (e.g: 'Borgs are rogue' becomes 'Borgs are rogue.', '+BORGS ARE ROGUE+ becomes '+BORGS ARE ROGUE+.', '+Borgs are rogue~+' is untouched.)
+/proc/autopunct_bare(input_text)
+	if (findtext(input_text, GLOB.needs_eol_autopunctuation))
+		input_text += "."
+
+	input_text = replacetext(input_text, GLOB.noncapital_i, "I")
+	return input_text

code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm

@@ -263,9 +263,15 @@
 			candidates -= player // We don't autotator people in CentCom
 		else if(player.mind && (player.mind.special_role || player.mind.antag_datums?.len > 0))
 			candidates -= player // We don't autotator people with roles already
+		// DOPPLER ADDITION START
+		else if(player in rejected_traitor)
+			candidates -= player
+		else if(player in current_polling)
+			candidates -= player
+		// DOPPLER ADDITION END
 
 /datum/dynamic_ruleset/midround/from_living/autotraitor/execute()
-	var/mob/M = pick(candidates)
+	var/mob/M = pick(poll_candidates_for_one(candidates)) // DOPPLER EDIT, old code: var/mob/M = pick(candidates)
 	assigned += M
 	candidates -= M
 	var/datum/antagonist/traitor/infiltrator/sleeper_agent/newTraitor = new
@@ -848,11 +854,15 @@
 			|| candidate.stat == DEAD \
 			|| !(ROLE_OBSESSED in candidate.client?.prefs?.be_special) \
 			|| !candidate.mind.assigned_role \
+			// DOPPLER ADDITION START
+			|| (candidate in rejected_traitor) \
+			|| (candidate in current_polling) \
+			// DOPPLER ADDITION END
 		)
 			candidates -= candidate
 
 /datum/dynamic_ruleset/midround/from_living/obsessed/execute()
-	var/mob/living/carbon/human/obsessed = pick_n_take(candidates)
+	var/mob/living/carbon/human/obsessed = pick_n_take(poll_candidates_for_one(candidates)) // DOPPLER EDIT, old code: var/mob/living/carbon/human/obsessed = pick_n_take(candidates)
 	obsessed.gain_trauma(/datum/brain_trauma/special/obsessed)
 	message_admins("[ADMIN_LOOKUPFLW(obsessed)] has been made Obsessed by the midround ruleset.")
 	log_game("[key_name(obsessed)] was made Obsessed by the midround ruleset.")

code/datums/bodypart_overlays/emote_bodypart_overlay.dm

@@ -29,10 +29,6 @@
 	if(!referenced_bodypart)
 		return ..()
 	referenced_bodypart.remove_bodypart_overlay(src)
-	if(referenced_bodypart.owner) //Keep in mind that the bodypart could have been severed from the owner by now
-		referenced_bodypart.owner.update_body_parts()
-	else
-		referenced_bodypart.update_icon_dropped()
 	return ..()
 
 /**
@@ -49,7 +45,6 @@
 	if(!bodypart)
 		return null
 	bodypart.add_bodypart_overlay(overlay)
-	src.update_body_parts()
 	return overlay
 
 /datum/bodypart_overlay/simple/emote/blush

code/datums/components/caltrop.dm

@@ -97,6 +97,10 @@
 		return
 
 	if (!(flags & CALTROP_BYPASS_SHOES))
+		// DOPPLER EDIT ADDITION BEGIN - Hardened Soles Quirk
+		if(HAS_TRAIT(digitigrade_fan, TRAIT_HARD_SOLES))
+			return
+		// DOPPLER EDIT ADDITION END
 		if ((digitigrade_fan.wear_suit?.body_parts_covered | digitigrade_fan.w_uniform?.body_parts_covered | digitigrade_fan.shoes?.body_parts_covered) & FEET)
 			return