Merge remote-tracking branch 'upstream/master'

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

@@ -1650,7 +1650,15 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 				H.Jitter(5)
 			hunger_rate = 3 * HUNGER_FACTOR
 		hunger_rate *= H.physiology.hunger_mod
-		H.adjust_nutrition(-hunger_rate)
+
+		// SANDSTORM EDIT
+		if (H.client)
+			H.adjust_nutrition(-hunger_rate)
+		else
+			// Do not allow SSD players to get too hungry.
+			if (H.nutrition >= NUTRITION_LEVEL_FED)
+				H.adjust_nutrition(-hunger_rate)
+		// End of sandstorm edit
 
 
 	if (H.nutrition > NUTRITION_LEVEL_FULL)

code/modules/mob/living/silicon/robot/robot.dm

@@ -926,7 +926,7 @@
 		status_flags &= ~CANPUSH
 
 	if(module.clean_on_move)
-		AddElement(/datum/element/cleaning)
+		AddElement(/datum/element/cleaning, cleaning_range = 1)
 	else
 		RemoveElement(/datum/element/cleaning)
 
@@ -1196,8 +1196,8 @@
 		var/mob/unbuckle_me_now = i
 		unbuckle_mob(unbuckle_me_now, FALSE)
 
-/mob/living/silicon/robot/proc/TryConnectToAI()
-	set_connected_ai(select_active_ai_with_fewest_borgs(z))
+/mob/living/silicon/robot/proc/TryConnectToAI(mob/living/silicon/ai/connect_to)
+	set_connected_ai(connect_to || select_active_ai_with_fewest_borgs(z))
 	if(connected_ai)
 		lawsync()
 		lawupdate = TRUE