Merge remote-tracking branch 'upstream/dev-freeze' into dev

code/game/atoms_movable.dm

@@ -21,9 +21,14 @@
 	if(auto_init && ticker && ticker.current_state == GAME_STATE_PLAYING)
 		initialize()
 
+/proc/generate_debug_runtime() // Guaranteed to runtime and print a stack trace to the runtime log
+	var/t = 0 // BYOND won't let us do var/t = 1/0 directly, but it's fine with this.
+	t = 1 / t
+
 /atom/movable/Del()
 	if(isnull(gcDestroyed) && loc)
 		testing("GC: -- [type] was deleted via del() rather than qdel() --")
+		generate_debug_runtime() // stick a stack trace in the runtime logs
 //	else if(isnull(gcDestroyed))
 //		testing("GC: [type] was deleted via GC without qdel()") //Not really a huge issue but from now on, please qdel()
 //	else

code/game/machinery/telecomms/telecomunications.dm

@@ -47,11 +47,13 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 
 	signal.data["slow"] += rand(0, round((100-integrity))) // apply some lag based on integrity
 
+	/*
+	// Edit by Atlantis: Commented out as emergency fix due to causing extreme delays in communications.
 	// Apply some lag based on traffic rates
 	var/netlag = round(traffic / 50)
 	if(netlag > signal.data["slow"])
 		signal.data["slow"] = netlag
-
+	*/
 // Loop through all linked machines and send the signal or copy.
 	for(var/obj/machinery/telecomms/machine in links)
 		if(filter && !istype( machine, text2path(filter) ))

code/game/objects/items/stacks/stack.dm

@@ -68,10 +68,7 @@
 
 		if (istype(E, /datum/stack_recipe_list))
 			var/datum/stack_recipe_list/srl = E
-			if (src.get_amount() >= srl.req_amount)
-				t1 += "<a href='?src=\ref[src];sublist=[i]'>[srl.title] ([srl.req_amount] [src.singular_name]\s)</a>"
-			else
-				t1 += "[srl.title] ([srl.req_amount] [src.singular_name]\s)<br>"
+			t1 += "<a href='?src=\ref[src];sublist=[i]'>[srl.title]</a>"
 
 		if (istype(E, /datum/stack_recipe))
 			var/datum/stack_recipe/R = E
@@ -360,8 +357,6 @@
 /datum/stack_recipe_list
 	var/title = "ERROR"
 	var/list/recipes = null
-	var/req_amount = 1
-	New(title, recipes, req_amount = 1)
+	New(title, recipes)
 		src.title = title
 		src.recipes = recipes
-		src.req_amount = req_amount