Merge branch 'master' into Orion_Station_Revamp

Signed-off-by: Ben <[email protected]>

.github/labeler.yml

@@ -2,9 +2,6 @@
 Database:
 - SQL/**
 
-'🗺️ Mapping - Aurora':
-- maps/aurora/**
-
 '🗺️ Mapping - Away Ship/Away Site':
 - maps/away/**
 

.github/workflows/byond.yml

@@ -582,7 +582,7 @@ jobs:
 
     strategy:
       matrix:
-        map: [runtime, aurora, sccv_horizon, exoplanet_testing]
+        map: [runtime, sccv_horizon, exoplanet_testing]
         pod: [maptest]
       fail-fast: false
 

aurorastation.dme

@@ -74,6 +74,7 @@
 #include "code\__DEFINES\important_recursive_contents.dm"
 #include "code\__DEFINES\items_clothing.dm"
 #include "code\__DEFINES\jobs.dm"
+#include "code\__DEFINES\large_structures.dm"
 #include "code\__DEFINES\layers.dm"
 #include "code\__DEFINES\lighting.dm"
 #include "code\__DEFINES\logging.dm"
@@ -88,6 +89,7 @@
 #include "code\__DEFINES\misc.dm"
 #include "code\__DEFINES\mobs.dm"
 #include "code\__DEFINES\modular_guns.dm"
+#include "code\__DEFINES\move_force.dm"
 #include "code\__DEFINES\movement.dm"
 #include "code\__DEFINES\obj.dm"
 #include "code\__DEFINES\organs.dm"
@@ -111,7 +113,6 @@
 #include "code\__DEFINES\ruin_tags.dm"
 #include "code\__DEFINES\rust_bapi.dm"
 #include "code\__DEFINES\rust_g.dm"
-#include "code\__DEFINES\rust_g_debug.dm"
 #include "code\__DEFINES\rust_g_overrides.dm"
 #include "code\__DEFINES\ship_weapons.dm"
 #include "code\__DEFINES\shuttle.dm"
@@ -354,6 +355,7 @@
 #include "code\controllers\subsystems\stickyban.dm"
 #include "code\controllers\subsystems\sun.dm"
 #include "code\controllers\subsystems\sunlight.dm"
+#include "code\controllers\subsystems\throwing.dm"
 #include "code\controllers\subsystems\ticker.dm"
 #include "code\controllers\subsystems\timer.dm"
 #include "code\controllers\subsystems\trade.dm"
@@ -378,9 +380,9 @@
 #include "code\controllers\subsystems\initialization\misc_late.dm"
 #include "code\controllers\subsystems\initialization\persistent_configuration.dm"
 #include "code\controllers\subsystems\initialization\xenoarch.dm"
-#include "code\controllers\subsystems\movement\move_handler.dm"
 #include "code\controllers\subsystems\movement\movement.dm"
 #include "code\controllers\subsystems\movement\movement_types.dm"
+#include "code\controllers\subsystems\movement\spacedrift.dm"
 #include "code\controllers\subsystems\processing\airflow.dm"
 #include "code\controllers\subsystems\processing\calamity.dm"
 #include "code\controllers\subsystems\processing\dcs.dm"
@@ -414,6 +416,7 @@
 #include "code\datums\mind.dm"
 #include "code\datums\mixed.dm"
 #include "code\datums\modules.dm"
+#include "code\datums\move_manager.dm"
 #include "code\datums\position_point_vector.dm"
 #include "code\datums\progressbar.dm"
 #include "code\datums\records.dm"
@@ -427,6 +430,7 @@
 #include "code\datums\changelog\changelog.dm"
 #include "code\datums\components\_component.dm"
 #include "code\datums\components\connect_mob_behalf.dm"
+#include "code\datums\components\drift.dm"
 #include "code\datums\components\local_network.dm"
 #include "code\datums\components\armor\armor.dm"
 #include "code\datums\components\base_name\base_name.dm"
@@ -588,7 +592,6 @@
 #include "code\defines\procs\dbcore.dm"
 #include "code\defines\procs\hud.dm"
 #include "code\defines\procs\radio.dm"
-#include "code\defines\procs\sd_Alert.dm"
 #include "code\game\ambience.dm"
 #include "code\game\atoms.dm"
 #include "code\game\atoms_movable.dm"
@@ -691,6 +694,7 @@
 #include "code\game\gamemodes\cult\runes\convert.dm"
 #include "code\game\gamemodes\cult\runes\create_construct.dm"
 #include "code\game\gamemodes\cult\runes\create_talisman.dm"
+#include "code\game\gamemodes\cult\runes\cult_mech.dm"
 #include "code\game\gamemodes\cult\runes\deafen_others.dm"
 #include "code\game\gamemodes\cult\runes\emp.dm"
 #include "code\game\gamemodes\cult\runes\free_cultist.dm"
@@ -900,7 +904,6 @@
 #include "code\game\machinery\jukebox.dm"
 #include "code\game\machinery\lightswitch.dm"
 #include "code\game\machinery\machinery.dm"
-#include "code\game\machinery\magnet.dm"
 #include "code\game\machinery\mass_driver.dm"
 #include "code\game\machinery\mech_recharger.dm"
 #include "code\game\machinery\mecha_fabricator.dm"
@@ -920,6 +923,7 @@
 #include "code\game\machinery\spaceheater.dm"
 #include "code\game\machinery\stargazer.dm"
 #include "code\game\machinery\stasis_bed.dm"
+#include "code\game\machinery\stasis_cage.dm"
 #include "code\game\machinery\status_display.dm"
 #include "code\game\machinery\status_display_ai.dm"
 #include "code\game\machinery\status_display_snowflakes.dm"
@@ -1071,6 +1075,7 @@
 #include "code\game\objects\items\apc_frame.dm"
 #include "code\game\objects\items\blueprints.dm"
 #include "code\game\objects\items\bodybag.dm"
+#include "code\game\objects\items\camping.dm"
 #include "code\game\objects\items\canvas.dm"
 #include "code\game\objects\items\contraband.dm"
 #include "code\game\objects\items\crayons.dm"
@@ -1086,6 +1091,8 @@
 #include "code\game\objects\items\lore_radio.dm"
 #include "code\game\objects\items\paintkit.dm"
 #include "code\game\objects\items\recharger_backpack.dm"
+#include "code\game\objects\items\safari_net.dm"
+#include "code\game\objects\items\science_sampler.dm"
 #include "code\game\objects\items\shooting_range.dm"
 #include "code\game\objects\items\skrell.dm"
 #include "code\game\objects\items\spirit_board.dm"
@@ -1349,6 +1356,7 @@
 #include "code\game\objects\structures\inflatable.dm"
 #include "code\game\objects\structures\janicart.dm"
 #include "code\game\objects\structures\kitchen_spike.dm"
+#include "code\game\objects\structures\large.dm"
 #include "code\game\objects\structures\lattice.dm"
 #include "code\game\objects\structures\light_pole.dm"
 #include "code\game\objects\structures\mirror.dm"
@@ -2098,6 +2106,7 @@
 #include "code\modules\effects\map_effects\marker\airlock_helper.dm"
 #include "code\modules\effects\map_effects\marker\airlock_shuttle.dm"
 #include "code\modules\effects\map_effects\marker\large_tank.dm"
+#include "code\modules\effects\map_effects\marker\mapmanip.dm"
 #include "code\modules\effects\maze_generation\maze_generator.dm"
 #include "code\modules\effects\maze_generation\maze_generator_blockwise.dm"
 #include "code\modules\effects\maze_generation\maze_helper_atoms.dm"
@@ -3654,7 +3663,6 @@
 #include "code\modules\turbolift\turbolift_floor.dm"
 #include "code\modules\turbolift\turbolift_map.dm"
 #include "code\modules\turbolift\turbolift_turfs.dm"
-#include "code\modules\udp\ship_udp.dm"
 #include "code\modules\vehicles\animal.dm"
 #include "code\modules\vehicles\bike.dm"
 #include "code\modules\vehicles\cargo_train.dm"
@@ -3757,11 +3765,6 @@
 #include "maps\_common\areas\station\storage.dm"
 #include "maps\_common\mapsystem\map.dm"
 #include "maps\_common\mapsystem\map_unit.dm"
-#include "maps\aurora\code\aurora.dm"
-#include "maps\aurora\code\aurora_holodeck.dm"
-#include "maps\aurora\code\aurora_lifts.dm"
-#include "maps\aurora\code\aurora_shuttles.dm"
-#include "maps\aurora\code\aurora_unittest.dm"
 #include "maps\away\away_sites.dm"
 #include "maps\away\away_site\abandoned_diner\abandoned_diner.dm"
 #include "maps\away\away_site\abandoned_diner\abandoned_diner_areas.dm"
@@ -3968,6 +3971,7 @@
 #include "maps\away\ships\tramp_freighter\tramp_freighter.dm"
 #include "maps\away\ships\tramp_freighter\tramp_freighter_areas.dm"
 #include "maps\away\ships\tramp_freighter\tramp_freighter_ghostroles.dm"
+#include "maps\away\ships\tramp_freighter\tramp_freighter_landmarks.dm"
 #include "maps\away\ships\unathi_pirate\hiskyn\unathi_pirate_hiskyn.dm"
 #include "maps\away\ships\unathi_pirate\hiskyn\unathi_pirate_hiskyn_areas.dm"
 #include "maps\away\ships\unathi_pirate\hiskyn\unathi_pirate_hiskyn_ghostroles.dm"

code/ZAS/Atom.dm

@@ -1,12 +1,3 @@
-
-/atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5, air_group = 0)
-	//Purpose: Determines if the object (or airflow) can pass this atom.
-	//Called by: Movement, airflow.
-	//Inputs: The moving atom (optional), target turf, "height" and air group
-	//Outputs: Boolean if can pass.
-
-	return (!density || !height || air_group)
-
 /turf/CanPass(atom/movable/mover, turf/target, height=1.5,air_group=0)
 	if(!target) return 0
 

code/__DEFINES/_flags.dm

@@ -9,3 +9,44 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 
 ///Whether /atom/Initialize() has already run for the object
 #define INITIALIZED_1 (1<<5)
+
+/*
+	These defines are used specifically with the atom/pass_flags bitmask
+	the atom/checkpass() proc uses them (tables will call movable atom checkpass(PASSTABLE) for example)
+*/
+//flags for pass_flags
+/// Allows you to pass over tables.
+#define PASSTABLE (1<<0)
+/// Allows you to pass over glass(this generally includes anything see-through that's glass-adjacent, ie. windows, windoors, airlocks with glass, etc.)
+#define PASSGLASS (1<<1)
+/// Allows you to pass over grilles.
+#define PASSGRILLE (1<<2)
+/// Allows you to pass over blob tiles.
+#define PASSBLOB (1<<3)
+/// Allows you to pass over mobs.
+#define PASSMOB (1<<4)
+/// Allows you to pass over closed turfs, ie. walls.
+#define PASSCLOSEDTURF (1<<5)
+/// Let thrown things past us. **ONLY MEANINGFUL ON pass_flags_self!**
+#define LETPASSTHROW (1<<6)
+/// Allows you to pass over machinery, ie. vending machines, computers, protolathes, etc.
+#define PASSMACHINE (1<<7)
+/// Allows you to pass over structures, ie. racks, tables(if you don't already have PASSTABLE), etc.
+#define PASSSTRUCTURE (1<<8)
+/// Allows you to pass over plastic flaps, often found at cargo or MULE dropoffs.
+#define PASSFLAPS (1<<9)
+/// Allows you to pass over airlocks and mineral doors.
+#define PASSDOORS (1<<10)
+/// Allows you to pass over vehicles, ie. mecha
+#define PASSVEHICLE (1<<11)
+/// Allows you to pass over dense items.
+#define PASSITEM (1<<12)
+/// Do not intercept click attempts during Adjacent() checks. See [turf/proc/ClickCross]. **ONLY MEANINGFUL ON pass_flags_self!**
+#define LETPASSCLICKS (1<<13)
+/// Allows you to pass over windows and window-adjacent stuff, like windows and windoors. Does not include airlocks with glass in them.
+#define PASSWINDOW (1<<14)
+
+/* AURORA SNOWFLAKE CODE */
+#define PASSDOORHATCH	(1<<15)
+#define PASSTRACE	(1<<16) //Used by turrets in the check_trajectory proc to target mobs hiding behind certain things (such as closets)
+#define PASSRAILING	(1<<17)

