m_intent now uses defines

This commit is contained in:
Mervill
2016-12-03 00:25:44 -08:00
parent 96c93f6b38
commit 481cc07dcf
14 changed files with 24 additions and 22 deletions
+2 -2
View File
@@ -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>")
+1 -1
View File
@@ -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)
+2 -2
View File
@@ -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