Merge branch 'master' into fufhhhdsdsd

code/__DEFINES/chemistry.dm

@@ -187,6 +187,7 @@
 #define PROPERTY_NEUROSHIELDING "neuroshielding"
 #define PROPERTY_ANTIADDICTIVE "anti-addictive"
 #define PROPERTY_ADDICTIVE "addictive"
+#define PROPERTY_ENCEPHALOPHRASIVE "encephalophrasive"
 //Legendary, only in gen_tier 3+
 #define PROPERTY_HYPERGENETIC "hypergenetic"
 #define PROPERTY_BOOSTING "boosting"

code/__DEFINES/job.dm

@@ -12,6 +12,7 @@
 #define SQUAD_MARINE_INTEL "Intel"
 #define SQUAD_SOF "SOF"
 #define SQUAD_CBRN "CBRN"
+#define SQUAD_FORECON "FORECON"
 
 // Job name defines
 #define JOB_SQUAD_MARINE "Rifleman"

code/__DEFINES/misc.dm

@@ -163,9 +163,10 @@
 #define MATRIX_NVG 1
 #define MATRIX_WIDE 2
 
-#define RESEARCH_UPGRADE_NULL null
+#define RESEARCH_UPGRADE_NOTHING_TO_PASS null
 #define RESEARCH_UPGRADE_EXCLUDE_BUY -2
 #define RESEARCH_UPGRADE_CATEGORY -1 //lord forgive me
+#define RESEARCH_UPGRADE_ITEM 1
 #define RESEARCH_UPGRADE_TIER_1 1
 #define RESEARCH_UPGRADE_TIER_2 2
 #define RESEARCH_UPGRADE_TIER_3 3

code/__DEFINES/mob_hud.dm

@@ -54,6 +54,7 @@
 #define TRACKER_LZ "track_lz"
 #define TRACKER_CO "track_co"
 #define TRACKER_XO "track_xo"
+#define TRACKER_CMP "track_cmp"
 #define TRACKER_CL "track_cl"
 
 #define TRACKER_ASL "_asl" // Alpha Squad Leader

code/__DEFINES/sounds.dm

@@ -60,6 +60,9 @@
 #define SOUND_ENVIRONMENT_DIZZY 24
 #define SOUND_ENVIRONMENT_PSYCHOTIC 25
 
+#define SOUND_ECHO_REVERB_ON list(0, 0, 0, 0, 0, 0.0, 0, 0.25, 1.5, 1.0, 0, 1.0, 0, 0.0, 0.0, 0.0, 1.0, 0)
+#define SOUND_ECHO_REVERB_OFF list(0, 0, -10000, -10000, 0, 0.0, 0, 0.25, 1.5, 1.0, 0, 1.0, 0, 0.0, 0.0, 0.0, 1.0, 0) //-10000 to Room & RoomHF makes enviromental reverb effectively inaudible
+
 #define AMBIENCE_SHIP 'sound/ambience/shipambience.ogg'
 #define AMBIENCE_JUNGLE 'sound/ambience/ambienceLV624.ogg'
 #define AMBIENCE_RIVER  'sound/ambience/ambienceriver.ogg'

code/__DEFINES/tgs.config.dm

@@ -8,5 +8,5 @@
 #define TGS_WARNING_LOG(message) log_world("TGS Warn: [##message]")
 #define TGS_ERROR_LOG(message) log_world("TGS Error: [##message]")
 #define TGS_NOTIFY_ADMINS(event) message_admins(##event)
-#define TGS_CLIENT_COUNT GLOB.clients.len
+#define TGS_CLIENT_COUNT length(GLOB.clients)
 #define TGS_PROTECT_DATUM(Path) GENERAL_PROTECT_DATUM(##Path)

code/__DEFINES/traits.dm

@@ -233,6 +233,8 @@
 #define TRAIT_IN_TUTORIAL "t_IN_TUTORIAL"
 /// If the mob is cloaked in any form
 #define TRAIT_CLOAKED "t_cloaked"
+/// If the mob won't drop items held in face slot when downed
+#define TRAIT_IRON_TEETH "t_iron_teeth"
 
 // -- ability traits --
 /// Xenos with this trait cannot have plasma transfered to them

code/__HELPERS/_lists.dm

@@ -103,7 +103,7 @@
 /proc/bitfield_to_list(bitfield = 0, list/wordlist)
 	var/list/return_list = list()
 	if(islist(wordlist))
-		var/max = min(wordlist.len, 24)
+		var/max = min(length(wordlist), 24)
 		var/bit = 1
 		for(var/i in 1 to max)
 			if(bitfield & bit)
@@ -148,10 +148,10 @@
  * Returns TRUE if the list had nulls, FALSE otherwise
 **/
 /proc/list_clear_nulls(list/list_to_clear)
-	var/start_len = list_to_clear.len
+	var/start_len = length(list_to_clear)
 	var/list/new_list = new(start_len)
 	list_to_clear -= new_list
