Replace magic intent words with defines, grab fixes

This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
This commit is contained in:
Tigercat2000
2015-09-07 11:51:00 -07:00
parent e97e6d1cc9
commit be92665871
74 changed files with 233 additions and 282 deletions
+1 -1
View File
@@ -434,7 +434,7 @@ datum
W.loc = M.loc
W.dropped(M)
var/mob/living/carbon/slime/new_mob = new /mob/living/carbon/slime(M.loc)
new_mob.a_intent = "harm"
new_mob.a_intent = I_HARM
new_mob.universal_speak = 1
if(M.mind)
M.mind.transfer_to(new_mob)
@@ -37,7 +37,7 @@
if(!target)
return
if(user.a_intent != "harm" || !isGlass)
if(user.a_intent != I_HARM || !isGlass)
return ..()
@@ -27,7 +27,7 @@
if(!target)
return
if(user.a_intent != "harm")
if(user.a_intent != I_HARM)
return ..()
force = 5
@@ -62,7 +62,7 @@
user << "\red This syringe is broken!"
return
/* if (user.a_intent == "harm" && ismob(target))
/* if (user.a_intent == I_HARM && ismob(target))
if((CLUMSY in user.mutations) && prob(50))
target = user
syringestab(target, user)
@@ -168,7 +168,7 @@
if(target.reagents.total_volume >= target.reagents.maximum_volume)
user << "\red [target] is full."
return
var/mob/living/carbon/human/H = target
if(istype(H))
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)