Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

code/ATMOSPHERICS/components/binary_devices/passive_gate.dm

@@ -62,7 +62,8 @@
 		if (REGULATE_OUTPUT)
 			pressure_delta = target_pressure - output_starting_pressure
 	
-	var/flowing_old = flowing
+	//-1 if pump_gas() did not move any gas, >= 0 otherwise
+	var/returnval = -1
 	if((regulate_mode == REGULATE_NONE || pressure_delta > 0.01) && (air1.temperature > 0 || air2.temperature > 0))	//since it's basically a valve, it makes sense to check both temperatures
 		flowing = 1
 		
@@ -82,20 +83,22 @@
 				transfer_moles = min(transfer_moles, pressure_delta*output_volume/(air_temperature * R_IDEAL_GAS_EQUATION))	
 		
 		//pump_gas() will return a negative number if no flow occurred
-		var/flow = pump_gas(src, air1, air2, transfer_moles, available_power=0)	//available_power=0 means we only move gas if it would flow naturally
+		returnval = pump_gas(src, air1, air2, transfer_moles, available_power=0)	//available_power=0 means we only move gas if it would flow naturally
-		
+	
-		if (flow >= 0)
+	if (returnval < 0)
-			if(network1)
-				network1.update = 1
-
-			if(network2)
-				network2.update = 1
-	else
 		flowing = 0
 		last_flow_rate = 0
+	else
+		if(network1)
+			network1.update = 1
+
+		if(network2)
+			network2.update = 1
+		
+		if (!last_flow_rate)
+			flowing = 0
 	
-	if (flowing != flowing_old)
+	update_icon()
-		update_icon()
 
 
 //Radio remote control

code/modules/clothing/clothing.dm

@@ -478,6 +478,7 @@ BLIND     // can't see anything
 	if(copytext(item_color,-2) != "_d")
 		basecolor = item_color
 	if(basecolor + "_d_s" in icon_states('icons/mob/uniform.dmi'))
+		body_parts_covered = "[basecolor]" ? LEGS|LOWER_TORSO : UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 		item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]"
 		usr.update_inv_w_uniform()
 	else

code/modules/mob/living/carbon/human/human.dm

@@ -535,13 +535,13 @@
 //Now checks siemens_coefficient of the affected area by default
 /mob/living/carbon/human/electrocute_act(var/shock_damage, var/obj/source, var/base_siemens_coeff = 1.0, var/def_zone = null)
 	if(status_flags & GODMODE)	return 0	//godmode
-	
+
 	if (!def_zone)
 		def_zone = pick("l_hand", "r_hand")
-	
+
 	var/datum/organ/external/affected_organ = get_organ(check_zone(def_zone))
 	var/siemens_coeff = base_siemens_coeff * get_siemens_coefficient_organ(affected_organ)
-	
+
 	return ..(shock_damage, source, siemens_coeff, def_zone)
 
 
@@ -1562,7 +1562,7 @@
 	flavor_text = flavor_texts["general"]
 	flavor_text += "\n\n"
 	for (var/T in flavor_texts)
-		if(flavor_texts[T] != "")
+		if(flavor_texts[T] && flavor_texts[T] != "")
 			if((T == "head" && head_exposed) || (T == "face" && face_exposed) || (T == "eyes" && eyes_exposed) || (T == "torso" && torso_exposed) || (T == "arms" && arms_exposed) || (T == "hands" && hands_exposed) || (T == "legs" && legs_exposed) || (T == "feet" && feet_exposed))
 				flavor_text += flavor_texts[T]
 				flavor_text += "\n\n"