Merge branch 'master' into poi-hangarbase

citadel.dme

@@ -541,7 +541,6 @@
 #include "code\controllers\configuration\entries\skills.dm"
 #include "code\controllers\configuration\entries\urls.dm"
 #include "code\controllers\configuration_old\configuration.dm"
-#include "code\controllers\configuration_old\configuration_vr.dm"
 #include "code\controllers\observer_listener\atom\observer.dm"
 #include "code\controllers\repository\designs.dm"
 #include "code\controllers\repository\flooring.dm"
@@ -688,8 +687,10 @@
 #include "code\controllers\subsystem\sound\soundbyte_manager.dm"
 #include "code\controllers\toml_config\toml_config_entry.dm"
 #include "code\controllers\toml_config\toml_configuration.dm"
+#include "code\controllers\toml_config\entries\backend-logging-toggles.dm"
+#include "code\controllers\toml_config\entries\backend-logging.dm"
+#include "code\controllers\toml_config\entries\backend-repository.dm"
 #include "code\controllers\toml_config\entries\backend.dm"
-#include "code\controllers\toml_config\entries\backend.repository.dm"
 #include "code\datums\ability.dm"
 #include "code\datums\ability_handler.dm"
 #include "code\datums\access.dm"
@@ -811,7 +812,9 @@
 #include "code\datums\components\items\passive_parry.dm"
 #include "code\datums\components\items\wielding.dm"
 #include "code\datums\components\mobs\block_frame.dm"
+#include "code\datums\components\mobs\mob_feign_impairment.dm"
 #include "code\datums\components\mobs\mob_self_horizontal_inversion.dm"
+#include "code\datums\components\mobs\mob_self_vertical_inversion.dm"
 #include "code\datums\components\mobs\parry_frame.dm"
 #include "code\datums\components\movable\aquarium.dm"
 #include "code\datums\components\movable\spatial_grid.dm"
@@ -1066,7 +1069,7 @@
 #include "code\game\atoms\atom-defense.dm"
 #include "code\game\atoms\atom-examine.dm"
 #include "code\game\atoms\atom-logging.dm"
-#include "code\game\atoms\atom_vv.dm"
+#include "code\game\atoms\atom-vv.dm"
 #include "code\game\atoms\atoms_initializing_EXPENSIVE.dm"
 #include "code\game\atoms\buckling.dm"
 #include "code\game\atoms\defense_old.dm"
@@ -2477,10 +2480,10 @@
 #include "code\modules\atmospherics\machinery\portable\powered.dm"
 #include "code\modules\atmospherics\machinery\portable\pump.dm"
 #include "code\modules\atmospherics\machinery\portable\scrubber.dm"
-#include "code\modules\automata\__automata.dm"
-#include "code\modules\automata\_wave.dm"
-#include "code\modules\automata\explosion.dm"
-#include "code\modules\automata\sonar.dm"
+#include "code\modules\automata\automata.dm"
+#include "code\modules\automata\types\explosion.dm"
+#include "code\modules\automata\types\sonar.dm"
+#include "code\modules\automata\types\wave.dm"
 #include "code\modules\awaymissions\bluespaceartillery.dm"
 #include "code\modules\awaymissions\corpse.dm"
 #include "code\modules\awaymissions\exile.dm"
@@ -2668,6 +2671,7 @@
 #include "code\modules\clothing\suits\aliens\vox.dm"
 #include "code\modules\clothing\under\_under.dm"
 #include "code\modules\clothing\under\color.dm"
+#include "code\modules\clothing\under\gear_harness.dm"
 #include "code\modules\clothing\under\imperial_vr.dm"
 #include "code\modules\clothing\under\misc.dm"
 #include "code\modules\clothing\under\miscellaneous.dm"
@@ -3148,6 +3152,7 @@
 #include "code\modules\jobs\job_types\station\civillian\internals_affairs_agent.dm"
 #include "code\modules\jobs\job_types\station\civillian\librarian.dm"
 #include "code\modules\jobs\job_types\station\civillian\mime.dm"
+#include "code\modules\jobs\job_types\station\civillian\outsider.dm"
 #include "code\modules\jobs\job_types\station\civillian\pilot.dm"
 #include "code\modules\jobs\job_types\station\command\blueshield.dm"
 #include "code\modules\jobs\job_types\station\command\captain.dm"