code/__DEFINES/access.dm

@@ -415,10 +415,10 @@
 	desc = "Medical Equipment"
 	region = ACCESS_REGION_MEDBAY
 
-#define ACCESS_FIRST_RESPONDER 67
-/datum/access/first_responder
-	id = ACCESS_FIRST_RESPONDER
-	desc = "First Responder Equipment"
+#define ACCESS_PARAMEDIC 67
+/datum/access/paramedic
+	id = ACCESS_PARAMEDIC
+	desc = "Paramedic Equipment"
 	region = ACCESS_REGION_MEDBAY
 
 // free_access_id = 68
@@ -804,3 +804,9 @@
 /datum/access/unathi_trawler_access
 	id = ACCESS_FISHING_LEAGUE
 	desc = "General Fishing Trawler Access"
+
+#define ACCESS_TRAMP_FREIGHTER 242
+/datum/access/tramp_freighter_access
+	id = ACCESS_TRAMP_FREIGHTER
+	desc = "Independent Freighter Access"
+

code/__DEFINES/background.dm

@@ -23,6 +23,7 @@
 #define CITIZENSHIP_ZORA "Zo'ra Hive"
 #define CITIZENSHIP_KLAX "K'lax Hive"
 #define CITIZENSHIP_CTHUR "C'thur Hive"
