Updates Intents

This commit is contained in:
Sam
2017-06-10 09:43:36 +01:00
parent c1cc319f62
commit 4d57fff5c9
94 changed files with 200 additions and 200 deletions
+4 -4
View File
@@ -324,25 +324,25 @@ var/static/regex/multispin_words = regex("like a record baby")
//HELP INTENT
else if((findtext(message, helpintent_words)))
for(var/mob/living/carbon/human/H in listeners)
H.a_intent_change(I_HELP)
H.a_intent_change(INTENT_HELP)
next_command = world.time + cooldown_meme
//DISARM INTENT
else if((findtext(message, disarmintent_words)))
for(var/mob/living/carbon/human/H in listeners)
H.a_intent_change(I_DISARM)
H.a_intent_change(INTENT_DISARM)
next_command = world.time + cooldown_meme
//GRAB INTENT
else if((findtext(message, grabintent_words)))
for(var/mob/living/carbon/human/H in listeners)
H.a_intent_change(I_GRAB)
H.a_intent_change(INTENT_GRAB)
next_command = world.time + cooldown_meme
//HARM INTENT
else if((findtext(message, harmintent_words)))
for(var/mob/living/carbon/human/H in listeners)
H.a_intent_change(I_HARM)
H.a_intent_change(INTENT_HARM)
next_command = world.time + cooldown_meme
//THROW/CATCH
+1 -1
View File
@@ -90,7 +90,7 @@
if(target_zone == surgery.location)
initiate(user, target, target_zone, tool, surgery)
return 1//returns 1 so we don't stab the guy in the dick or wherever.
if(isrobot(user) && user.a_intent != I_HARM) //to save asimov borgs a LOT of heartache
if(isrobot(user) && user.a_intent != INTENT_HARM) //to save asimov borgs a LOT of heartache
return 1
return 0