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

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

@@ -16,7 +16,7 @@
 	name = "AI"
 	icon = 'icons/mob/ai.dmi'
 	icon_state = "ai"
-	anchored = TRUE
+	move_resist = MOVE_FORCE_OVERPOWERING
 	density = TRUE
 	mobility_flags = NONE
 	status_flags = CANSTUN|CANPUSH
@@ -101,6 +101,7 @@
 		new/obj/structure/AIcore/deactivated(loc) //New empty terminal.
 		return INITIALIZE_HINT_QDEL //Delete AI.
 
+	ADD_TRAIT(src, TRAIT_NO_TELEPORT, src)
 	if(L && istype(L, /datum/ai_laws))
 		laws = L
 		laws.associate(src)
@@ -311,9 +312,16 @@
 		return // stop
 	if(incapacitated())
 		return
-	anchored = !anchored // Toggles the anchor
+	var/is_anchored = FALSE
+	if(move_resist == MOVE_FORCE_OVERPOWERING)
+		move_resist = MOVE_FORCE_NORMAL
+	else
+		is_anchored = TRUE
+		move_resist = MOVE_FORCE_OVERPOWERING
+		REMOVE_TRAIT(src, TRAIT_NO_TELEPORT, src)
+		ADD_TRAIT(src, TRAIT_NO_TELEPORT, src)
 
-	to_chat(src, "<b>You are now [anchored ? "" : "un"]anchored.</b>")
+	to_chat(src, "<b>You are now [is_anchored ? "" : "un"]anchored.</b>")
 	// the message in the [] will change depending whether or not the AI is anchored
 
 // AIs are immobile

code/modules/mob/living/silicon/ai/ai_defense.dm

@@ -42,9 +42,8 @@
 
 
 /mob/living/silicon/ai/bullet_act(obj/item/projectile/Proj)
-	..(Proj)
+	. = ..()
 	updatehealth()
-	return 2
 
 /mob/living/silicon/ai/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
 	return // no eyes, no flashing

code/modules/mob/living/silicon/ai/death.dm

@@ -14,7 +14,7 @@
 
 	cameraFollow = null
 
-	anchored = FALSE //unbolt floorbolts
+	move_resist = MOVE_FORCE_NORMAL
 	update_mobility()
 	if(eyeobj)
 		eyeobj.setLoc(get_turf(src))