Updating from Neb dev.

.editorconfig

@@ -12,6 +12,9 @@ indent_size = 4
 [*.dmm]
 end_of_line = crlf
 
+[*.dme]
+end_of_line = crlf
+
 [*.py]
 indent_style = space
 indent_size = 4
@@ -20,3 +23,8 @@ indent_size = 4
 indent_style = space
 indent_size = 2
 
+[*.txt]
+end_of_line = crlf
+
+[*.md]
+end_of_line = crlf

.gitattributes

@@ -12,3 +12,6 @@ html/changelog.html merge=union
 # Declare files that will always have CRLF line endings on checkout.
 *.dm text eol=crlf
 *.dmm text eol=crlf
+*.dme text eol=crlf
+*.txt text eol=crlf
+*.md text eol=crlf

.github/workflows/test.yml

@@ -5,11 +5,13 @@ on:
     branches:
       - master
   pull_request:
+    branches:
+      - master
   workflow_dispatch:
 
 env:
   BYOND_MAJOR: "515"
-  BYOND_MINOR: "1643"
+  BYOND_MINOR: "1647"
   SPACEMAN_DMM_VERSION: suite-1.9
 
 jobs:

code/__defines/misc.dm

@@ -384,9 +384,10 @@
 #define CRAYON_DRAW_ARROW    "arrow"
 
 // Enum for results of is_space_movement_permitted()
-#define SPACE_MOVE_SUPPORTED (-1)
-#define SPACE_MOVE_FORBIDDEN   0
-#define SPACE_MOVE_PERMITTED   1
+// Note that it may also return an instance of /atom/movable, which acts as SPACE_MOVE_SUPPORTED.
+#define SPACE_MOVE_SUPPORTED (-1) //! Mob should run space-slipping checks.
+#define SPACE_MOVE_FORBIDDEN   0  //! Mob should begin spacedrift.
+#define SPACE_MOVE_PERMITTED   1  //! Mob should stop/prevent spacedrift.
 
 // Default UI style applied to client prefs.
 #define DEFAULT_UI_STYLE /decl/ui_style/midnight

code/_global_vars/lists/names.dm

@@ -1,8 +1,6 @@
 // All variables here use double quotes to able load information on every startup.
 
 var/global/list/ai_names =           file2list("config/names/ai.txt")
-var/global/list/wizard_first =       file2list("config/names/wizardfirst.txt")
-var/global/list/wizard_second =      file2list("config/names/wizardsecond.txt")
 
 var/global/list/verbs =              file2list("config/names/verbs.txt")
 var/global/list/adjectives =         file2list("config/names/adjectives.txt")

code/_onclick/ghost.dm

@@ -61,15 +61,3 @@
 /obj/effect/portal/attack_ghost(mob/user)
 	if(target)
 		user.forceMove(get_turf(target))
-
-/obj/machinery/gateway/centerstation/attack_ghost(mob/user)
-	if(awaygate)
-		user.forceMove(awaygate.loc)
-	else
-		to_chat(user, "[src] has no destination.")
-
-/obj/machinery/gateway/centeraway/attack_ghost(mob/user)
-	if(stationgate)
-		user.forceMove(stationgate.loc)
-	else
-		to_chat(user, "[src] has no destination.")

code/controllers/subsystems/zcopy.dm

@@ -494,6 +494,8 @@ SUBSYSTEM_DEF(zcopy)
 // return: is-invalid
 /datum/controller/subsystem/zcopy/proc/discover_movable(atom/movable/object)
 	ASSERT(!QDELETED(object))
+	if(init_state < SS_INITSTATE_STARTED)
+		return FALSE // no-op, discover_movable is only valid during or after zcopy init
 
 	var/turf/Tloc = object.loc
 	if (!isturf(Tloc) || !MOVABLE_SHALL_MIMIC(object))
@@ -503,12 +505,13 @@ SUBSYSTEM_DEF(zcopy)
 
 	ZM_RECORD_START
 
+	var/above_needs_discovery = FALSE
 	if (!object.bound_overlay)
 		var/atom/movable/openspace/mimic/M = new(T)
 		object.bound_overlay = M
+		M.z_flags = object.z_flags // Necessary to ensure MOVABLE_IS_ON_ZTURF works
 		M.associated_atom = object
-		if (TURF_IS_MIMICKING(M.loc))
-			.(M)
+		above_needs_discovery = TRUE
 
 	var/override_depth
 	var/original_type = object.type
@@ -559,6 +562,9 @@ SUBSYSTEM_DEF(zcopy)
 	ZM_RECORD_STOP
 	ZM_RECORD_WRITE(discovery_stats, "Depth [OO.depth] on [OO.z]")
 