+#define CITIZENSHIP_LIIKENKA "Undercover Lii'kenka"
 
 #define CITIZENSHIP_NONE "None"
 #define CITIZENSHIP_GOLDEN "Golden Deep"
@@ -197,6 +198,8 @@
 #define ACCENT_LABOURSONG "Laboursong"
 
 #define ACCENT_TTS "Text-to-Speech"
+#define ACCENT_MERCHANT "Golden Deep Merchant"
+#define ACCENT_THESIAN "Golden Deep Thesian"
 
 #define ACCENT_BLUESPACE "Bluespace"
 
@@ -237,4 +240,4 @@
 #define ALL_CITIZENSHIPS list(CITIZENSHIP_BIESEL, CITIZENSHIP_SOL, CITIZENSHIP_COALITION, CITIZENSHIP_ELYRA, CITIZENSHIP_ELYRA,\
 CITIZENSHIP_ELYRA_NCP, CITIZENSHIP_ERIDANI, CITIZENSHIP_DOMINIA, CITIZENSHIP_IZWESKI, CITIZENSHIP_NRALAKK,\
 CITIZENSHIP_PRA, CITIZENSHIP_DPRA, CITIZENSHIP_NKA, CITIZENSHIP_FREE_COUNCIL, CITIZENSHIP_ZORA, CITIZENSHIP_KLAX, CITIZENSHIP_CTHUR,\
