sync

code/__HELPERS/unsorted.dm

@@ -1266,6 +1266,7 @@ proc/pick_closest_path(value, list/matches = get_fancy_list_of_atom_types())
 #define RANDOM_COLOUR (rgb(rand(0,255),rand(0,255),rand(0,255)))
 
 #define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, item), time, TIMER_STOPPABLE)
+#define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
 #define QDEL_NULL(item) qdel(item); item = null
 #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, .proc/______qdel_list_wrapper, L), time, TIMER_STOPPABLE)

code/game/machinery/porta_turret/portable_turret.dm.rej

@@ -1 +0,0 @@
-delete me

code/modules/power/apc.dm

@@ -195,7 +195,7 @@
 
 	make_terminal()
 
-addtimer(CALLBACK(src, .proc/update), 5)
+	addtimer(CALLBACK(src, .proc/update), 5)
 
 /obj/machinery/power/apc/examine(mob/user)
 	..()

code/modules/power/apc.dm.rej

@@ -1,14 +0,0 @@
-diff a/code/modules/power/apc.dm b/code/modules/power/apc.dm	(rejected hunks)
-@@ -178,11 +178,7 @@
- 
- 	//if area isn't specified use current
- 	if(areastring)
--		areastring = text2path(areastring) //resolves the string to path, then filters out instances generated by subtypes of the path in sortedAreas
--		for(var/V in GLOB.sortedAreas)
--			var/area/B = V
--			if(B.type == areastring)
--				src.area = V
-+		src.area = get_area_instance_from_text(areastring)
- 		if(!src.area)
- 			src.area = A
- 			stack_trace("Bad areastring path for [src], [src.areastring]")