+	if (above_needs_discovery && MOVABLE_IS_ON_ZTURF(OO))
+		discover_movable(OO) // recursion!
+
 	return FALSE
 
 /datum/controller/subsystem/zcopy/proc/flush_z_state(turf/T)

code/datums/storage/_storage.dm

@@ -244,27 +244,26 @@ var/global/list/_test_storage_items = list()
 
 /datum/storage/proc/update_ui_after_item_insertion(obj/item/inserted, click_params)
 	prepare_ui()
-	storage_ui?.on_insertion()
+	storage_ui?.on_insertion(inserted)
 
 /datum/storage/proc/update_ui_after_item_removal(obj/item/removed)
 	if(QDELETED(holder))
 		return
 	prepare_ui()
-	storage_ui?.on_post_remove()
+	storage_ui?.on_post_remove(removed)
 
 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target
 /datum/storage/proc/remove_from_storage(mob/user, obj/item/removing, atom/new_location, skip_update)
 	if(!istype(removing))
 		return FALSE
 	new_location = new_location || get_turf(holder)
 	storage_ui?.on_pre_remove(removing)
-	if(ismob(holder?.loc))
-		removing.dropped(user)
-	if(ismob(new_location))
-		removing.hud_layerise()
-	else
-		removing.reset_plane_and_layer()
+	// This doesn't call dropped anymore because it's not leaving a mob slot directly.
+	// If something needs to duplicate dropped() functionality on removal from a storage object,
+	// it should be done in on_exit_storage instead.
 	removing.forceMove(new_location)
+	if(!ismob(new_location)) // inventory slot equipped() already handles hud_layerise
+		removing.reset_plane_and_layer() // this should be done post-move to avoid wasting an icon update
 	if(!skip_update)
 		update_ui_after_item_removal(removing)
 	if(removing.maptext)

code/datums/storage/_storage_ui.dm

@@ -32,7 +32,7 @@
 /datum/storage_ui/proc/after_close(mob/user)
 	return
 
-/datum/storage_ui/proc/on_insertion()
+/datum/storage_ui/proc/on_insertion(obj/item/inserted)
 	return
 
 /datum/storage_ui/proc/on_pre_remove(obj/item/removing)
@@ -44,6 +44,9 @@
 /datum/storage_ui/proc/on_hand_attack(mob/user)
 	return
 
+/datum/storage_ui/proc/get_displayed_contents()
+	return
+
 // Default subtype
 /datum/storage_ui/default
 	var/obj/screen/storage/boxes/boxes
@@ -99,20 +102,29 @@
 /datum/storage_ui/default/on_pre_remove(obj/item/removing)
 	for(var/mob/user in is_seeing)
 		user.client?.screen -= removing
+	// if being moved to an inventory slot or other storage item, this will be re-set after the transfer is done
+	removing.screen_loc = null
 
 /datum/storage_ui/default/on_hand_attack(mob/user)
 	for(var/mob/other_user in is_seeing)
 		if (other_user.active_storage == _storage)
 			_storage.close(other_user)
 
+/datum/storage_ui/default/get_displayed_contents()
+	return _storage?.get_contents()
+
 /datum/storage_ui/default/show_to(mob/user)
 	if(!istype(user))
 		return
+	// TODO: move this to the interaction that opens the storage object rather than handling it on the UI
+	// because i really hate calling get_contents followed by get_displayed_contents
+	// the issue is that some things call atom.storage.show_to() directly rather than using open()
 	var/list/contents = _storage?.get_contents()
 	if(user.active_storage != _storage)
 		for(var/obj/item/I in contents)
 			if(I.on_found(user))
 				return
+	var/list/displayed_contents = get_displayed_contents()
 	if(user.active_storage)
 		user.active_storage.hide_from(user)
 	if(user.client)
@@ -123,8 +135,8 @@
 		user.client.screen -= closer
 		user.client.screen -= contents
 		user.client.screen += closer
-		if(length(contents))
-			user.client.screen += contents
+		if(length(displayed_contents))
+			user.client.screen += displayed_contents
 		if(_storage.storage_slots)
 			user.client.screen += boxes
 		else
@@ -306,19 +318,27 @@
 		row_num = round((adjusted_contents-1) / 7) // 7 is the maximum allowed width.
 	arrange_item_slots(row_num, clamp(adjusted_contents - 1, 0, 6))
 
