Merge branch 'master' into a_intent

Conflicts:
	code/modules/mob/mob_defines.dm

code/game/objects/effects/alien_acid.dm

@@ -66,7 +66,7 @@
 		var/mob/living/L = AM
 		if(L.movement_type & FLYING)
 			return
-		if(L.m_intent != "walk" && prob(40))
+		if(L.m_intent != MOVE_INTENT_WALK && prob(40))
 			var/acid_used = min(acid_level*0.05, 20)
 			if(L.acid_act(10, acid_used, "feet"))
 				acid_level = max(0, acid_level - acid_used*10)
@@ -98,4 +98,4 @@
 				if(8)
 					visible_message("<span class='warning'>[target] is struggling to withstand the acid!</span>")
 				if(4)
-					visible_message("<span class='warning'>[target] begins to crumble under the acid!</span>")
+					visible_message("<span class='warning'>[target] begins to crumble under the acid!</span>")

code/game/objects/items/devices/multitool.dm

@@ -88,5 +88,4 @@
 /obj/item/device/multitool/cyborg
 	name = "multitool"
 	desc = "Optimised and stripped-down version of a regular multitool."
-	icon = 'icons/obj/items_cyborg.dmi'
 	toolspeed = 2

code/game/objects/items/toys.dm

@@ -347,7 +347,7 @@
 /obj/item/toy/snappop/Crossed(H as mob|obj)
 	if(ishuman(H) || issilicon(H)) //i guess carp and shit shouldn't set them off
 		var/mob/living/carbon/M = H
-		if(issilicon(H) || M.m_intent == "run")
+		if(issilicon(H) || M.m_intent == MOVE_INTENT_RUN)
 			M << "<span class='danger'>You step on the snap pop!</span>"
 			pop_burst(2, 0)
 

code/game/objects/items/weapons/tools.dm

@@ -39,7 +39,6 @@
 /obj/item/weapon/wrench/cyborg
 	name = "automatic wrench"
 	desc = "An advanced robotic wrench. Can be found in construction cyborgs."
-	icon = 'icons/obj/items_cyborg.dmi'
 	toolspeed = 2
 
 /obj/item/weapon/wrench/brass
@@ -194,8 +193,6 @@
 /obj/item/weapon/screwdriver/cyborg
 	name = "powered screwdriver"
 	desc = "An electrical screwdriver, designed to be both precise and quick."
-	icon = 'icons/obj/items_cyborg.dmi'
-	icon_state = "screwdriver_cyborg"
 	usesound = 'sound/items/drill_use.ogg'
 	toolspeed = 2
 
@@ -253,8 +250,6 @@
 /obj/item/weapon/wirecutters/cyborg
 	name = "wirecutters"
 	desc = "This cuts wires."
-	icon = 'icons/obj/items_cyborg.dmi'
-	icon_state = "cutters_cyborg"
 	toolspeed = 2
 
 /obj/item/weapon/wirecutters/power
@@ -567,8 +562,6 @@
 /obj/item/weapon/weldingtool/largetank/cyborg
 	name = "integrated welding tool"
 	desc = "An advanced welder designed to be used in robotic systems."
-	icon = 'icons/obj/items_cyborg.dmi'
-	icon_state = "indwelder"
 	toolspeed = 2
 
 /obj/item/weapon/weldingtool/largetank/flamethrower_screwdriver()
@@ -677,7 +670,6 @@
 /obj/item/weapon/crowbar/cyborg
 	name = "hydraulic crowbar"
 	desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs."
-	icon = 'icons/obj/items_cyborg.dmi'
 	usesound = 'sound/items/jaws_pry.ogg'
 	force = 10
 	toolspeed = 2

code/game/objects/structures/holosign.dm

@@ -49,7 +49,7 @@
 	obj_integrity = 20
 	max_integrity = 20
 	var/allow_walk = 1 //can we pass through it on walk intent
-	
+
 /obj/structure/holosign/barrier/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	if(!density)
 		return 1
@@ -59,7 +59,7 @@
 		return 1
 	if(iscarbon(mover))
 		var/mob/living/carbon/C = mover
-		if(allow_walk && C.m_intent == "walk")
+		if(allow_walk && C.m_intent == MOVE_INTENT_WALK)
 			return 1
 
 /obj/structure/holosign/barrier/engineering