@@ -3562,7 +3567,6 @@
 #include "code\modules\mining\drilling\drill.dm"
 #include "code\modules\mining\drilling\scanner.dm"
 #include "code\modules\mining\excavation\mine_outcrops.dm"
-#include "code\modules\mining\excavation\mineral_effect.dm"
 #include "code\modules\mining\machinery\machine_input_output_plates.dm"
 #include "code\modules\mining\machinery\machine_processing.dm"
 #include "code\modules\mining\machinery\machine_stacking.dm"
@@ -3614,6 +3618,7 @@
 #include "code\modules\mob\mob-keybind-triggers.dm"
 #include "code\modules\mob\mob-login.dm"
 #include "code\modules\mob\mob-logout.dm"
+#include "code\modules\mob\mob-status_procs.dm"
 #include "code\modules\mob\mob.dm"
 #include "code\modules\mob\mob_defines.dm"
 #include "code\modules\mob\mob_helpers.dm"
@@ -4145,7 +4150,9 @@
 #include "code\modules\mob\observer\dead\orbit.dm"
 #include "code\modules\mob\observer\dead\perspective.dm"
 #include "code\modules\mob\observer\dead\say.dm"
+#include "code\modules\mob\verbs\feign_impairment.dm"
 #include "code\modules\mob\verbs\horizontal_invert_self.dm"
+#include "code\modules\mob\verbs\vertical_invert_self.dm"
 #include "code\modules\modular_computers\laptop_vendor.dm"
 #include "code\modules\modular_computers\computers\modular_computer\core.dm"
 #include "code\modules\modular_computers\computers\modular_computer\damage.dm"
@@ -4210,12 +4217,14 @@
 #include "code\modules\movespeed\movespeed_modifier.dm"
 #include "code\modules\movespeed\modifiers\misc.dm"
 #include "code\modules\movespeed\modifiers\mob.dm"
-#include "code\modules\multiz\atoms.dm"
+#include "code\modules\multiz\atom-z_fall.dm"
+#include "code\modules\multiz\atom-z_move.dm"
 #include "code\modules\multiz\basic_legacy.dm"
 #include "code\modules\multiz\core.dm"
-#include "code\modules\multiz\falling.dm"
 #include "code\modules\multiz\movement.dm"
-#include "code\modules\multiz\turf.dm"
+#include "code\modules\multiz\turf-multiz_misc.dm"
+#include "code\modules\multiz\turf-z_fall.dm"
+#include "code\modules\multiz\turf-z_move.dm"
 #include "code\modules\multiz\structures\hoist.dm"
 #include "code\modules\multiz\structures\ladder.dm"
 #include "code\modules\multiz\structures\pipes.dm"

code/__DEFINES/access.dm

@@ -411,6 +411,35 @@ STANDARD_ACCESS_DATUM(ACCESS_FACTION_PIRATE, faction/pirate, "Pirate")
 #define ACCESS_FACTION_TRADER 160//General Beruang Trader Access
 STANDARD_ACCESS_DATUM(ACCESS_FACTION_TRADER, faction/trader, "Trader")
 
+//? Motel
+
+#define ACCESS_FACTION_MOTEL1 161//Motel-Inn-Room1
+STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL1, faction/motelroom1, "Nebula-Room-1")
+
+#define ACCESS_FACTION_MOTEL2 162//Motel-Inn-Room2
+STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL2, faction/motelroom2, "Nebula-Room-2")
+
+#define ACCESS_FACTION_MOTEL3 163//Motel-Inn-Room3
+STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL3, faction/motelroom3, "Nebula-Room-3")
+
+#define ACCESS_FACTION_MOTEL4 164//Motel-Inn-Room4
+STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL4, faction/motelroom4, "Nebula-Room-4")
+
+#define ACCESS_FACTION_MOTEL5 165//Motel-Inn-Room5
+STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL5, faction/motelroom5, "Nebula-Room-5")
+
+#define ACCESS_FACTION_MOTEL6 166//Motel-Inn-Room6
+STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL6, faction/motelroom6, "Nebula-Room-6")
+
+#define ACCESS_FACTION_MOTEL7 167//Motel-Inn-Room7
+STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL7, faction/motelroom7, "Nebula-Room-7")
+
+#define ACCESS_FACTION_MOTEL8 169//Motel-Inn-Room8 168 is taken by Pirate
+STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL8, faction/motelroom8, "Nebula-Room-8")
+
+#define ACCESS_FACTION_MOTEL_VIP 170//Motel-Inn-VIP
+STANDARD_ACCESS_DATUM(ACCESS_FACTION_MOTEL_VIP, faction/motelroomvip, "Nebula-Room-VIP")
+
 //? Gaia Station
 
 #define ACCESS_GAIA_GUEST 250//Gaia Station Basic Access