-CITIZENSHIP_NONE, CITIZENSHIP_GOLDEN, CITIZENSHIP_CONSORTIUM, CITIZENSHIP_GLAORR, CITIZENSHIP_EKANE)
+CITIZENSHIP_NONE, CITIZENSHIP_GOLDEN, CITIZENSHIP_CONSORTIUM, CITIZENSHIP_GLAORR, CITIZENSHIP_EKANE, CITIZENSHIP_LIIKENKA)

code/__DEFINES/color.dm

@@ -114,8 +114,11 @@
 
 // Blood colors
 #define COLOR_HUMAN_BLOOD      "#A10808"
-#define COLOR_DIONA_BLOOD      "#97DD7C"
+/// for robots with black oil "blood"
 #define COLOR_IPC_BLOOD        "#1F181F"
+/// for organics with synthetic blood substitute
+#define COLOR_SYNTH_BLOOD      "#D9F9FF"
+#define COLOR_DIONA_BLOOD      "#97DD7C"
 #define COLOR_SKRELL_BLOOD     "#0081CD"
 #define COLOR_VAURCA_BLOOD     "#E6E600"
 

code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm

@@ -18,5 +18,7 @@
 	#define COMPONENT_ATOM_BLOCK_EXIT (1<<0)
 ///from base of atom/Exited(): (atom/movable/gone, direction)
 #define COMSIG_ATOM_EXITED "atom_exited"
