Merge remote-tracking branch 'citadel/master' into mobility_flags

code/modules/mob/living/simple_animal/bot/bot.dm

@@ -15,7 +15,7 @@
 	maxbodytemp = INFINITY
 	minbodytemp = 0
 	blood_volume = 0
-	has_unlimited_silicon_privilege = 1
+	silicon_privileges = PRIVILEDGES_BOT
 	sentience_type = SENTIENCE_ARTIFICIAL
 	status_flags = NONE //no default canpush
 	verb_say = "states"
@@ -194,10 +194,12 @@
 	if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again.
 		locked = FALSE
 		emagged = 1
-		to_chat(user, "<span class='notice'>You bypass [src]'s controls.</span>")
+		if(user)
+			to_chat(user, "<span class='notice'>You bypass [src]'s controls.</span>")
 		return TRUE
 	if(!open)
-		to_chat(user, "<span class='warning'>You need to open maintenance panel first!</span>")
+		if(user)
+			to_chat(user, "<span class='warning'>You need to open maintenance panel first!</span>")
 		return
 	emagged = 2
 	remote_disabled = 1 //Manually emagging the bot locks out the AI built in panel.
@@ -205,7 +207,8 @@
 	bot_reset()
 	turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP.
 	to_chat(src, "<span class='userdanger'>(#$*#$^^( OVERRIDE DETECTED</span>")
-	log_combat(user, src, "emagged")
+	if(user)
+		log_combat(user, src, "emagged")
 	return TRUE
 
 /mob/living/simple_animal/bot/examine(mob/user)