code/__DEFINES/icon_smoothing.dm

@@ -26,7 +26,6 @@ DEFINE_BITFIELD(smoothing_flags, list(
 #define QUEUE_SMOOTH(thing_to_queue) if(IS_SMOOTH(thing_to_queue)) {SSicon_smooth.add_to_queue(thing_to_queue)}
 #define QUEUE_SMOOTH_NEIGHBORS(thing_to_queue) for(var/neighbor in orange(1, thing_to_queue)) {var/atom/atom_neighbor = neighbor; QUEUE_SMOOTH(atom_neighbor)}
 
-
 //! Smoothing Internals
 
 #define NORTH_JUNCTION     (1<<0) // NORTH

code/__DEFINES/jobs/jobs.dm

@@ -47,6 +47,7 @@
 #define JOB_ID_LIBRARIAN "librarian"
 #define JOB_ID_LAWYER "lawyer"			// IAA
 #define JOB_ID_ASSISTANT "assistant"
+#define JOB_ID_OUTSIDER "traveler"
 
 #define JOB_ID_CLOWN "clown"
 #define JOB_ID_MIME "mime"

code/__DEFINES/mapping/multiz.dm

@@ -1,4 +1,8 @@
-// fall_flags
+//* This file is explicitly licensed under the MIT license. *//
+//* Copyright (c) 2025 Citadel Station Developers           *//
+
+//* fall_Flags *//
+
 /// Falling should ignore anchored status
 #define FALL_IGNORE_ANCHORED		(1<<0)
 /// this fall shouldn't incur any sort of self-damage for hitting the ground
@@ -20,17 +24,25 @@
 #define FALL_FLAGS_STOP				(FALL_BLOCKED | FALL_RECOVERED | FALL_TERMINATED)
 
 /// there's a level above
+/// * This works as long as SSmapping has its rebuild proc called after a load; given this is enforced
+///   by SSmapping most of the time, this is usually fine.
 #define Z_HAS_ABOVE(z) (!isnull(SSmapping.cached_level_up[z]))
 /// there's a level below
+/// * This works as long as SSmapping has its rebuild proc called after a load; given this is enforced
+///   by SSmapping most of the time, this is usually fine.
 #define Z_HAS_BELOW(z) (!isnull(SSmapping.cached_level_down[z]))
 
 /// get turf below this turf, if any
-/// we are at the mercy of zmimic when we do this. do not use in critical maploader code.
+/// * this is a guesstimation
+/// * we are at the mercy of zmimic when we do this. do not use in critical maploader code.
 #define TURF_BELOW_ISH(T) (T.below || T.below())
 /// get turf above this turf, if any
-/// we are at the mercy of zmimic when we do this. do not use in critical maploader code.
+/// * this is a guesstimation
+/// * we are at the mercy of zmimic when we do this. do not use in critical maploader code.
 #define TURF_ABOVE_ISH(T) (T.above || T.above())
 
-/// we should use get virtual step due to our x/y being border
-/// we do not get step this, so use it on something **on** game world. (aka turf or on turf).
+/// Checks if we're right next to the map transition border.
+/// * Only valid for something on a turf.
+///
+/// todo: support multi-tile objects
 #define AT_MAP_BORDER(A) (A.x == 2 || A.y == 2 || A.x == world.maxx - 1 || A.y == world.maxy - 1)

code/__DEFINES/traits/mob.dm

@@ -87,3 +87,6 @@ DATUM_TRAIT(/mob, TRAIT_DEAF)
 #define TRAIT_BLINDNESS_STATUS_EFF		"Status Effect: Blindness"
 #define TRAIT_BLINDNESS_NEGATIV			"Negative custom trait"
 
+// This mob can breathe water
+#define TRAIT_MOB_WATER_BREATHER		"mob_water_breather"
+DATUM_TRAIT(/mob, TRAIT_MOB_WATER_BREATHER)

code/__DEFINES/traits/sources.dm

@@ -87,3 +87,5 @@
 
 /// rad_insulation
 #define TRAIT_SOURCE_COMPONENT_RAD_INSULATION "c_rad_insulation"
+
+#define LOADOUT_TRAIT "loadout"