Updating from Neb dev

code/__defines/_compile_options.dm → code/___compile_options.dm

@@ -1,7 +1,3 @@
-// The default value for all uses of set background. Set background can cause gradual lag and is recommended you only turn this on if necessary.
-// 1 will enable set background. 0 will disable set background.
-#define BACKGROUND_ENABLED 0
-
 // If REFTRACK_IN_CI is defined, the reftracker will run in CI.
 #define REFTRACK_IN_CI
 #if defined(REFTRACK_IN_CI) && defined(UNIT_TEST) && !defined(SPACEMAN_DMM)

code/__defines/ZAS.dm

@@ -57,29 +57,25 @@
 	}
 
 #ifdef MULTIZAS
-
-var/global/list/csrfz_check = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST, NORTHUP, EASTUP, WESTUP, SOUTHUP, NORTHDOWN, EASTDOWN, WESTDOWN, SOUTHDOWN)
-var/global/list/gzn_check = list(NORTH, SOUTH, EAST, WEST, UP, DOWN)
+#define ZAS_CSRFZ_CHECK global.cornerdirsz
+#define ZAS_GZN_CHECK global.cardinalz
 
 #define ATMOS_CANPASS_TURF(ret, A, B) \
 	if (A.blocks_air & AIR_BLOCKED || B.blocks_air & AIR_BLOCKED) { \
 		ret = BLOCKED; \
 	} \