+///from base of atom/Bumped(): (/atom) **DIFFERS FROM TG THAT IS /atom/movable**
+#define COMSIG_ATOM_BUMPED "atom_bumped"
 ///from base of atom/has_gravity(): (turf/location, list/forced_gravities)
 #define COMSIG_ATOM_HAS_GRAVITY "atom_has_gravity"

code/__DEFINES/dcs/signals/signals_atom/signals_atom_movable.dm

@@ -5,3 +5,23 @@
 ///from base of atom/movable/Moved(): (/atom)
 #define COMSIG_MOVABLE_PRE_MOVE "movable_pre_move"
 	#define COMPONENT_MOVABLE_BLOCK_PRE_MOVE (1<<0)
+
+///from base of atom/movable/newtonian_move(): (inertia_direction, start_delay)
+#define COMSIG_MOVABLE_NEWTONIAN_MOVE "movable_newtonian_move"
+	#define COMPONENT_MOVABLE_NEWTONIAN_BLOCK (1<<0)
+
+///from datum/component/drift/allow_final_movement(): ()
+#define COMSIG_MOVABLE_DRIFT_BLOCK_INPUT "movable_drift_block_input"
+	#define DRIFT_ALLOW_INPUT (1<<0)
+
+///from base of atom/movable/throw_at(): (list/args)
+#define COMSIG_MOVABLE_PRE_THROW "movable_pre_throw"
+	#define COMPONENT_CANCEL_THROW (1<<0)
+///from base of atom/movable/throw_at(): (datum/thrownthing, spin)
+#define COMSIG_MOVABLE_POST_THROW "movable_post_throw"
+///from base of datum/thrownthing/finalize(): (obj/thrown_object, datum/thrownthing) used for when a throw is finished
+#define COMSIG_MOVABLE_THROW_LANDED "movable_throw_landed"
+
+/// from base of atom/movable/Process_Spacemove(): (movement_dir, continuous_move)
+#define COMSIG_MOVABLE_SPACEMOVE "spacemove"
+	#define COMSIG_MOVABLE_STOP_SPACEMOVE (1<<0)

code/__DEFINES/dcs/signals/signals_atom/signals_atom_movement.dm

@@ -1,2 +1,11 @@
+// Atom movement signals. Format:
+// When the signal is called: (signal arguments)
+// All signals send the source datum of the signal as the first argument
+
+///from base of atom/relaymove(): (mob/living/user, direction)
+#define COMSIG_ATOM_RELAYMOVE "atom_relaymove"
+	///prevents the "you cannot move while buckled! message" -- At the moment, this doesn't do it in our codebase, pending to have driving and buckling implementation updated
+	#define COMSIG_BLOCK_RELAYMOVE (1<<0)
+
 ///From base of /datum/move_loop/process() after attempting to move a movable: (datum/move_loop/loop, old_dir)
 #define COMSIG_MOVABLE_MOVED_FROM_LOOP "movable_moved_from_loop"

code/__DEFINES/dcs/signals/signals_mob/signals_mob_main.dm