-	return list_to_clear.len < start_len
+	return length(list_to_clear) < start_len
 
 ///Return a list with no duplicate entries
 /proc/unique_list(list/inserted_list)
@@ -174,6 +174,6 @@
 	if(!inserted_list)
 		return
 
-	for(var/i in 1 to inserted_list.len - 1)
-		inserted_list.Swap(i, rand(i, inserted_list.len))
+	for(var/i in 1 to length(inserted_list) - 1)
+		inserted_list.Swap(i, rand(i, length(inserted_list)))
 

code/__HELPERS/chat.dm

@@ -22,7 +22,7 @@
 		if((!admin_only || channel.is_admin_channel) && (channel_tag in applicable_tags))
 			channels_to_use += channel
 
-	if(channels_to_use.len)
+	if(length(channels_to_use))
 		world.TgsChatBroadcast(message, channels_to_use)
 
 /**

code/__HELPERS/game.dm

@@ -58,7 +58,7 @@
 
 /proc/recursive_mob_check(atom/O, list/L = list(), recursion_limit = 3, client_check = 1, sight_check = 1, include_radio = 1)
 
-	//debug_mob += O.contents.len
+	//debug_mob += length(O.contents)
 	if(!recursion_limit)
 		return L
 	for(var/atom/A in O.contents)
@@ -294,7 +294,7 @@
  * * cache_only - Whether to not actually send a to_chat message and instead only update larva_queue_cached_message
  */
 /proc/message_alien_candidates(list/candidates, dequeued, cache_only = FALSE)
-	for(var/i in (1 + dequeued) to candidates.len)
+	for(var/i in (1 + dequeued) to length(candidates))
 		var/mob/dead/observer/cur_obs = candidates[i]
 
 		// Generate the messages

code/__HELPERS/guid.dm

@@ -6,7 +6,7 @@
 /proc/GUID()
 	var/const/GUID_VERSION = "b"
 	var/const/GUID_VARIANT = "d"
-	var/node_id = copytext_char(md5("[rand()*rand(1,9999999)][world.name][world.hub][world.hub_password][world.internet_address][world.address][world.contents.len][world.status][world.port][rand()*rand(1,9999999)]"), 1, 13)
+	var/node_id = copytext_char(md5("[rand()*rand(1,9999999)][world.name][world.hub][world.hub_password][world.internet_address][world.address][length(world.contents)][world.status][world.port][rand()*rand(1,9999999)]"), 1, 13)
 
 	var/time_high = "[num2hex(text2num(time2text(world.realtime,"YYYY")), 2)][num2hex(world.realtime, 6)]"
 

code/__HELPERS/icons.dm

@@ -332,7 +332,7 @@ world
 /proc/getFlatIcon(image/appearance, defdir, deficon, defstate, defblend, start = TRUE, no_anim = FALSE, appearance_flags = FALSE)
 	// Loop through the underlays, then overlays, sorting them into the layers list
 	#define PROCESS_OVERLAYS_OR_UNDERLAYS(flat, process, base_layer) \
-		for (var/i in 1 to process.len) { \
+		for (var/i in 1 to length(process)) { \
 			var/image/current = process[i]; \
 			if (!current) { \
 				continue; \
@@ -347,7 +347,7 @@ world
 				} \
 				current_layer = base_layer + appearance.layer + current_layer / 1000; \
 			} \
-			for (var/index_to_compare_to in 1 to layers.len) { \
+			for (var/index_to_compare_to in 1 to length(layers)) { \
 				var/compare_to = layers[index_to_compare_to]; \
 				if (current_layer < layers[compare_to]) { \
 					layers.Insert(index_to_compare_to, current); \
@@ -403,7 +403,7 @@ world
 
 	var/curblend = appearance.blend_mode || defblend
 
-	if(appearance.overlays.len || appearance.underlays.len)
+	if(length(appearance.overlays) || length(appearance.underlays))
 		var/icon/flat = icon(flat_template)
 		// Layers will be a sorted list of icons/overlays, based on the order in which they are displayed
 		var/list/layers = list()
@@ -556,15 +556,15 @@ world
 /proc/sort_atoms_by_layer(list/atoms)
 	// Comb sort icons based on levels
 	var/list/result = atoms.Copy()
-	var/gap = result.len
+	var/gap = length(result)
 	var/swapped = 1
 	while (gap > 1 || swapped)
 		swapped = 0
 		if(gap > 1)
 			gap = floor(gap / 1.3) // 1.3 is the emperic comb sort coefficient
 		if(gap < 1)
 			gap = 1
-		for(var/i = 1; gap + i <= result.len; i++)
+		for(var/i = 1; gap + i <= length(result); i++)
 			var/atom/l = result[i] //Fucking hate
 			var/atom/r = result[gap+i] //how lists work here
 			if(l.layer > r.layer) //no "result[i].layer" for me