Updating from Neb dev.

.github/workflows/test.yml

@@ -15,7 +15,7 @@ on:
 
 env:
   BYOND_MAJOR: "516"
-  BYOND_MINOR: "1663"
+  BYOND_MINOR: "1685"
   SPACEMAN_DMM_VERSION: suite-1.11
 
 jobs:
@@ -106,6 +106,11 @@ jobs:
         with:
           path: ~/BYOND-${{ env.BYOND_MAJOR }}.${{ env.BYOND_MINOR }}
           key: ${{ runner.os }}-byond-${{ env.BYOND_MAJOR }}-${{ env.BYOND_MINOR }}
+      - name: Install Dependencies
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update || true
+          sudo apt install -o APT::Immediate-Configure=false curl:i386
       - name: Run Tests
         env:
           TEST: MAP

.gitignore

@@ -6,28 +6,28 @@
 *.lk
 *.backup
 *.before
-codex/
-data/
-dmdoc/
-cfg/
+/codex/
+/data/
+/dmdoc/
+/cfg/
 build_log.txt
 use_map
 stopserver
 reboot_called
 atupdate
 
 # ignore config, but not subdirs
-!config/*/
-config/*
-sql/test_db
+/!config/*/
+/config/*
+/sql/test_db
 
 # misc OS garbage
 Thumbs.db
 Thumbs.db:encryptable
 .DS_Store
 
 # vscode
-.vscode/*
+/.vscode/*
 *.code-workspace
 .history
 

code/__defines/lighting.dm

@@ -25,6 +25,11 @@
 #define TURF_IS_AMBIENT_LIT_UNSAFE(T) (T:ambient_active)
 #define TURF_IS_AMBIENT_LIT(T) (isturf(T) && TURF_IS_AMBIENT_LIT_UNSAFE(T))
 
+// These are centered around zero to simplify logic; 'up' is 'is greater than -1', 'down' is 'is less than 0'. 0 matches both conditions.
+#define LIGHTING_CORNER_GENERATE_UP    1
+#define LIGHTING_CORNER_GENERATE_BOTH  0
+#define LIGHTING_CORNER_GENERATE_DOWN -1
+
 // If I were you I'd leave this alone.
 #define LIGHTING_BASE_MATRIX \
 	list            \

code/__defines/misc.dm

@@ -402,3 +402,9 @@
 #define MM_ATTACK_RESULT_NONE      0
 #define MM_ATTACK_RESULT_DEFLECTED BITFLAG(0)
 #define MM_ATTACK_RESULT_BLOCKED   BITFLAG(1)
+
+// Effectively a speed modifier for how fast pollen is produced by flowering plants. Pollen per second.
+// In theory, one pollen every 5 seconds (at time of writing)
+#define POLLEN_PER_SECOND 0.2
+#define POLLEN_PRODUCTION_MULT (POLLEN_PER_SECOND * (SSplants.wait / 10))
+#define MAX_POLLEN_PER_FLOWER 10

code/_onclick/mouse_drag.dm

@@ -0,0 +1,91 @@
+/atom/proc/relayed_mouse_down(mob/user, object, location, control, params)
+	return null
+
+/atom/proc/relayed_mouse_held(mob/user, atom/target)
+	return null
+
+/atom/proc/relayed_mouse_up(mob/user, atom/target)
+	return null
+
+/mob/proc/on_mouse_down(object, location, control, params)
+
+	// We are mouse down outside the map or on a screen element, assume it is not relevant.
+	if(!isatom(object) || istype(object, /obj/screen))
+		return FALSE
+
+	// Do not do this for things that are not in the world.
+	var/atom/atom = object
+	if(!isturf(atom) && !isturf(atom.loc))
+		return FALSE
+
+	// Debounce, we might already be holding.
+	if(_is_holding_mouse)
+		return FALSE
+
+	// Ignore right click and middle click currently.
+	// Might be worth handling these in the future.
+	var/list/modifiers = params2list(params)
+	if(modifiers["middle"] || modifiers["right"])
+		return FALSE
+
+	// Keep track of when we started holding the mouse down so that we can check if we hold it long enough to start the drag behavior.
+	_started_mouse_down = world.time
+
+	// Might be inside an exosuit or such that has its own handling for these inputs.
+	. = loc?.relayed_mouse_down(src, object, location, control, params)
+	if(isnull(.))
+
+		// Handle our actual 'drag beginning' logic.
+		var/obj/item/held = get_active_held_item()
+		. = istype(held) && held.wielder_mouse_drag_down(src, object, location, control, params)
+
+	if(.)
+		update_mouse_pointer()
+		SSclickdrag.active_wielders[src] = TRUE
+		_is_holding_mouse = TRUE
+
+/mob/proc/on_mouse_held()
+
+	if(!_is_holding_mouse)
+		return FALSE
+
+	// Grace period before we start holding (rather than a single click)
+	if(world.time < _started_mouse_down + MOUSE_DRAG_DELAY)
+		return TRUE
+
+	var/atom/mouse_over = _last_mouse_over_atom?.resolve()
+	if(QDELETED(mouse_over) || !istype(mouse_over))
+		mouse_over = null
+
+	// Might be inside an exosuit or such that has its own handling for these inputs.
+	. = loc?.relayed_mouse_held(src, mouse_over)
+	if(isnull(.))
+		var/obj/item/held = get_active_held_item()
+		. = istype(held) && held.wielder_mouse_drag_held(src, mouse_over)
+
+	if(.)
+		update_mouse_pointer()
+		set_dir(get_dir(src, mouse_over))
+	else
+		on_mouse_up()
+
+/mob/proc/on_mouse_up(remove_from_processing = TRUE)
+
+	if(!_is_holding_mouse)
+		return FALSE
+
+	// Don't block the follow-up Click() if this wasn't an 'official' drag.
+	if(world.time >= _started_mouse_down + MOUSE_DRAG_DELAY)
+		var/atom/mouse_over = _last_mouse_over_atom?.resolve()
+		if(QDELETED(mouse_over) || !istype(mouse_over))
+			mouse_over = null
+		. = loc?.relayed_mouse_up(src, mouse_over)
+		if(isnull(.))
+			var/obj/item/held = get_active_held_item()
+			. = istype(held) && held.wielder_mouse_drag_up(src, mouse_over)
+
+	update_mouse_pointer()
+	_is_holding_mouse = FALSE
+	SSclickdrag.active_wielders -= src
+	if(remove_from_processing && length(SSclickdrag.processing_wielders))
+		SSclickdrag.processing_wielders -= src

code/controllers/subsystems/clickdrag.dm

@@ -0,0 +1,54 @@
+SUBSYSTEM_DEF(clickdrag)
+	name = "Clickdrag"
+	wait = 1
+	flags = SS_TICKER | SS_NO_INIT
+
+	var/tmp/list/active_wielders = list()
+	var/tmp/active_wielders_copied_yet = FALSE
+	var/tmp/list/processing_wielders
+
+/datum/controller/subsystem/clickdrag/stat_entry()
+	..("W:[active_wielders.len]")
+
+/datum/controller/subsystem/clickdrag/fire(resumed = 0)
+
+	if(!resumed)
+		active_wielders_copied_yet = FALSE
+
+	if(!active_wielders_copied_yet)
+		active_wielders_copied_yet = TRUE
+		processing_wielders = active_wielders.Copy()
+
+	var/mob/wielder
+	var/i = 0
+	while(i < processing_wielders.len)
+		i++
+		wielder = processing_wielders[i]
+		if(!wielder.on_mouse_held())
+			wielder.on_mouse_up(remove_from_processing = FALSE) // we will do this via our list iteration anyway
+		if (MC_TICK_CHECK)
+			processing_wielders.Cut(1, i+1)
+			return
+	processing_wielders.Cut()
+
+/client
+	// (BOOL) Flag for whether or not the next Click() should be blocked - Click() is called immediately after MouseUp() which isn't desirable.
+	VAR_PRIVATE/tmp/_block_next_click = FALSE
+
+/mob
+	// (DATUM) Tracker for clickdrag subsystem,
+	VAR_PRIVATE/tmp/weakref/_last_mouse_over_atom
+	// (BOOL) Flag for keeping track of if we're already processing or not.
+	VAR_PRIVATE/tmp/_is_holding_mouse = FALSE
+	// (INT) Time that we started holding the mouse down.
+	VAR_PRIVATE/tmp/_started_mouse_down = 0
+	// (FLOAT) Delay before a hold is considered a hold rather than a single click.
+	VAR_PRIVATE/const/MOUSE_DRAG_DELAY = 0.25 SECONDS
+
+/client/MouseEntered(object,location,control,params)
+	UNLINT(mob?._last_mouse_over_atom = weakref(object))
+	. = ..()
+
+/client/MouseDrag(src_object, over_object, src_location, over_location, src_control, over_control, params)
+	UNLINT(mob?._last_mouse_over_atom = weakref(over_object))
+	. = ..()

code/controllers/subsystems/initialization/customitems.dm

@@ -49,6 +49,8 @@ SUBSYSTEM_DEF(customitems)
 
 //gets the relevant list for the key from the listlist if it exists, check to make sure they are meant to have it and then calls the giving function
 /datum/controller/subsystem/customitems/proc/equip_custom_items(mob/living/human/M)
+	if(!istype(M) || !M.ckey)
+		return
 	var/list/key_list = custom_items_by_ckey[M.ckey]
 	if(!length(key_list))
 		return

code/controllers/subsystems/jobs.dm

@@ -565,7 +565,7 @@ SUBSYSTEM_DEF(jobs)
 
 	job.post_equip_job_title(H, alt_title || job_title)
 
-	H.client.show_location_blurb(30)
+	H.client?.show_location_blurb(30)
 
 	return H
 

code/controllers/subsystems/mapping.dm

@@ -48,8 +48,6 @@ SUBSYSTEM_DEF(mapping)
 	var/base_floor_area
 	/// A list of connected z-levels to avoid repeatedly rebuilding connections
 	var/list/connected_z_cache = list()
-	/// A list of turbolift holders to initialize.
-	var/list/turbolifts_to_initialize = list()
 	///Associative list of planetoid/exoplanet data currently registered. The key is the planetoid id, the value is the planetoid_data datum.
 	var/list/planetoid_data_by_id
 	///List of all z-levels in the world where the index corresponds to a z-level, and the key at that index is the planetoid_data datum for the associated planet
@@ -169,9 +167,9 @@ SUBSYSTEM_DEF(mapping)
 
 	global.level_persistence_ref_map.Cut()
 
-	// Generate turbolifts last, since away sites may have elevators to generate too.
-	for(var/obj/abstract/turbolift_spawner/turbolift as anything in turbolifts_to_initialize)
-		turbolift.build_turbolift()
+	for(var/modpack_name in SSmodpacks.loaded_modpacks)
+		var/decl/modpack/loaded_modpack = SSmodpacks.loaded_modpacks[modpack_name]
+		loaded_modpack.on_mapping_pre_finalize()
 
 	// With levels set up and serde complete (and levels flagged) we can do any remaining level generation.
 	global.using_map.finalize_map_generation()
@@ -256,20 +254,34 @@ SUBSYSTEM_DEF(mapping)
 	planetoid_data_by_z.len = world.maxz
 	connected_z_cache.Cut()
 
+	SSzcopy?.calculate_zstack_limits()
+
 	//Update SSWeather's indexed lists, if we can.
 	if(SSweather?.weather_by_z)
 		SSweather.weather_by_z.len = world.maxz
 
+/// This is equivalent to calling `increment_world_z_size()` in a loop, but more efficient.
+/datum/controller/subsystem/mapping/proc/bulk_increment_world_z_size(num_z_levels, new_level_type, defer_setup = FALSE)
+	ASSERT(num_z_levels > 0)
+	var/old_max = world.maxz
+	world.maxz += num_z_levels
+
+	reindex_lists()
+
+	if (!new_level_type)
+		CRASH("Missing z-level data type for z[old_max] through z[old_max + num_z_levels]!")
+
+	for (var/i in 1 to num_z_levels)
+		var/datum/level_data/level = new new_level_type(old_max + i, defer_setup)
+		level.initialize_new_level()
+
 /datum/controller/subsystem/mapping/proc/increment_world_z_size(var/new_level_type, var/defer_setup = FALSE)
 
 	world.maxz++
 	reindex_lists()
 
-	if(SSzcopy.zlev_maximums.len)
-		SSzcopy.calculate_zstack_limits()
 	if(!new_level_type)
-		PRINT_STACK_TRACE("Missing z-level data type for z["[world.maxz]"]!")
-		return
+		CRASH("Missing z-level data type for z[world.maxz]!")
 
 	var/datum/level_data/level = new new_level_type(world.maxz, defer_setup)
 	level.initialize_new_level()

code/controllers/subsystems/misc_late.dm

@@ -3,18 +3,15 @@ SUBSYSTEM_DEF(misc_late)
 	name = "Late Initialization"
 	init_order = SS_INIT_MISC_LATE
 	flags = SS_NO_FIRE
-	var/list/turbolifts_to_open = list()
 
 /datum/controller/subsystem/misc_late/Initialize()
 
 	var/decl/asset_cache/asset_cache = GET_DECL(/decl/asset_cache)
 	asset_cache.load()
 
-	// This is gross but I'm not sure where else to handle it. Sorry.
-	for(var/datum/turbolift/lift in turbolifts_to_open)
-		if(!QDELETED(lift))
-			lift.open_doors()
-	turbolifts_to_open.Cut()
+	for(var/modpack_name in SSmodpacks.loaded_modpacks)
+		var/decl/modpack/loaded_modpack = SSmodpacks.loaded_modpacks[modpack_name]
+		loaded_modpack.on_misc_late_init()
 
 	// Pre-populate the emote list.
 	decls_repository.get_decls_of_type(/decl/emote)

code/controllers/subsystems/zcopy.dm

@@ -168,7 +168,7 @@ SUBSYSTEM_DEF(zcopy)
 	// Flush the queue.
 	fire(FALSE, TRUE)
 
-// If you add a new Zlevel or change Z-connections, call this.
+/// (Re)generate Z-group information. You should run this every time world.maxz (or z-connections) change. ZM's behavior is undefined between resizing the world and calling this proc.
 /datum/controller/subsystem/zcopy/proc/calculate_zstack_limits()
 	zlev_maximums = new(world.maxz)
 	var/start_zlev = 1

code/datums/movement/automove.dm

@@ -37,4 +37,4 @@
 
 /// Generalized entrypoint for checking CanMove and such on /mob.
 /atom/movable/proc/can_do_automated_move(variant_move_delay)
-	return FALSE
+	return MayMove(src)