@@ -2,3 +2,12 @@
 #define COMSIG_MOB_CLIENT_PRE_LIVING_MOVE "mob_client_pre_living_move"
 	/// Should we stop the current living movement attempt
 	#define COMSIG_MOB_CLIENT_BLOCK_PRE_LIVING_MOVE COMPONENT_MOVABLE_BLOCK_PRE_MOVE
+
+/// From base of /client/Move(): (new_loc, direction)
+#define COMSIG_MOB_CLIENT_PRE_MOVE "mob_client_pre_move"
+	/// Should always match COMPONENT_MOVABLE_BLOCK_PRE_MOVE as these are interchangeable and used to block movement.
+	#define COMSIG_MOB_CLIENT_BLOCK_PRE_MOVE COMPONENT_MOVABLE_BLOCK_PRE_MOVE
+	/// The argument of move_args which corresponds to the loc we're moving to
+	#define MOVE_ARG_NEW_LOC 1
+	/// The arugment of move_args which dictates our movement direction
+	#define MOVE_ARG_DIRECTION 2

code/__DEFINES/dcs/signals/signals_turf.dm

@@ -4,3 +4,6 @@
 
 ///from base of atom/has_gravity(): (atom/asker, list/forced_gravities)
 #define COMSIG_TURF_HAS_GRAVITY "turf_has_gravity"
+
+///from base of datum/thrownthing/finalize(): (turf/turf, atom/movable/thrownthing) when something is thrown and lands on us
+#define COMSIG_TURF_MOVABLE_THROW_LANDED "turf_movable_throw_landed"

code/__DEFINES/flags.dm

@@ -51,6 +51,8 @@ var/list/mimic_defines = list(
 #define ATOM_FLAG_HTML_USE_INITIAL_ICON FLAG(6)
 /// If a dense atom like a platform does not allow movement through it like a window pane BUT allows pickup.
 #define ATOM_FLAG_ALWAYS_ALLOW_PICKUP FLAG(7)
+/// A reagent container that can dispense when being attacked by another container.
+#define ATOM_FLAG_DISPENSER FLAG(8)
 
 #define ATOM_AWAITING_OVERLAY_UPDATE FLAG(10)
 

code/__DEFINES/forensic_swabs.dm

@@ -2,3 +2,9 @@
 #define EVIDENCE_TYPE_GSR "Gunshot Residue"
 #define EVIDENCE_TYPE_SALIVA "Saliva"
 #define EVIDENCE_TYPE_ADDITIONAL "Additional"
+
+#define MICROSCOPE_FIBER BITFLAG(0)
+#define MICROSCOPE_PRINTS BITFLAG(1)
+#define MICROSCOPE_GSR BITFLAG(2)
+#define MICROSCOPE_CELLS BITFLAG(3)
+#define MICROSCOPE_ALL MICROSCOPE_FIBER | MICROSCOPE_PRINTS | MICROSCOPE_GSR | MICROSCOPE_CELLS

code/__DEFINES/items_clothing.dm

@@ -21,15 +21,6 @@
 #define SLOT_WRISTS     BITFLAG(15)
 #define SLOT_S_STORE    BITFLAG(16)
 
-// Flags for pass_flags.
-#define PASSTABLE		0x1
-#define PASSGLASS		0x2
-#define PASSGRILLE		0x4
-#define PASSDOORHATCH	0x8
-#define PASSMOB			0x10
-#define PASSTRACE       0x20 //Used by turrets in the check_trajectory proc to target mobs hiding behind certain things (such as closets)
-#define PASSRAILING     0x40
-
 // Bitmasks for the flags_inv variable. These determine when a piece of clothing hides another, i.e. a helmet hiding glasses.
 #define HIDEGLOVES      0x1
 #define HIDESUITSTORAGE 0x2

code/__DEFINES/large_structures.dm

@@ -0,0 +1,3 @@
+#define STAGE_DISASSEMBLED 	0 //Stage needs to be assembled, or has been disassembled already
+#define STAGE_PROGRESS		1 //Stage is being assembled or disassembled
+#define STAGE_ASSEMBLED 	2 //Stage needs to be disassembled, or has been assembled already