+// Only display one item for each key.
+/datum/storage_ui/default/produce_bin/get_displayed_contents()
+	. = list()
+	var/list/displayed = list()
+	for(var/obj/item/food/grown/produce in _storage.get_contents())
+		var/produce_key = get_key_for_object(produce)
+		if(displayed[produce_key])
+			continue
+		displayed[produce_key] = TRUE
+		. += produce
+
 //This proc draws out the inventory and places the items on it. It uses the standard position.
 /datum/storage_ui/default/produce_bin/arrange_item_slots(rows, cols)
 	var/cx = SCREEN_LOC_MOD_FIRST
 	var/cy = SCREEN_LOC_MOD_SECOND + rows
 	boxes.screen_loc = "LEFT+[SCREEN_LOC_MOD_FIRST]:[SCREEN_LOC_MOD_DIVIDED],BOTTOM+[SCREEN_LOC_MOD_SECOND]:[SCREEN_LOC_MOD_DIVIDED] to LEFT+[SCREEN_LOC_MOD_FIRST + cols]:[SCREEN_LOC_MOD_DIVIDED],BOTTOM+[SCREEN_LOC_MOD_SECOND + rows]:[SCREEN_LOC_MOD_DIVIDED]"
 
 	var/list/counts = get_seed_counts()
-	var/list/displayed = list()
-	for(var/obj/item/food/grown/produce in _storage.get_contents())
+	// get_displayed_contents already handles deduplication
+	for(var/obj/item/food/grown/produce in get_displayed_contents())
 		var/produce_key = get_key_for_object(produce)
-		if(displayed[produce_key])
-			continue
-		displayed[produce_key] = TRUE
 		produce.screen_loc = "LEFT+[cx]:[SCREEN_LOC_MOD_DIVIDED],BOTTOM+[cy]:[SCREEN_LOC_MOD_DIVIDED]"
 		produce.maptext_x = 2
 		produce.maptext_y = 2

code/datums/traits/_traits.dm

@@ -3,14 +3,18 @@
 // certain number of them at character generation and they will alter some interactions with the world.
 
 /mob/living
-	var/list/traits
+	/// A list of mob-specific traits, for when the list differs from the species list.
+	/// Overrides the species list; if it's identical to it, it will be unset.
+	/// Code using the traits system should use get_traits() instead.
+	VAR_PRIVATE/list/_mob_traits
 
 /mob/living/proc/has_trait(trait_type, trait_level = TRAIT_LEVEL_EXISTS)
 	SHOULD_NOT_OVERRIDE(TRUE)
 	SHOULD_NOT_SLEEP(TRUE)
-	return (trait_type in traits) && (!trait_level || traits[trait_type] >= trait_level)
+	var/list/actual_traits = get_traits()
+	return (trait_type in actual_traits) && (!trait_level || actual_traits[trait_type] >= trait_level)
 
-/mob/living/proc/GetTraitLevel(trait_type)
+/mob/living/proc/get_trait_level(trait_type)
 	SHOULD_NOT_SLEEP(TRUE)
 	var/traits = get_traits()
 	if(!traits)
@@ -24,61 +28,59 @@
 /mob/living/get_traits()
 	RETURN_TYPE(/list)
 	var/decl/species/our_species = get_species()
-	return traits || our_species?.traits
+	return _mob_traits || our_species?.traits
 
 /mob/living/proc/set_trait(trait_type, trait_level)
 	SHOULD_NOT_SLEEP(TRUE)
 	var/decl/species/our_species = get_species()
 	var/decl/trait/trait = GET_DECL(trait_type)
 	if(!trait.validate_level(trait_level))
 		return FALSE
-	if(our_species && !traits) // If species traits haven't been setup before, check if we need to do so now
+	if(our_species && !_mob_traits) // If species traits haven't been setup before, check if we need to do so now
 		var/species_level = our_species.traits[trait_type]
 		if(species_level == trait_level) // Matched the default species trait level, ignore
 			return TRUE
-		traits = our_species.traits.Copy() // The setup is to simply copy the species list of traits
-	if(!(trait_type in traits))
-		LAZYSET(traits, trait_type, trait_level)
+		_mob_traits = our_species.traits.Copy() // The setup is to simply copy the species list of traits
+	if(!(trait_type in _mob_traits))
+		LAZYSET(_mob_traits, trait_type, trait_level)
 		trait.apply_trait(src)
 	return TRUE
 
-/mob/living/proc/RemoveTrait(trait_type, canonize = TRUE)
+/mob/living/proc/remove_trait(trait_type, canonize = TRUE)
 	var/decl/species/our_species = get_species()
 	// If traits haven't been set up, but we're trying to remove a trait that exists on the species then set up traits
-	if(!traits && LAZYISIN(our_species?.traits, trait_type))
-		traits = our_species.traits.Copy()
-	if(LAZYLEN(traits))
-		LAZYREMOVE(traits, trait_type)
+	if(!_mob_traits && LAZYISIN(our_species?.traits, trait_type))
+		_mob_traits = our_species.traits.Copy()
+	if(LAZYLEN(_mob_traits))
+		LAZYREMOVE(_mob_traits, trait_type)
 	// Check if we can just default back to species traits.
 	if(canonize)
