Merge branch 'cmss13-devs:master' into cluster-hiveweeds

code/__DEFINES/mobs.dm

@@ -113,7 +113,7 @@
 #define CANROOT (1<<6)
 #define GODMODE (1<<12)
 #define FAKEDEATH (1<<13) //Replaces stuff like changeling.changeling_fakedeath
-#define DISFIGURED (1<<14) //I'll probably move this elsewhere if I ever get wround to writing a bitflag mob-damage system
+//#define DISFIGURED (1<<14) //unused
 #define XENO_HOST (1<<15) //Tracks whether we're gonna be a baby alien's mummy.
 #define IMMOBILE_ACTION (1<<16) // If you are performing an action that prevents you from being pushed by your own people.
 #define PERMANENTLY_DEAD (1<<17)

code/__DEFINES/subsystems.dm

@@ -123,6 +123,7 @@
 #define SS_INIT_NIGHTMARE   21.5
 #define SS_INIT_TIMETRACK 21.1
 #define SS_INIT_HUMANS  21
+#define SS_INIT_WHO 20
 #define SS_INIT_POWER   19
 #define SS_INIT_INFLUXMCSTATS 12
 #define SS_INIT_INFLUXSTATS 11

code/__HELPERS/_lists.dm

@@ -128,17 +128,23 @@
  * You should only pass integers in.
  */
 /proc/pick_weight(list/list_to_pick)
+	if(length(list_to_pick) == 0)
+		return null
+
 	var/total = 0
-	var/item
-	for(item in list_to_pick)
+	for(var/item in list_to_pick)
 		if(!list_to_pick[item])
 			list_to_pick[item] = 0
 		total += list_to_pick[item]
 
-	total = rand(0, total)
-	for(item in list_to_pick)
-		total -= list_to_pick[item]
-		if(total <= 0 && list_to_pick[item])
+	total = rand(1, total)
+	for(var/item in list_to_pick)
+		var/item_weight = list_to_pick[item]
+		if(item_weight == 0)
+			continue
+
+		total -= item_weight
+		if(total <= 0)
 			return item
 
 	return null

code/__HELPERS/lists.dm

@@ -87,22 +87,6 @@
 		result = first ^ second
 	return result
 
-//Pretends to pick an element based on its weight but really just seems to pick a random element.
-/proc/pickweight(list/L)
-	var/total = 0
-	var/item
-	for (item in L)
-		if (!L[item])
-			L[item] = 1
-		total += L[item]
-
-	total = rand(1, total)
-	for (item in L)
-		total -=L [item]
-		if (total <= 0)
-			return item
-	return null
-
 /// Pick a random element from the list and remove it from the list.
 /proc/pick_n_take(list/L)
 	RETURN_TYPE(L[_].type)

code/_globalvars/bitfields.dm

@@ -356,7 +356,6 @@ DEFINE_BITFIELD(status_flags, list(
 	"PASSEMOTES" = PASSEMOTES,
 	"GODMODE" = GODMODE,
 	"FAKEDEATH" = FAKEDEATH,
-	"DISFIGURED" = DISFIGURED,
 	"XENO_HOST" = XENO_HOST,
 	"IMMOBILE_ACTION" = IMMOBILE_ACTION,
 	"PERMANENTLY_DEAD" = PERMANENTLY_DEAD,

code/controllers/subsystem/init/lobby_art.dm

@@ -6,5 +6,5 @@ SUBSYSTEM_DEF(lobby_art)
 /datum/controller/subsystem/lobby_art/Initialize()
 	var/list/lobby_arts = CONFIG_GET(str_list/lobby_art_images)
 	if(length(lobby_arts))
-		force_lobby_art(rand(1,length(lobby_arts)))
+		force_lobby_art(rand(1, length(lobby_arts)))
 	return SS_INIT_SUCCESS

code/controllers/subsystem/sound.dm

@@ -19,7 +19,7 @@ SUBSYSTEM_DEF(sound)
 		if(!run_hearers) // Initialize for handling next template
 			run_hearers = run_queue[run_template] // get base hearers
 			if(run_template.range) // ranging
-				run_hearers |= SSquadtree.players_in_range(SQUARE(run_template.x, run_template.y, run_template.range), run_template.z)
+				run_hearers |= SSquadtree.players_in_range(SQUARE(run_template.x, run_template.y, run_template.range * 2), run_template.z)
 			if(MC_TICK_CHECK)
 				return
 		while(length(run_hearers)) // Output sound to hearers