Merge branch 'master' into wound-port

code/__HELPERS/_logging.dm

@@ -122,6 +122,9 @@
 		//reusing the PDA option because I really don't think news comments are worth a config option
 		WRITE_LOG(GLOB.world_pda_log, "COMMENT: [text]")
 
+/proc/log_paper(text)
+	WRITE_LOG(GLOB.world_paper_log, "PAPER: [text]")
+
 /proc/log_telecomms(text)
 	if (CONFIG_GET(flag/log_telecomms))
 		WRITE_LOG(GLOB.world_telecomms_log, "TCOMMS: [text]")
@@ -135,6 +138,10 @@
 	if (CONFIG_GET(flag/log_vote))
 		WRITE_LOG(GLOB.world_game_log, "VOTE: [text]")
 
+/proc/log_shuttle(text)
+	if (CONFIG_GET(flag/log_shuttle))
+		WRITE_LOG(GLOB.world_shuttle_log, "SHUTTLE: [text]")
+
 /proc/log_craft(text)
 	if (CONFIG_GET(flag/log_craft))
 		WRITE_LOG(GLOB.world_crafting_log, "CRAFT: [text]")

code/__HELPERS/_string_lists.dm

@@ -1,4 +1,5 @@
 #define pick_list(FILE, KEY) (pick(strings(FILE, KEY)))
+#define pick_list_weighted(FILE, KEY) (pickweight(strings(FILE, KEY)))
 #define pick_list_replacements(FILE, KEY) (strings_replacement(FILE, KEY))
 #define json_load(FILE) (json_decode(file2text(FILE)))
 

code/__HELPERS/dna.dm

@@ -5,8 +5,9 @@
 #define GET_INITIALIZED_MUTATION(A) GLOB.all_mutations[A]
 #define GET_GENE_STRING(A, B) (B.mutation_index[A])
 #define GET_SEQUENCE(A) (GLOB.full_sequences[A])
+#define GET_MUTATION_TYPE_FROM_ALIAS(A) (GLOB.alias_mutations[A])
 
 #define GET_MUTATION_STABILIZER(A) ((A.stabilizer_coeff < 0) ? 1 : A.stabilizer_coeff)
 #define GET_MUTATION_SYNCHRONIZER(A) ((A.synchronizer_coeff < 0) ? 1 : A.synchronizer_coeff)
 #define GET_MUTATION_POWER(A) ((A.power_coeff < 0) ? 1 : A.power_coeff)
-#define GET_MUTATION_ENERGY(A) ((A.energy_coeff < 0) ? 1 : A.energy_coeff)
+#define GET_MUTATION_ENERGY(A) ((A.energy_coeff < 0) ? 1 : A.energy_coeff)

code/__HELPERS/game.dm

@@ -53,6 +53,27 @@
 	for(var/I in adjacent_turfs)
 		. |= get_area(I)
 
+/**
+ * Get a bounding box of a list of atoms.
+ *
+ * Arguments:
+ * - atoms - List of atoms. Can accept output of view() and range() procs.
+ *
+ * Returns: list(x1, y1, x2, y2)
+ */
+/proc/get_bbox_of_atoms(list/atoms)
+	var/list/list_x = list()
+	var/list/list_y = list()
+	for(var/_a in atoms)
+		var/atom/a = _a
+		list_x += a.x
+		list_y += a.y
+	return list(
+		min(list_x),
+		min(list_y),
+		max(list_x),
+		max(list_y))
+
 // Like view but bypasses luminosity check
 
 /proc/get_hear(range, atom/source)

code/__HELPERS/global_lists.dm

@@ -90,7 +90,6 @@
 	init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes)
 
 	INVOKE_ASYNC(GLOBAL_PROC, /proc/init_ref_coin_values) //so the current procedure doesn't sleep because of UNTIL()
-	INVOKE_ASYNC(GLOBAL_PROC, /proc/setupGenetics)
 
 //creates every subtype of prototype (excluding prototype) and adds it to list L.
 //if no list/L is provided, one is created.
@@ -117,24 +116,3 @@
 		GLOB.coin_values[path] = C.value
 		qdel(C)
 
-/proc/setupGenetics()
-	var/list/mutations = subtypesof(/datum/mutation/human)
-	shuffle_inplace(mutations)
-	for(var/A in subtypesof(/datum/generecipe))
-		var/datum/generecipe/GR = A
-		GLOB.mutation_recipes[initial(GR.required)] = initial(GR.result)
-	for(var/i in 1 to LAZYLEN(mutations))
-		var/path = mutations[i] //byond gets pissy when we do it in one line
-		var/datum/mutation/human/B = new path ()
-		B.alias = "Mutation #[i]"
-		GLOB.all_mutations[B.type] = B
-		GLOB.full_sequences[B.type] = generate_gene_sequence(B.blocks)
-		if(B.locked)
-			continue
-		if(B.quality == POSITIVE)
-			GLOB.good_mutations |= B
-		else if(B.quality == NEGATIVE)
-			GLOB.bad_mutations |= B
-		else if(B.quality == MINOR_NEGATIVE)
-			GLOB.not_good_mutations |= B
-		CHECK_TICK

code/__HELPERS/unsorted.dm

@@ -1509,6 +1509,8 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 	set waitfor = FALSE
 	return call(source, proctype)(arglist(arguments))
 
+#define TURF_FROM_COORDS_LIST(List) (locate(List[1], List[2], List[3]))
+
 /proc/num2sign(numeric)
 	if(numeric > 0)
 		return 1