-	else if (B.z != A.z) { \
-		if (B.z < A.z) { \
-			ret = (A.z_flags & ZM_ALLOW_ATMOS) ? ZONE_BLOCKED : BLOCKED; \
-		} \
-		else { \
-			ret = (B.z_flags & ZM_ALLOW_ATMOS) ? ZONE_BLOCKED : BLOCKED; \
-		} \
+	else if (B.z < A.z) { \
+		ret = (A.z_flags & ZM_ALLOW_ATMOS) ? ZONE_BLOCKED : BLOCKED; \
 	} \
-	else if (A.blocks_air & ZONE_BLOCKED || B.blocks_air & ZONE_BLOCKED) { \
-		ret = (A.z == B.z) ? ZONE_BLOCKED : AIR_BLOCKED; \
+	else if(B.z > A.z) { \
+		ret = (B.z_flags & ZM_ALLOW_ATMOS) ? ZONE_BLOCKED : BLOCKED; \
 	} \
-	else if (A.contents.len) { \
+	else if ((A.blocks_air & ZONE_BLOCKED) || (B.blocks_air & ZONE_BLOCKED)) { \
+		ret = ZONE_BLOCKED; \
+	} \
+	else if (length(A.contents)) { \
 		ret = 0;\
-		for (var/thing in A) { \
-			var/atom/movable/AM = thing; \
+		for (var/atom/movable/AM as anything in A) { \
 			ATMOS_CANPASS_MOVABLE(ret, AM, B); \
 			if (ret == BLOCKED) { \
 				break;\
@@ -88,8 +84,8 @@ var/global/list/gzn_check = list(NORTH, SOUTH, EAST, WEST, UP, DOWN)
 	}
 #else
 
-var/global/list/csrfz_check = list(NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
-var/global/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
+#define ZAS_CSRFZ_CHECK global.cornerdirs
+#define ZAS_GZN_CHECK global.cardinal
 
 #define ATMOS_CANPASS_TURF(ret, A, B) \
 	if (A.blocks_air & AIR_BLOCKED || B.blocks_air & AIR_BLOCKED) { \
@@ -98,7 +94,7 @@ var/global/list/gzn_check = list(NORTH, SOUTH, EAST, WEST)
 	else if (A.blocks_air & ZONE_BLOCKED || B.blocks_air & ZONE_BLOCKED) { \
 		ret = ZONE_BLOCKED; \
 	} \
-	else if (A.contents.len) { \
+	else if (length(A.contents)) { \
 		ret = 0;\
 		for (var/thing in A) { \
 			var/atom/movable/AM = thing; \

code/__defines/flags.dm

@@ -84,7 +84,7 @@ The latter will result in a linter warning and will not work correctly.
 #define ITEM_FLAG_NOCUFFS                   BITFLAG(11) // Gloves that have this flag prevent cuffs being applied
 #define ITEM_FLAG_CAN_HIDE_IN_SHOES         BITFLAG(12) // Items that can be hidden in shoes that permit it
 #define ITEM_FLAG_PADDED                    BITFLAG(13) // When set on gloves, will act like pulling punches in unarmed combat.
-#define ITEM_FLAG_CAN_TAPE                  BITFLAG(14) // Whether the item can be be taped onto something using tape
+#define ITEM_FLAG_CAN_TAPE                  BITFLAG(14) // Whether the item can be taped onto something using tape
 #define ITEM_FLAG_IS_WEAPON                 BITFLAG(15) // Item is considered a weapon. Currently only used for force-based worth calculation.
 
 // Flags for pass_flags (/atom/var/pass_flags)

code/__defines/gamemode.dm

@@ -3,7 +3,7 @@
 #define CHOOSE_GAMEMODE_RETRY       2 // The gamemode could not be chosen; we will use the next most popular option voted in, or the default.
 #define CHOOSE_GAMEMODE_REVOTE      3 // The gamemode could not be chosen; we need to have a revote.
 #define CHOOSE_GAMEMODE_RESTART     4 // The gamemode could not be chosen; we will restart the server.
-#define CHOOSE_GAMEMODE_SILENT_REDO 5 // The gamemode could not be chosen; we request to have the the proc rerun on the next tick.
+#define CHOOSE_GAMEMODE_SILENT_REDO 5 // The gamemode could not be chosen; we request to have the proc rerun on the next tick.
 
 //End game state, to manage round end.
 #define END_GAME_NOT_OVER         1

code/__defines/item_effects.dm

@@ -0,0 +1,15 @@
+// Identifiers for various categories of item effects.
+#define IE_CAT_DAMAGE   "weff_damage"
+#define IE_CAT_STRIKE   "weff_strike"
+#define IE_CAT_PARRY    "weff_parry"
+#define IE_CAT_USED     "weff_used"
+#define IE_CAT_WIELDED  "weff_wield"
+#define IE_CAT_VISUAL   "weff_visual"
+#define IE_CAT_LISTENER "weff_listener"
+#define IE_CAT_EXAMINE  "weff_visible"
+#define IE_CAT_RANGED   "weff_ranged"
+#define IE_CAT_PROCESS  "weff_process"
+
+// Identifiers for parameters for item effects.
+#define IE_PAR_USES     "uses"
+#define IE_PAR_MAX_USES "max_uses"

code/__defines/qdel.dm

@@ -21,21 +21,25 @@
 #define GC_QUEUE_ITEM_GCD_DESTROYED 3 //! Item's gc_destroyed var value. Used to detect ref reuse.
 #define GC_QUEUE_ITEM_INDEX_COUNT 3 //! Number of item indexes, used for allocating the nested lists. Don't forget to increase this if you add a new queue item index
 
-#define GC_QUEUED_FOR_HARD_DEL -1
-#define GC_CURRENTLY_BEING_QDELETED -2
+// Defines for the time an item has to get its reference cleaned before it fails the queue and moves to the next.
+#define GC_FILTER_QUEUE (1 SECONDS)
+#define GC_CHECK_QUEUE (5 MINUTES)
+#define GC_DEL_QUEUE (10 SECONDS)
+
+#define GC_CURRENTLY_BEING_QDELETED -1
 
 #define QDELING(X) (X.gc_destroyed)
 #define QDELETED(X) (isnull(X) || QDELING(X))
 #define QDESTROYING(X) (isnull(X) || X.gc_destroyed == GC_CURRENTLY_BEING_QDELETED)
 
 //Qdel helper macros.
-#define QDEL_IN(item, time) if(!isnull(item)) {addtimer(CALLBACK(item, TYPE_PROC_REF(/datum, qdel_self)), time, TIMER_STOPPABLE)}
-#define QDEL_IN_CLIENT_TIME(item, time) if(!isnull(item)) {addtimer(CALLBACK(item, TYPE_PROC_REF(/datum, qdel_self)), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)}
+#define QDEL_IN(item, time) if(!isnull(item)) {addtimer(CALLBACK(item, TYPE_PROC_REF(/datum, qdel_self)), time)}
+#define QDEL_IN_CLIENT_TIME(item, time) if(!isnull(item)) {addtimer(CALLBACK(item, TYPE_PROC_REF(/datum, qdel_self)), time, TIMER_CLIENT_TIME)}
 #define QDEL_NULL(item) if(item) {qdel(item); item = null}
 #define QDEL_NULL_SCREEN(item) if(client) { client.screen -= item; }; QDEL_NULL(item)
 #define QDEL_NULL_LIST(x) if(x) { for(var/y in x) { qdel(y) }}; if(x) {x.Cut(); x = null } // Second x check to handle items that LAZYREMOVE on qdel.
 #define QDEL_LIST(L) if(L) { for(var/I in L) qdel(I); L.Cut(); }
-#define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(______qdel_list_wrapper), L), time, TIMER_STOPPABLE)
+#define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(______qdel_list_wrapper), L), time)
 #define QDEL_LIST_ASSOC(L) if(L) { for(var/I in L) { qdel(L[I]); qdel(I); } L.Cut(); }
 #define QDEL_LIST_ASSOC_VAL(L) if(L) { for(var/I in L) qdel(L[I]); L.Cut(); }
 

code/__defines/research.dm

@@ -19,7 +19,8 @@
 #define HOLLOW_OBJECT_MATTER_MULTIPLIER 0.05
 #define BASE_OBJECT_MATTER_MULTPLIER    0.25
 
-#define GENERIC_SMELTING_HEAT_POINT 1350 CELSIUS
+#define LOW_SMELTING_HEAT_POINT     1150 CELSIUS // Reachable with coal in a kiln on the medieval maps.
+#define GENERIC_SMELTING_HEAT_POINT 1350 CELSIUS // Reachable with coal and a bellows in a kiln on medieval maps.
 #define HIGH_SMELTING_HEAT_POINT    4000 CELSIUS // must be at least 4074K (3800 C) to melt graphite
 
 #define TECH_MATERIAL      "materials"

code/__defines/species.dm

@@ -8,6 +8,7 @@
 #define SPECIES_FLAG_NO_BLOCK           BITFLAG(6) // Unable to block or defend itself from attackers.
 #define SPECIES_FLAG_NEED_DIRECT_ABSORB BITFLAG(7) // This species can only have their DNA taken by direct absorption.
 #define SPECIES_FLAG_LOW_GRAV_ADAPTED   BITFLAG(8) // This species is used to lower than standard gravity, affecting stamina in high-grav
+#define SPECIES_FLAG_ABSORB_ELECTRICITY BITFLAG(9) // This species can absorb electricity; snowflake flag for old slime people.
 
 // Species spawn flags
 #define SPECIES_IS_WHITELISTED             BITFLAG(0) // Must be whitelisted to play.

code/__defines/subsystems.dm

@@ -1,7 +1,6 @@
 #define INITIALIZATION_INSSATOMS      0	//New should not call Initialize
-#define INITIALIZATION_INSSATOMS_LATE 1	//New should not call Initialize; after the first pass is complete (handled differently)
-#define INITIALIZATION_INNEW_MAPLOAD  2	//New should call Initialize(TRUE)
-#define INITIALIZATION_INNEW_REGULAR  3	//New should call Initialize(FALSE)
+#define INITIALIZATION_INNEW_MAPLOAD  1	//New should call Initialize(TRUE)
+#define INITIALIZATION_INNEW_REGULAR  2	//New should call Initialize(FALSE)
 
 #define INITIALIZE_HINT_NORMAL   0  //Nothing happens
 #define INITIALIZE_HINT_LATELOAD 1  //Call LateInitialize

code/_helpers/files.dm

@@ -1,7 +1,7 @@
 //Sends resource files to client cache
 /client/proc/getFiles()
 	for(var/file in args)
-		direct_output(src, browse_rsc(file))
+		send_rsc(src, file, null)
 
 /client/proc/browse_files(root="data/logs/", max_iterations=10, list/valid_extensions=list(".txt",".log",".htm"))
 	var/path = root

code/_helpers/icons.dm

@@ -163,7 +163,7 @@ mob
 			// Send the icon to src's local cache
 			send_rsc(src, getFlatIcon(src), iconName)
 			// Display the icon in their browser
-			direct_output(src, browse("<body bgcolor='#000000'><p><img src='[iconName]'></p></body>"))
+			show_browser(src, "<body bgcolor='#000000'><p><img src='[iconName]'></p></body>")
 
 		Output_Icon()
 			set name = "2. Output Icon"

code/_helpers/logging.dm

@@ -26,7 +26,7 @@ var/global/log_end= world.system_type == UNIX ? ascii2text(13) : ""
 	to_world_log("## TESTING: [msg][log_end]")
 
 /proc/game_log(category, text)
-	direct_output(diary, "\[[time_stamp()]] [game_id] [category]: [text][log_end]")
+	to_file(diary, "\[[time_stamp()]] [game_id] [category]: [text][log_end]")
 
 /proc/log_admin(text)
 	global.admin_log.Add(text)

code/_helpers/profiling.dm

@@ -71,7 +71,7 @@
 		lines += "[entry] => [num2text(data[STAT_ENTRY_TIME], 10)]ms ([data[STAT_ENTRY_COUNT]]) (avg:[num2text(data[STAT_ENTRY_TIME]/(data[STAT_ENTRY_COUNT] || 1), 99)])"
 
 	if (user)
-		direct_output(user, browse("<ol><li>[lines.Join("</li><li>")]</li></ol>", "window=[url_encode("stats:[ref(stats)]")]"))
+		show_browser(user, "<ol><li>[lines.Join("</li><li>")]</li></ol>", "window=[url_encode("stats:[ref(stats)]")]")
 
 	. = lines.Join("\n")
 

code/_helpers/sorts/__main.dm

@@ -169,7 +169,7 @@ reverse a descending sequence without violating stability.
 	var/r = 0	//becomes 1 if any bits are shifted off
 	while(n >= MIN_MERGE)
 		r |= (n & 1)
-		n >>= 1
+		n = BITSHIFT_RIGHT(n, 1)
 	return n + r
 
 //Examines the stack of runs waiting to be merged and merges adjacent runs until the stack invariants are reestablished:

code/_helpers/unsorted.dm

@@ -692,23 +692,17 @@ Turf and target are seperate in case you want to teleport some distance from a t
 	return zone_to_descriptor_mapping[zone] || zone
 
 //Whether or not the given item counts as sharp in terms of dealing damage
-/proc/is_sharp(obj/O)
-	if (!O) return 0
-	if (O.sharp) return 1
-	if (O.edge) return 1
-	return 0
+/obj/proc/is_sharp()
+	return FALSE
 
 //Whether or not the given item counts as cutting with an edge in terms of removing limbs
-/proc/has_edge(obj/O)
-	if (!O) return 0
-	if (O.edge) return 1
-	return 0
-
+/obj/proc/has_edge()
+	return FALSE
 
 //For items that can puncture e.g. thick plastic but aren't necessarily sharp
 //Returns 1 if the given item is capable of popping things like balloons, inflatable barriers, or cutting police tape.
 /obj/item/proc/can_puncture()
-	return sharp
+	return is_sharp()
 
 /obj/item/screwdriver/can_puncture()
 	return 1

code/_macros.dm

@@ -106,9 +106,12 @@
 #define show_image(target, image)                           target << (image)
 #define send_rsc(target, rsc_content, rsc_name)             target << browse_rsc(rsc_content, rsc_name)
 #define open_link(target, url)                              target << link(url)
+#define ftp_to(target, file_entry, suggested_name)          target << ftp(file_entry, suggested_name)
+#define open_file_for(target, file)                         target << run(file)
 #define to_savefile(target, key, value)                     target[(key)] << (value)
 #define from_savefile(target, key, value)                   target[(key)] >> (value)
 #define to_output(target, output_content, output_args)      target << output((output_content), (output_args))
+// Avoid using this where possible, prefer the other helpers instead.
 #define direct_output(target, value)                        target << (value)
 
 /proc/html_icon(var/thing) // Proc instead of macro to avoid precompiler problems.
@@ -147,34 +150,35 @@
 #define SPAN_STYLE(S, X) "<span style='[S]'>[X]</span>"
 
 #define SPAN_CLASS(C, X) "<span class='[C]'>[X]</span>"
-#define SPAN_ITALIC(X)   SPAN_CLASS("italic",        X)
-#define SPAN_BOLD(X)     SPAN_CLASS("bold",          X)
-#define SPAN_NOTICE(X)   SPAN_CLASS("notice",        X)
-#define SPAN_WARNING(X)  SPAN_CLASS("warning",       X)
-#define SPAN_DANGER(X)   SPAN_CLASS("danger",        X)
-#define SPAN_ROSE(X)     SPAN_CLASS("rose",          X)
-#define SPAN_OCCULT(X)   SPAN_CLASS("cult",          X)
-#define SPAN_MFAUNA(X)   SPAN_CLASS("mfauna",        X)
-#define SPAN_SUBTLE(X)   SPAN_CLASS("subtle",        X)
-#define SPAN_INFO(X)     SPAN_CLASS("info",          X)
-#define SPAN_RED(X)      SPAN_CLASS("font_red",      X)
-#define SPAN_ORANGE(X)   SPAN_CLASS("font_orange",   X)
-#define SPAN_YELLOW(X)   SPAN_CLASS("font_yellow",   X)
-#define SPAN_GREEN(X)    SPAN_CLASS("font_green",    X)
-#define SPAN_BLUE(X)     SPAN_CLASS("font_blue",     X)
-#define SPAN_VIOLET(X)   SPAN_CLASS("font_violet",   X)
-#define SPAN_PURPLE(X)   SPAN_CLASS("font_purple",   X)
-#define SPAN_GREY(X)     SPAN_CLASS("font_grey",     X)
-#define SPAN_MAROON(X)   SPAN_CLASS("font_maroon",   X)
-#define SPAN_PINK(X)     SPAN_CLASS("font_pink",     X)
-#define SPAN_PALEPINK(X) SPAN_CLASS("font_palepink", X)
-#define SPAN_SINISTER(X) SPAN_CLASS("sinister", X)
-#define SPAN_MODERATE(X) SPAN_CLASS("moderate", X)
+#define SPAN_ITALIC(X)        SPAN_CLASS("italic",        X)
+#define SPAN_BOLD(X)          SPAN_CLASS("bold",          X)
+#define SPAN_NOTICE(X)        SPAN_CLASS("notice",        X)
+#define SPAN_WARNING(X)       SPAN_CLASS("warning",       X)
+#define SPAN_DANGER(X)        SPAN_CLASS("danger",        X)
+#define SPAN_ROSE(X)          SPAN_CLASS("rose",          X)
+#define SPAN_OCCULT(X)        SPAN_CLASS("cult",          X)
+#define SPAN_CULT_ANNOUNCE(X) SPAN_CLASS("cultannounce",  X)
+#define SPAN_MFAUNA(X)        SPAN_CLASS("mfauna",        X)
+#define SPAN_SUBTLE(X)        SPAN_CLASS("subtle",        X)
+#define SPAN_INFO(X)          SPAN_CLASS("info",          X)
+#define SPAN_RED(X)           SPAN_CLASS("font_red",      X)
+#define SPAN_ORANGE(X)        SPAN_CLASS("font_orange",   X)
+#define SPAN_YELLOW(X)        SPAN_CLASS("font_yellow",   X)
+#define SPAN_GREEN(X)         SPAN_CLASS("font_green",    X)
+#define SPAN_BLUE(X)          SPAN_CLASS("font_blue",     X)
+#define SPAN_VIOLET(X)        SPAN_CLASS("font_violet",   X)
+#define SPAN_PURPLE(X)        SPAN_CLASS("font_purple",   X)
+#define SPAN_GREY(X)          SPAN_CLASS("font_grey",     X)
+#define SPAN_MAROON(X)        SPAN_CLASS("font_maroon",   X)
+#define SPAN_PINK(X)          SPAN_CLASS("font_pink",     X)
+#define SPAN_PALEPINK(X)      SPAN_CLASS("font_palepink", X)
+#define SPAN_SINISTER(X)      SPAN_CLASS("sinister", X)
+#define SPAN_MODERATE(X)      SPAN_CLASS("moderate", X)
 // placeholders
-#define SPAN_GOOD(X)     SPAN_GREEN(X)
-#define SPAN_NEUTRAL(X)  SPAN_BLUE(X)
-#define SPAN_BAD(X)      SPAN_RED(X)
-#define SPAN_HARDSUIT(X) SPAN_BLUE(X)
+#define SPAN_GOOD(X)          SPAN_GREEN(X)
+#define SPAN_NEUTRAL(X)       SPAN_BLUE(X)
+#define SPAN_BAD(X)           SPAN_RED(X)
+#define SPAN_HARDSUIT(X)      SPAN_BLUE(X)
 
 #define CSS_CLASS_RADIO "radio"
 
@@ -194,4 +198,8 @@
 
 #define FONT_GIANT(X) "<font size='5'>[X]</font>"
 
-#define PRINT_STACK_TRACE(X) get_stack_trace(X, __FILE__, __LINE__)
+#define PRINT_STACK_TRACE(X) get_stack_trace(X, __FILE__, __LINE__)
+
+/// Checks if potential_weakref is a weakref of thing.
+/// NOTE: These argments are the opposite order of TG's, because I think TG's are counterintuitive.
+#define IS_WEAKREF_OF(potential_weakref, thing) (istype(thing, /datum) && !isnull(potential_weakref) && thing.weakref == potential_weakref)

code/_onclick/click.dm

@@ -282,10 +282,10 @@
 	return A.CtrlClick(src)
 
 /atom/proc/CtrlClick(var/mob/user)
-	if(loc == user)
+	if(get_recursive_loc_of_type(/mob) == user)
 		var/decl/interaction_handler/handler = get_quick_interaction_handler(user)
 		if(handler)
-			var/using_item = user.get_active_held_item() || user.get_usable_hand_slot_organ()
+			var/using_item = user.get_active_held_item()
 			if(handler.is_possible(src, user, using_item))
 				return handler.invoked(src, user, using_item)
 	return FALSE

code/_onclick/hud/ai.dm

@@ -1,6 +1,9 @@
 /mob/living/silicon/ai
 	hud_used = /datum/hud/ai
 
+/datum/hud/ai
+	action_intent_type = null // no selector
+
 /datum/hud/ai/FinalizeInstantiation()
 	var/list/ai_hud_data = decls_repository.get_decls_of_subtype(/decl/ai_hud)
 	for(var/elem_type in ai_hud_data)

code/_onclick/hud/animal.dm

@@ -11,6 +11,4 @@
 	move_intent = new(null, mymob, ui_style, ui_color, ui_alpha, UI_ICON_MOVEMENT)
 	move_intent.icon_state = mymob.move_intent.hud_icon_state
 	adding += move_intent
-	action_intent = new(null, mymob, ui_style, ui_color, ui_alpha)
-	adding += action_intent
 	..()

code/_onclick/hud/hud.dm

@@ -30,10 +30,12 @@
 
 	var/list/hand_hud_objects
 	var/list/swaphand_hud_objects
-	var/obj/screen/intent/action_intent
 	var/obj/screen/movement/move_intent
 	var/obj/screen/stamina/stamina_bar
 
+	var/action_intent_type = /obj/screen/intent
+	var/obj/screen/intent/action_intent
+
 	var/list/adding = list()
 	var/list/other = list()
 	var/list/hud_elements = list()
@@ -118,9 +120,17 @@
 	return FALSE
 
 /datum/hud/proc/FinalizeInstantiation()
+
 	SHOULD_CALL_PARENT(TRUE)
+
+	if(!action_intent && action_intent_type) // Everyone needs an intent selector.
+		action_intent = new action_intent_type(null, mymob)
+		adding |= action_intent
+		hud_elements |= action_intent
+
 	BuildInventoryUI()
 	BuildHandsUI()
+
 	if(mymob.client)
 		mymob.client.screen = list()
 		if(length(hand_hud_objects))
@@ -133,6 +143,7 @@
 			mymob.client.screen |= adding
 		if(length(hotkeybuttons))
 			mymob.client.screen |= hotkeybuttons
+
 	hide_inventory()
 
 /datum/hud/proc/get_ui_style_data()