-		CanonizeTraits()
+		canonize_traits()
 
 /// Removes a trait unless it exists on the species.
 /// If it does exist on the species, we reset it to the species' trait level.
-/mob/living/proc/RemoveExtrinsicTrait(trait_type)
+/mob/living/proc/remove_extrinsic_trait(trait_type)
 	var/decl/species/our_species = get_species()
 	if(!LAZYACCESS(our_species?.traits, trait_type))
-		RemoveTrait(trait_type)
-	else if(our_species?.traits[trait_type] != GetTraitLevel(trait_type))
+		remove_trait(trait_type)
+	else if(our_species?.traits[trait_type] != get_trait_level(trait_type))
 		set_trait(trait_type, our_species?.traits[trait_type])
 
+/mob/living/proc/clear_extrinsic_traits()
+	_mob_traits = null
+
 /// Sets the traits list to null if it's identical to the species list.
 /// Returns TRUE if the list was reset and FALSE otherwise.
-/mob/living/proc/CanonizeTraits()
-	if(!traits) // Already in canonical form.
+/mob/living/proc/canonize_traits()
+	if(!_mob_traits) // Already in canonical form.
 		return FALSE
 	var/decl/species/our_species = get_species()
 	if(!our_species) // Doesn't apply without a species.
 		return FALSE
-	var/list/missing_traits = traits ^ our_species?.traits
-	var/list/matched_traits = traits & our_species?.traits
-	if(LAZYLEN(missing_traits))
-		return FALSE
-	for(var/trait in matched_traits) // inside this loop we know our_species exists and has traits
-		if(traits[trait] != our_species.traits[trait])
-			return FALSE
-	traits = null
-	return TRUE
+	if(_mob_traits ~= our_species.traits)
+		_mob_traits = null
+		return TRUE
+	return FALSE
 
 /decl/trait
 	abstract_type = /decl/trait
@@ -194,10 +196,10 @@
 	return (istype(holder))
 
 // Called by preferences selection for HTML display.
-/decl/trait/proc/get_trait_selection_data(var/datum/category_item/player_setup_item/traits/caller, var/list/ticked_traits = list(), var/recurse_level = 0, var/ignore_children_if_unticked = 1, var/ignore_unticked)
+/decl/trait/proc/get_trait_selection_data(var/datum/category_item/player_setup_item/traits/trait_caller, var/list/ticked_traits = list(), var/recurse_level = 0, var/ignore_children_if_unticked = 1, var/ignore_unticked)
 
 	var/ticked = (type in ticked_traits)
-	if((ignore_unticked && !ticked) || (caller && !is_available_to_select(caller.pref)))
+	if((ignore_unticked && !ticked) || (trait_caller && !is_available_to_select(trait_caller.pref)))
 		return ""
 
 	var/result = "<tr><td style='max-width:50%;'>"
@@ -211,10 +213,10 @@
 			incompatible_trait_taken = TRUE
 			break
 
-	var/chargen_name = get_chargen_name(caller.pref)
-	var/chargen_desc = get_chargen_desc(caller.pref)
-	if(istype(caller) && (ticked || caller.get_trait_total() + trait_cost <= get_config_value(/decl/config/num/max_character_traits)) && !incompatible_trait_taken)
-		result += "<a href='byond://?src=\ref[caller];toggle_trait=\ref[src]'>[ticked ? "<font color='#E67300'>[chargen_name]</font>" : "[chargen_name]"] ([trait_cost])</a>"
+	var/chargen_name = get_chargen_name(trait_caller.pref)
+	var/chargen_desc = get_chargen_desc(trait_caller.pref)
+	if(istype(trait_caller) && (ticked || trait_caller.get_trait_total() + trait_cost <= get_config_value(/decl/config/num/max_character_traits)) && !incompatible_trait_taken)
+		result += "<a href='byond://?src=\ref[trait_caller];toggle_trait=\ref[src]'>[ticked ? "<font color='#E67300'>[chargen_name]</font>" : "[chargen_name]"] ([trait_cost])</a>"
 	else
 		result += ticked ? "<font color='#E67300'>[chargen_name]</font>" : "[chargen_name]"
 
@@ -227,7 +229,7 @@
 	result += "</td></tr>"
 	if(LAZYLEN(children) && !(ignore_children_if_unticked && !ticked))
 		for(var/decl/trait/trait in children)
-			result += trait.get_trait_selection_data(caller, ticked_traits, (recurse_level+1), ignore_children_if_unticked)
+			result += trait.get_trait_selection_data(trait_caller, ticked_traits, (recurse_level+1), ignore_children_if_unticked)
 	return result
 
 /// Shows `show_to` a browser window describing the character setup traits taken by `src`.