Merge remote-tracking branch 'tgstation/master' into upstream-2025-11-29

# Conflicts:
#	_maps/RandomRuins/SpaceRuins/derelict_sulaco.dmm
#	_maps/RandomRuins/SpaceRuins/garbagetruck2.dmm
#	_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
#	_maps/map_files/tramstation/tramstation.dmm
#	code/_onclick/hud/new_player.dm
#	code/datums/components/squashable.dm
#	code/datums/diseases/advance/symptoms/heal.dm
#	code/datums/diseases/chronic_illness.dm
#	code/datums/status_effects/buffs.dm
#	code/datums/status_effects/debuffs/drunk.dm
#	code/datums/status_effects/debuffs/stamcrit.dm
#	code/game/machinery/computer/crew.dm
#	code/game/objects/items/devices/scanners/health_analyzer.dm
#	code/game/objects/items/wall_mounted.dm
#	code/game/turfs/closed/indestructible.dm
#	code/modules/admin/view_variables/filterrific.dm
#	code/modules/antagonists/heretic/influences.dm
#	code/modules/cargo/orderconsole.dm
#	code/modules/client/preferences.dm
#	code/modules/events/space_vines/vine_mutations.dm
#	code/modules/mob/dead/new_player/new_player.dm
#	code/modules/mob/living/carbon/human/death.dm
#	code/modules/mob/living/carbon/human/species_types/jellypeople.dm
#	code/modules/mob/living/damage_procs.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob_spawn/ghost_roles/mining_roles.dm
#	code/modules/mob_spawn/mob_spawn.dm
#	code/modules/projectiles/ammunition/energy/laser.dm
#	code/modules/projectiles/guns/ballistic/launchers.dm
#	code/modules/projectiles/guns/energy/laser.dm
#	code/modules/reagents/chemistry/machinery/chem_dispenser.dm
#	code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
#	code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
#	code/modules/reagents/chemistry/reagents/medicine_reagents.dm
#	code/modules/surgery/healing.dm
#	code/modules/unit_tests/designs.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	tgui/packages/tgui/interfaces/ChemDispenser.tsx

code/_globalvars/bitfields.dm

@@ -61,22 +61,32 @@ DEFINE_BITFIELD(appearance_flags, list(
 ))
 
 DEFINE_BITFIELD(area_flags, list(
-	"BLOBS_ALLOWED" = BLOBS_ALLOWED,
-	"BLOCK_SUICIDE" = BLOCK_SUICIDE,
-	"CAVES_ALLOWED" = CAVES_ALLOWED,
-	"CULT_PERMITTED" = CULT_PERMITTED,
-	"FLORA_ALLOWED" = FLORA_ALLOWED,
-	"HIDDEN_AREA" = HIDDEN_AREA,
-	"MEGAFAUNA_SPAWN_ALLOWED" = MEGAFAUNA_SPAWN_ALLOWED,
-	"MOB_SPAWN_ALLOWED" = MOB_SPAWN_ALLOWED,
-	"NOTELEPORT" = NOTELEPORT,
-	"NO_DEATH_MESSAGE" = NO_DEATH_MESSAGE,
-	"PERSISTENT_ENGRAVINGS" = PERSISTENT_ENGRAVINGS,
-	"UNIQUE_AREA" = UNIQUE_AREA,
 	"VALID_TERRITORY" = VALID_TERRITORY,
+	"BLOBS_ALLOWED" = BLOBS_ALLOWED,
+	"NOTELEPORT" = NOTELEPORT,
+	"HIDDEN_AREA" = HIDDEN_AREA,
+	"BLOCK_SUICIDE" = BLOCK_SUICIDE,
 	"XENOBIOLOGY_COMPATIBLE" = XENOBIOLOGY_COMPATIBLE,
+	"CULT_PERMITTED" = CULT_PERMITTED,
+	"NO_DEATH_MESSAGE" = NO_DEATH_MESSAGE,
+	"EVENT_PROTECTED" = EVENT_PROTECTED,
+	"QUIET_LOGS" = QUIET_LOGS,
+	"BINARY_JAMMING" = BINARY_JAMMING,
 	"NO_BOH" = NO_BOH,
 	"UNLIMITED_FISHING" = UNLIMITED_FISHING,
+	"NO_GRAVITY" = NO_GRAVITY,
+	"LOCAL_TELEPORT" = LOCAL_TELEPORT,
+))
+
+DEFINE_BITFIELD(area_flags_mapping, list(
+	"UNIQUE_AREA" = UNIQUE_AREA,
+	"CAVES_ALLOWED" = CAVES_ALLOWED,
+	"FLORA_ALLOWED" = FLORA_ALLOWED,
+	"MOB_SPAWN_ALLOWED" = MOB_SPAWN_ALLOWED,
+	"MEGAFAUNA_SPAWN_ALLOWED" = MEGAFAUNA_SPAWN_ALLOWED,
+	"PERSISTENT_ENGRAVINGS" = PERSISTENT_ENGRAVINGS,
+	"VIRTUAL_AREA" = VIRTUAL_AREA,
+	"VIRTUAL_SAFE_AREA" = VIRTUAL_SAFE_AREA,
 ))
 
 DEFINE_BITFIELD(turf_flags, list(
@@ -112,6 +122,7 @@ DEFINE_BITFIELD(clothing_flags, list(
 	"VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
 	"VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
 	"INTERNALS_ADJUST_EXEMPT" = INTERNALS_ADJUST_EXEMPT,
+	"NO_ZONE_DISABLING" = NO_ZONE_DISABLING,
 ))
 
 DEFINE_BITFIELD(datum_flags, list(
@@ -511,6 +522,17 @@ DEFINE_BITFIELD(bodypart_flags, list(
 	"BODYPART_IMPLANTED" = BODYPART_IMPLANTED,
 ))
 
+DEFINE_BITFIELD(biological_state, list(
+	"BIO_INORGANIC" = BIO_INORGANIC,
+	"BIO_BONE" = BIO_BONE,
+	"BIO_FLESH" = BIO_FLESH,
+	"BIO_METAL" = BIO_METAL,
+	"BIO_WOOD" = BIO_WOOD,
+	"BIO_WIRED" = BIO_WIRED,
+	"BIO_BLOODED" = BIO_BLOODED,
+	"BIO_JOINTED" = BIO_JOINTED,
+))
+
 DEFINE_BITFIELD(change_exempt_flags, list(
 	"BP_BLOCK_CHANGE_SPECIES" = BP_BLOCK_CHANGE_SPECIES,
 ))
@@ -706,3 +728,8 @@ DEFINE_BITFIELD(visible_info, list(
 	"EMPATH_SEE_COLD" = EMPATH_SEE_COLD,
 	"EMPATH_SEE_EVIL" = EMPATH_SEE_EVIL,
 ))
+
+DEFINE_BITFIELD(allow_custom_character, list(
+	"GHOSTROLE_TAKE_PREFS_SPECIES" = GHOSTROLE_TAKE_PREFS_SPECIES,
+	"GHOSTROLE_TAKE_PREFS_APPEARANCE" = GHOSTROLE_TAKE_PREFS_APPEARANCE,
+))