diff --git a/code/__DEFINES/mob.dm b/code/__DEFINES/mob.dm
index c2295b9c5dc..22a4121b75c 100644
--- a/code/__DEFINES/mob.dm
+++ b/code/__DEFINES/mob.dm
@@ -92,10 +92,10 @@
#define APPEARANCE_ALL 32767
// Intents
-#define I_HELP "help"
-#define I_DISARM "disarm"
-#define I_GRAB "grab"
-#define I_HARM "harm"
+#define INTENT_HELP "help"
+#define INTENT_DISARM "disarm"
+#define INTENT_GRAB "grab"
+#define INTENT_HARM "harm"
// AI wire/radio settings
#define AI_CHECK_WIRELESS 1
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 58928da83e0..b4bb8292ca2 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -169,7 +169,7 @@
/mob/proc/RangedAttack(var/atom/A, var/params)
if(!mutations.len)
return
- if((LASER in mutations) && a_intent == I_HARM)
+ if((LASER in mutations) && a_intent == INTENT_HARM)
LaserEyes(A) // moved into a proc below
return
else
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index cf0247e847a..a75fb116b13 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -70,14 +70,14 @@
var/_y = text2num(params2list(params)["icon-y"])
if(_x<=16 && _y<=16)
- usr.a_intent_change(I_HARM)
+ usr.a_intent_change(INTENT_HARM)
else if(_x<=16 && _y>=17)
- usr.a_intent_change(I_HELP)
+ usr.a_intent_change(INTENT_HELP)
else if(_x>=17 && _y<=16)
- usr.a_intent_change(I_GRAB)
+ usr.a_intent_change(INTENT_GRAB)
else if(_x>=17 && _y>=17)
- usr.a_intent_change(I_DISARM)
+ usr.a_intent_change(INTENT_DISARM)
else
usr.a_intent_change("right")
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index ea9de45f295..87b78259593 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -30,7 +30,7 @@
/mob/living/carbon/human/RangedAttack(var/atom/A)
if(!gloves && !mutations.len) return
var/obj/item/clothing/gloves/G = gloves
- if((LASER in mutations) && a_intent == I_HARM)
+ if((LASER in mutations) && a_intent == INTENT_HARM)
LaserEyes(A) // moved into a proc below
else if(istype(G) && G.Touch(A,0)) // for magic gloves
diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm
index 16f8dad4bdb..52b62f6cabf 100644
--- a/code/game/dna/genes/goon_powers.dm
+++ b/code/game/dna/genes/goon_powers.dm
@@ -600,13 +600,13 @@
thoughts = "haunted by their own mortality"
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
to_chat(user, "Mood: You sense benevolent thoughts from [M.name].")
- if(I_DISARM)
+ if(INTENT_DISARM)
to_chat(user, "Mood: You sense cautious thoughts from [M.name].")
- if(I_GRAB)
+ if(INTENT_GRAB)
to_chat(user, "Mood: You sense hostile thoughts from [M.name].")
- if(I_HARM)
+ if(INTENT_HARM)
to_chat(user, "Mood: You sense cruel thoughts from [M.name].")
for(var/mob/living/L in view(7,M))
if(L == M)
diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm
index ea92b93f473..a9975618435 100644
--- a/code/game/gamemodes/miniantags/borer/borer.dm
+++ b/code/game/gamemodes/miniantags/borer/borer.dm
@@ -68,7 +68,7 @@
icon_living = "brainslug"
icon_dead = "brainslug_dead"
speed = 5
- a_intent = I_HARM
+ a_intent = INTENT_HARM
stop_automated_movement = 1
status_flags = CANPUSH
attacktext = "nips"
diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index 39acdabacc5..4825dea6ebb 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -11,7 +11,7 @@
icon_living = "magicOrange"
icon_dead = "magicOrange"
speed = 0
- a_intent = I_HARM
+ a_intent = INTENT_HARM
stop_automated_movement = 1
floating = 1
attack_sound = 'sound/weapons/punch1.ogg'
@@ -218,7 +218,7 @@
//Fire. Low damage, low resistance, sets mobs on fire when bumping
/mob/living/simple_animal/hostile/guardian/fire
- a_intent = I_HELP
+ a_intent = INTENT_HELP
melee_damage_lower = 10
melee_damage_upper = 10
attack_sound = 'sound/items/Welder.ogg'
@@ -340,7 +340,7 @@
//Healer
/mob/living/simple_animal/hostile/guardian/healer
- a_intent = I_HARM
+ a_intent = INTENT_HARM
friendly = "heals"
speed = 0
melee_damage_lower = 15
@@ -362,7 +362,7 @@
icon_state = "seal"
attacktext = "slaps"
speak_emote = list("barks")
- a_intent = I_HARM
+ a_intent = INTENT_HARM
friendly = "heals"
speed = 0
melee_damage_lower = 0
@@ -398,7 +398,7 @@
/mob/living/simple_animal/hostile/guardian/healer/ToggleMode()
if(src.loc == summoner)
if(toggle)
- a_intent = I_HARM
+ a_intent = INTENT_HARM
speed = 0
damage_transfer = 0.7
if(src.adminseal)
@@ -408,7 +408,7 @@
to_chat(src, "You switch to combat mode.")
toggle = FALSE
else
- a_intent = I_HELP
+ a_intent = INTENT_HELP
speed = 1
damage_transfer = 1
if(src.adminseal)
@@ -490,7 +490,7 @@
armour_penetration = 100
/mob/living/simple_animal/hostile/guardian/ranged
- a_intent = I_HELP
+ a_intent = INTENT_HELP
friendly = "quietly assesses"
melee_damage_lower = 10
melee_damage_upper = 10
diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm
index 809fa5ff34d..28ca711946a 100644
--- a/code/game/gamemodes/miniantags/morph/morph.dm
+++ b/code/game/gamemodes/miniantags/morph/morph.dm
@@ -11,7 +11,7 @@
icon_living = "morph"
icon_dead = "morph_dead"
speed = 2
- a_intent = I_HARM
+ a_intent = INTENT_HARM
stop_automated_movement = 1
status_flags = CANPUSH
pass_flags = PASSTABLE
diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
index 19411dee6de..8fbc0563181 100644
--- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm
+++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
@@ -14,7 +14,7 @@
icon_state = "daemon"
icon_living = "daemon"
speed = 1
- a_intent = I_HARM
+ a_intent = INTENT_HARM
stop_automated_movement = 1
status_flags = CANPUSH
attack_sound = 'sound/misc/demon_attack1.ogg'
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index e343135b246..17147954372 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -135,7 +135,7 @@
return
/obj/machinery/computer/attack_alien(mob/living/user)
- if(isalien(user) && user.a_intent == I_HELP)
+ if(isalien(user) && user.a_intent == INTENT_HELP)
var/mob/living/carbon/alien/humanoid/xeno = user
if(xeno.has_fine_manipulation)
return attack_hand(user)
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 7ecf1f17920..bda658ef128 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -112,7 +112,7 @@
add_fingerprint(user)
user.changeNext_move(CLICK_CD_MELEE)
- if(can_force && (!glass || user.a_intent != I_HELP))
+ if(can_force && (!glass || user.a_intent != INTENT_HELP))
user.visible_message("[user] begins forcing \the [src].", \
"You begin forcing \the [src].")
if(do_after(user, force_open_time, target = src))
diff --git a/code/game/machinery/dye_generator.dm b/code/game/machinery/dye_generator.dm
index 02d203797be..1d392d187cf 100644
--- a/code/game/machinery/dye_generator.dm
+++ b/code/game/machinery/dye_generator.dm
@@ -88,7 +88,7 @@
overlays += I
/obj/item/hair_dye_bottle/attack(mob/living/carbon/M as mob, mob/user as mob)
- if(user.a_intent != I_HELP)
+ if(user.a_intent != INTENT_HELP)
..()
return
if(!(M in view(1)))
diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm
index 6b6b1938de9..039e894b86d 100644
--- a/code/game/machinery/programmable_unloader.dm
+++ b/code/game/machinery/programmable_unloader.dm
@@ -501,7 +501,7 @@
to_chat(H, "The boxing machine refuses to acknowledge you unless you face it head on!")
return
var/damage = 0
- if(H.a_intent != I_HARM)
+ if(H.a_intent != INTENT_HARM)
damage += rand(0,5)
else
damage += rand(0,10)
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 81fba15d1e8..4421eba9aae 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -51,7 +51,7 @@
else if(istype(target,/mob/living))
var/mob/living/M = target
if(M.stat == DEAD) return
- if(chassis.occupant.a_intent == I_HARM)
+ if(chassis.occupant.a_intent == INTENT_HARM)
M.take_overall_damage(dam_force)
if(!M)
return
@@ -101,11 +101,11 @@
else if(istype(target,/mob/living))
var/mob/living/M = target
if(M.stat == DEAD) return
- if(chassis.occupant.a_intent == I_HARM)
+ if(chassis.occupant.a_intent == INTENT_HARM)
target.visible_message("[chassis] destroys [target] in an unholy fury.",
"[chassis] destroys [target] in an unholy fury.")
M.gib()
- /*if(chassis.occupant.a_intent == I_DISARM)
+ /*if(chassis.occupant.a_intent == INTENT_DISARM)
target.visible_message("[chassis] rips [target]'s arms off.",
"[chassis] rips [target]'s arms off.")*/
else
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 9eab3e88cee..0fe8bbe069a 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -748,7 +748,7 @@
to_chat(user, "There's not enough wire to finish the task.")
return
- else if(isscrewdriver(W) && user.a_intent != I_HARM)
+ else if(isscrewdriver(W) && user.a_intent != INTENT_HARM)
if(hasInternalDamage(MECHA_INT_TEMP_CONTROL))
clearInternalDamage(MECHA_INT_TEMP_CONTROL)
to_chat(user, "You repair the damaged temperature controller.")
@@ -776,7 +776,7 @@
to_chat(user, "There's already a powercell installed.")
return
- else if(iswelder(W) && user.a_intent != I_HARM)
+ else if(iswelder(W) && user.a_intent != INTENT_HARM)
var/obj/item/weapon/weldingtool/WT = W
if(health[user] lifts [src], allowing passage.", "You lift [src], allowing passage.")
src.density = 0
spawn(200)
@@ -174,7 +174,7 @@ var/list/tape_roll_applications = list()
breaktape(/obj/item/weapon/wirecutters,user)
/obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
- if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user))))
+ if(user.a_intent == INTENT_HELP && ((!can_puncture(W) && src.allowed(user))))
to_chat(user, "You can't break the [src] with that!")
return
user.visible_message("[user] breaks the [src]!", "You break the [src]!")
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 7be57f646c4..ad8a30bed07 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -19,7 +19,7 @@
//So this is a workaround. This also makes more sense from an IC standpoint. ~Carn
if(user.client && (target in user.client.screen))
to_chat(user, "You need to take that [target.name] off before cleaning it.")
- else if(target == user && user.a_intent == I_GRAB && ishuman(target))
+ else if(target == user && user.a_intent == INTENT_GRAB && ishuman(target))
var/mob/living/carbon/human/muncher = user
if(muncher && muncher.get_species() == "Drask")
to_chat(user, "You take a bite of the [src.name]. Delicious!")
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index ee7a6d4764b..8705b86ea3a 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -319,7 +319,7 @@
to_chat(user, "The instructions on [defib] don't mention how to revive that...")
return
else
- if(user.a_intent == I_HARM && !defib.safety)
+ if(user.a_intent == INTENT_HARM && !defib.safety)
busy = 1
H.visible_message("[user] has touched [H.name] with [src]!", \
"[user] has touched [H.name] with [src]!")
@@ -465,7 +465,7 @@
to_chat(user, "This unit is only designed to work on humanoid lifeforms.")
return
else
- if(user.a_intent == I_HARM && !safety)
+ if(user.a_intent == INTENT_HARM && !safety)
busy = 1
H.visible_message("[user] has touched [H.name] with [src]!", \
"[user] has touched [H.name] with [src]!")
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index c3763f4924e..13bc85999e0 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -40,7 +40,7 @@
if(!istype(M))
return ..()
- if(user.a_intent != I_HELP)
+ if(user.a_intent != INTENT_HELP)
if(user.zone_sel.selecting == "head" || user.zone_sel.selecting == "eyes")
if((CLUMSY in user.mutations) && prob(50))
M = user
diff --git a/code/game/objects/items/weapons/scissors.dm b/code/game/objects/items/weapons/scissors.dm
index 8654765d6f3..e5bd30fe609 100644
--- a/code/game/objects/items/weapons/scissors.dm
+++ b/code/game/objects/items/weapons/scissors.dm
@@ -20,7 +20,7 @@
toolspeed = 0.75
/obj/item/weapon/scissors/attack(mob/living/carbon/M as mob, mob/user as mob)
- if(user.a_intent != I_HELP)
+ if(user.a_intent != INTENT_HELP)
..()
return
if(!(M in view(1))) //Adjacency test
@@ -101,7 +101,7 @@
var/is_cutting = 0 //to prevent spam clicking this for huge accumulation of losebreath.
/obj/item/weapon/scissors/safety/attack(mob/living/carbon/M as mob, mob/user as mob)
- if(user.a_intent != I_HELP)
+ if(user.a_intent != INTENT_HELP)
..()
return
if(!(M in view(1)))
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 9a01f150ea9..c4c29a9542f 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -118,7 +118,7 @@
var/mob/living/L = M
- if(user.a_intent != I_HARM)
+ if(user.a_intent != INTENT_HARM)
if(status)
user.do_attack_animation(L)
baton_stun(L, user)
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index e55b2451347..3ce0f32d47a 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -46,7 +46,7 @@
return
if(!isliving(target))
return
- if(user.a_intent == I_HARM)
+ if(user.a_intent == INTENT_HARM)
if(!..()) return
if(!isrobot(target)) return
else
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index 3460699fbe4..8aabce1eb54 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -155,7 +155,7 @@
src.pixel_y = rand(0, 16)
/obj/item/weapon/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user)
- if(!istype(M) || user.a_intent == I_HELP)
+ if(!istype(M) || user.a_intent == INTENT_HELP)
return ..()
if(user.zone_sel.selecting != "eyes" && user.zone_sel.selecting != "head")
return ..()
@@ -404,7 +404,7 @@
if(!S)
return
- if(!(S.status & ORGAN_ROBOT) || user.a_intent != I_HELP || S.open == 2)
+ if(!(S.status & ORGAN_ROBOT) || user.a_intent != INTENT_HELP || S.open == 2)
return ..()
if(!isOn()) //why wasn't this being checked already?
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 72638ff0943..9d343d0cbed 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -259,7 +259,7 @@ var/global/list/captain_display_cases = list()
if(W.flags & ABSTRACT)
to_chat(user, "You can't put this into the case.")
return
- if(user.a_intent == I_HARM)
+ if(user.a_intent == INTENT_HARM)
if(locked && !destroyed)
src.health -= W.force
src.healthcheck()
@@ -283,14 +283,14 @@ var/global/list/captain_display_cases = list()
update_icon()
/obj/structure/displaycase/attack_hand(mob/user as mob)
- if(destroyed || (!locked && user.a_intent == I_HARM))
+ if(destroyed || (!locked && user.a_intent == INTENT_HARM))
if(occupant)
dump()
to_chat(user, "You smash your fist into the delicate electronics at the bottom of the case, and deactivate the hover field.")
src.add_fingerprint(user)
update_icon()
else
- if(user.a_intent == I_HARM)
+ if(user.a_intent == INTENT_HARM)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
user.visible_message("[user.name] kicks \the [src]!", \
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 43d08cccee9..b53ca70f9da 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -136,7 +136,7 @@
if(do_after(user, digTool.digspeed * hardness, target = src) && src)
to_chat(user, "You finished digging.")
deconstruct(TRUE)
- else if(user.a_intent != I_HARM)
+ else if(user.a_intent != INTENT_HARM)
attack_hand(user)
else
attacked_by(W, user)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 9da30e5fe82..126dd6e3a38 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -133,7 +133,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
user.visible_message("[user] smashes through [src]!")
destroy()
- else if(user.a_intent == I_HARM)
+ else if(user.a_intent == INTENT_HARM)
user.changeNext_move(CLICK_CD_MELEE)
playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
user.visible_message("[user.name] bangs against the [src.name]!", \
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index ee5022a1793..da2eb1ba8fb 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -82,7 +82,7 @@
return FALSE
if(cell)
var/mob/living/carbon/human/H = loc
- if(H.a_intent == I_HARM)
+ if(H.a_intent == INTENT_HARM)
var/mob/living/carbon/C = A
if(cell.use(stun_cost))
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
index 4c53d9c3c8d..69098f54138 100644
--- a/code/modules/clothing/under/accessories/holster.dm
+++ b/code/modules/clothing/under/accessories/holster.dm
@@ -60,7 +60,7 @@
if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj))
to_chat(user, "You need an empty hand to draw the [holstered]!")
else
- if(user.a_intent == I_HARM)
+ if(user.a_intent == INTENT_HARM)
usr.visible_message("[user] draws the [holstered], ready to shoot!", \
"You draw the [holstered], ready to shoot!")
else
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index bd96b480be8..d770ea920e1 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -30,7 +30,7 @@
usesound = 'sound/items/Welder2.ogg'
/obj/item/device/fluff/tattoo_gun/attack(mob/living/carbon/M as mob, mob/user as mob)
- if(user.a_intent == I_HARM)
+ if(user.a_intent == INTENT_HARM)
user.visible_message("[user] stabs [M] with the [src]!", "You stab [M] with the [src]!")
to_chat(M, "[user] stabs you with the [src]!
You feel a tiny prick!")
return
diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm
index 45967dc8ac7..85ec9f292c4 100644
--- a/code/modules/fish/fishtank.dm
+++ b/code/modules/fish/fishtank.dm
@@ -513,7 +513,7 @@
/obj/machinery/fishtank/attack_animal(mob/living/simple_animal/M as mob)
if(istype(M, /mob/living/simple_animal/pet/cat))
- if(M.a_intent == I_HELP) //Cats can try to fish in open tanks on help intent
+ if(M.a_intent == INTENT_HELP) //Cats can try to fish in open tanks on help intent
if(lid_switch) //Can't fish in a closed tank. Fishbowls are ALWAYS open.
M.visible_message("[M.name] stares at into \the [src] while sitting perfectly still.", "The lid is closed, so you stare into \the [src] intently.")
else
@@ -535,7 +535,7 @@
else
attack_generic(M, M.harm_intent_damage)
else if(istype(M, /mob/living/simple_animal/hostile/bear))
- if(M.a_intent == I_HELP) //Bears can try to fish in open tanks on help intent
+ if(M.a_intent == INTENT_HELP) //Bears can try to fish in open tanks on help intent
if(lid_switch) //Can't fish in a closed tank. Fishbowls are ALWAYS open.
M.visible_message("[M.name] scrapes it's claws along \the [src]'s lid.", "The lid is closed, so you scrape your claws against \the [src]'s lid.")
else
@@ -555,7 +555,7 @@
else
if(M.melee_damage_upper > 0) //If the simple_animal has a melee_damage_upper defined, use that for the damage
attack_generic(M, M.melee_damage_upper)
- else if(M.a_intent == I_HARM) //Let any simple_animal try to break tanks when on harm intent
+ else if(M.a_intent == INTENT_HARM) //Let any simple_animal try to break tanks when on harm intent
if(M.harm_intent_damage <= 0) return //If it doesn't do damage, don't bother with the attack
attack_generic(M, M.harm_intent_damage)
check_health()
@@ -575,7 +575,7 @@
user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!"))
user.visible_message("[user] smashes through [src]!")
destroy()
- else if(usr.a_intent == I_HARM)
+ else if(usr.a_intent == INTENT_HARM)
user.changeNext_move(CLICK_CD_MELEE)
playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
usr.visible_message("[usr.name] bangs against the [src.name]!", \
@@ -611,7 +611,7 @@
//Welders repair damaged tanks on help intent, damage on all others
if(istype(O, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = O
- if(user.a_intent == I_HELP)
+ if(user.a_intent == INTENT_HELP)
if(W.isOn())
if(cur_health < max_health)
playsound(loc, W.usesound, 50, 1)
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index e1a517caaf3..011a4ffacde 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -47,7 +47,7 @@
if(!target)
return
- if(user.a_intent != I_HARM || !isGlass)
+ if(user.a_intent != INTENT_HARM || !isGlass)
return ..()
force = 15 //Smashing bottles over someoen's head hurts.
diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm
index 796b6af37f9..267b80aed20 100644
--- a/code/modules/food_and_drinks/drinks/drinks/cans.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm
@@ -32,7 +32,7 @@
if(canopened == 0)
to_chat(user, "You need to open the drink!")
return
- else if(M == user && !reagents.total_volume && user.a_intent == I_HARM && user.zone_sel.selecting == "head")
+ else if(M == user && !reagents.total_volume && user.a_intent == INTENT_HARM && user.zone_sel.selecting == "head")
user.visible_message("[user] crushes ["\the [src]"] on \his forehead!", "You crush \the [src] on your forehead.")
crush(user)
return
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index deac3c6660d..b9bb541f77a 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -68,7 +68,7 @@
return
/obj/machinery/biogenerator/attackby(obj/item/O, mob/user, params)
- if(user.a_intent == I_HARM)
+ if(user.a_intent == INTENT_HARM)
return ..()
if(processing)
diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm
index 7f2c3587349..f5137d5743b 100644
--- a/code/modules/hydroponics/seed_extractor.dm
+++ b/code/modules/hydroponics/seed_extractor.dm
@@ -102,7 +102,7 @@
to_chat(user, "You add [O] to [name].")
updateUsrDialog()
return
- else if(user.a_intent != I_HARM)
+ else if(user.a_intent != INTENT_HARM)
to_chat(user, "You can't extract any seeds from \the [O.name]!")
else
return ..()
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 56fb71b20aa..1730ed13801 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -207,7 +207,7 @@
to_chat(user, "It would be dishonorable to attack a foe while they cannot retaliate.")
return
switch(user.a_intent)
- if(I_DISARM)
+ if(INTENT_DISARM)
if(!wielded)
return ..()
if(!ishuman(target))
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index 575fbf3b5b6..a1e7e775e23 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -11,7 +11,7 @@
status_flags = CANSTUN|CANWEAKEN|CANPUSH
mouse_opacity = 1
faction = list("neutral")
- a_intent = I_HARM
+ a_intent = INTENT_HARM
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
wander = 0
@@ -93,7 +93,7 @@
return
/mob/living/simple_animal/hostile/mining_drone/attack_hand(mob/living/carbon/human/M)
- if(M.a_intent == I_HELP)
+ if(M.a_intent == INTENT_HELP)
toggle_mode()
switch(mode)
if(MINEDRONE_COLLECT)
diff --git a/code/modules/mob/living/carbon/alien/alien_defenses.dm b/code/modules/mob/living/carbon/alien/alien_defenses.dm
index 65e32e2fae9..fef2e469848 100644
--- a/code/modules/mob/living/carbon/alien/alien_defenses.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defenses.dm
@@ -15,7 +15,7 @@ In all, this is a lot like the monkey code. /N
return
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
AdjustSleeping(-5)
resting = 0
AdjustParalysis(-3)
@@ -23,7 +23,7 @@ In all, this is a lot like the monkey code. /N
AdjustWeakened(-3)
visible_message("[M.name] nuzzles [src] trying to wake it up!")
- if(I_GRAB)
+ if(INTENT_GRAB)
grabbedby(M)
return 1
@@ -50,11 +50,11 @@ In all, this is a lot like the monkey code. /N
return 0 //this is horrible but 100% necessary
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
help_shake_act(M)
- if(I_GRAB)
+ if(INTENT_GRAB)
grabbedby(M)
- if(I_HARM, I_DISARM)
+ if(INTENT_HARM, INTENT_DISARM)
return 1
return 0
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index fff315c90e3..d37d83e8215 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -160,13 +160,13 @@
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
help_shake_act(M)
- if(I_GRAB)
+ if(INTENT_GRAB)
grabbedby(M)
- if(I_HARM)
+ if(INTENT_HARM)
M.do_attack_animation(src)
var/damage = rand(1, 9)
if(prob(90))
@@ -191,7 +191,7 @@
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message("[M] has attempted to punch [src]!")
- if(I_DISARM)
+ if(INTENT_DISARM)
if(!lying)
if(prob(5))//Very small chance to push an alien down.
Paralyse(2)
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index df00e862b38..305f8ad45a9 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -127,10 +127,10 @@
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
help_shake_act(M)
- if(I_GRAB)
+ if(INTENT_GRAB)
grabbedby(M)
else
diff --git a/code/modules/mob/living/carbon/carbon_defenses.dm b/code/modules/mob/living/carbon/carbon_defenses.dm
index 64268a35f83..c5c1e4917e4 100644
--- a/code/modules/mob/living/carbon/carbon_defenses.dm
+++ b/code/modules/mob/living/carbon/carbon_defenses.dm
@@ -20,7 +20,7 @@
/mob/living/carbon/attackby(obj/item/I, mob/user, params)
if(lying)
if(surgeries.len)
- if(user != src && user.a_intent == I_HELP)
+ if(user != src && user.a_intent == INTENT_HELP)
for(var/datum/surgery/S in surgeries)
if(S.next_step(user, src))
return 1
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 000a7a52bd0..cd86b4dbc12 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -335,7 +335,7 @@
/mob/living/carbon/human/attack_larva(mob/living/carbon/alien/larva/L as mob)
switch(L.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
visible_message("[L] rubs its head against [src].")
diff --git a/code/modules/mob/living/carbon/human/human_attackalien.dm b/code/modules/mob/living/carbon/human/human_attackalien.dm
index 015c73455ba..7c4039789a9 100644
--- a/code/modules/mob/living/carbon/human/human_attackalien.dm
+++ b/code/modules/mob/living/carbon/human/human_attackalien.dm
@@ -4,13 +4,13 @@
return 0
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
visible_message("[M] caresses [src] with its scythe like arm.")
- if(I_GRAB)
+ if(INTENT_GRAB)
grabbedby(M)
- if(I_HARM)
+ if(INTENT_HARM)
M.do_attack_animation(src)
if(w_uniform)
w_uniform.add_fingerprint(M)
@@ -33,7 +33,7 @@
apply_effect(4, WEAKEN, armor_block)
updatehealth()
- if(I_DISARM)
+ if(INTENT_DISARM)
M.do_attack_animation(src)
if(prob(80))
var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_sel.selecting))
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 2e0fa4803d6..59c8f3efa63 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -18,7 +18,7 @@
..()
- if((M != src) && M.a_intent != I_HELP && check_shields(0, M.name, attack_type = UNARMED_ATTACK))
+ if((M != src) && M.a_intent != INTENT_HELP && check_shields(0, M.name, attack_type = UNARMED_ATTACK))
add_logs(M, src, "attempted to touch")
visible_message("[M] attempted to touch [src]!")
return 0
@@ -53,7 +53,7 @@
species.handle_attack_hand(src,M)
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
if(attacker_style && attacker_style.help_act(H, src))//adminfu only...
return 1
if(can_operate(src))
@@ -99,14 +99,14 @@
else
to_chat(M, "You need to stay still while performing CPR!")
- if(I_GRAB)
+ if(INTENT_GRAB)
if(attacker_style && attacker_style.grab_act(H, src))
return 1
else
src.grabbedby(M)
return 1
- if(I_HARM)
+ if(INTENT_HARM)
//Vampire code
if(M.mind && M.mind.vampire && (M.mind in ticker.mode.vampires) && !M.mind.vampire.draining && M.zone_sel && M.zone_sel.selecting == "head" && src != M)
if(species && species.flags & NO_BLOOD)//why this hell were we never checkinf for this?
@@ -168,7 +168,7 @@
forcesay(hit_appends)
- if(I_DISARM)
+ if(INTENT_DISARM)
if(attacker_style && attacker_style.disarm_act(H, src))
return 1
else
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 585ac587ffc..bbe57fa66f9 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -191,7 +191,7 @@ emp_act
/mob/living/carbon/human/proc/attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone)
if(!I || !user) return 0
- if((istype(I, /obj/item/weapon/kitchen/knife/butcher/meatcleaver) || istype(I, /obj/item/weapon/twohanded/chainsaw)) && src.stat == DEAD && user.a_intent == I_HARM)
+ if((istype(I, /obj/item/weapon/kitchen/knife/butcher/meatcleaver) || istype(I, /obj/item/weapon/twohanded/chainsaw)) && src.stat == DEAD && user.a_intent == INTENT_HARM)
var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/weapon/reagent_containers/food/snacks/meat/human(get_turf(src.loc))
newmeat.name = src.real_name + newmeat.name
newmeat.subjectname = src.real_name
@@ -378,7 +378,7 @@ emp_act
if(penetrated_dam) SS.create_breaches(damtype, penetrated_dam)
/mob/living/carbon/human/mech_melee_attack(obj/mecha/M)
- if(M.occupant.a_intent == I_HARM)
+ if(M.occupant.a_intent == INTENT_HARM)
if(M.damtype == "brute")
step_away(src,M,15)
var/obj/item/organ/external/affecting = get_organ(pick("chest", "chest", "chest", "head"))
diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm
index d4127409ce1..eb7b767dc94 100644
--- a/code/modules/mob/living/carbon/human/interactive/functions.dm
+++ b/code/modules/mob/living/carbon/human/interactive/functions.dm
@@ -638,7 +638,7 @@
if(canmove)
if((graytide || (TRAITS & TRAIT_MEAN)) || retal)
interest += targetInterestShift
- a_intent = I_HARM
+ a_intent = INTENT_HARM
zone_sel.selecting = pick("chest","r_leg","l_leg","r_arm","l_arm","head")
doing |= SNPC_FIGHTING
if(retal)
@@ -746,7 +746,7 @@
tryWalk(TARGET)
else
if(Adjacent(TARGET))
- a_intent = pick(I_DISARM, I_HARM)
+ a_intent = pick(INTENT_DISARM, INTENT_HARM)
M.attack_hand(src)
timeout++
else if(timeout >= 10 || !(targetRange(M) > 14))
diff --git a/code/modules/mob/living/carbon/human/interactive/interactive.dm b/code/modules/mob/living/carbon/human/interactive/interactive.dm
index 59350e03961..00b8e0a4544 100644
--- a/code/modules/mob/living/carbon/human/interactive/interactive.dm
+++ b/code/modules/mob/living/carbon/human/interactive/interactive.dm
@@ -431,7 +431,7 @@
var/mob/living/M = target
if(istype(M))
if(health > 0)
- if(M.a_intent == I_HELP && !incapacitated())
+ if(M.a_intent == INTENT_HELP && !incapacitated())
chatter()
if(istype(target, /mob/living/carbon) && !retal && prob(SNPC_FUZZY_CHANCE_LOW))
var/mob/living/carbon/C = target
@@ -439,7 +439,7 @@
tryWalk(target)
else
C.help_shake_act(src)
- if(M.a_intent == I_HARM)
+ if(M.a_intent == INTENT_HARM)
retal = 1
retal_target = target
@@ -658,7 +658,7 @@
if(grabbed_by.len > 0)
for(var/obj/item/weapon/grab/G in grabbed_by)
if(Adjacent(G))
- a_intent = I_DISARM
+ a_intent = INTENT_DISARM
G.assailant.attack_hand(src)
inactivity_period = 10
diff --git a/code/modules/mob/living/carbon/human/species/apollo.dm b/code/modules/mob/living/carbon/human/species/apollo.dm
index 4fcedc1844a..7fee37a17c2 100644
--- a/code/modules/mob/living/carbon/human/species/apollo.dm
+++ b/code/modules/mob/living/carbon/human/species/apollo.dm
@@ -58,7 +58,7 @@
/datum/species/wryn/handle_attack_hand(var/mob/living/carbon/human/H, var/mob/living/carbon/human/M)
var/obj/item/organ/external/head/head_organ = H.get_organ("head")
- if(M.a_intent == I_HARM)
+ if(M.a_intent == INTENT_HARM)
if(H.handcuffed)
if(!H.get_int_organ(/obj/item/organ/internal/wryn/hivenode)) return
var/turf/p_loc = M.loc
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index 85fed33c156..94ae7482437 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -241,7 +241,7 @@
switch(L.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
visible_message("[L] rubs its head against [src].")
@@ -322,7 +322,7 @@
return
else
if(stat == DEAD && surgeries.len)
- if(M.a_intent == I_HELP)
+ if(M.a_intent == INTENT_HELP)
for(var/datum/surgery/S in surgeries)
if(S.next_step(M, src))
return 1
@@ -343,10 +343,10 @@
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
help_shake_act(M)
- if(I_GRAB)
+ if(INTENT_GRAB)
grabbedby(M)
else
@@ -393,10 +393,10 @@
return
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
visible_message("[M] caresses [src] with its scythe like arm.")
- if(I_HARM)
+ if(INTENT_HARM)
M.do_attack_animation(src)
if(prob(95))
attacked += 10
@@ -416,10 +416,10 @@
visible_message("[M] has attempted to lunge at [name]!", \
"[M] has attempted to lunge at [name]!")
- if(I_GRAB)
+ if(INTENT_GRAB)
grabbedby(M)
- if(I_DISARM)
+ if(INTENT_DISARM)
M.do_attack_animation(src)
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
var/damage = 5
@@ -460,7 +460,7 @@
/mob/living/carbon/slime/attackby(obj/item/W, mob/user, params)
if(stat == DEAD && surgeries.len)
- if(user.a_intent == I_HELP)
+ if(user.a_intent == INTENT_HELP)
for(var/datum/surgery/S in surgeries)
if(S.next_step(user, src))
return 1
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 06b6440f756..b120552d160 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -60,10 +60,10 @@
if(!M.buckled && !M.has_buckled_mobs())
var/mob_swap
//the puller can always swap with it's victim if on grab intent
- if(M.pulledby == src && a_intent == I_GRAB)
+ if(M.pulledby == src && a_intent == INTENT_GRAB)
mob_swap = 1
//restrained people act if they were on 'help' intent to prevent a person being pulled from being seperated from their puller
- else if((M.restrained() || M.a_intent == I_HELP) && (restrained() || a_intent == I_HELP))
+ else if((M.restrained() || M.a_intent == INTENT_HELP) && (restrained() || a_intent == INTENT_HELP))
mob_swap = 1
if(mob_swap)
//switch our position with M
@@ -176,7 +176,7 @@
return 0
var/obj/item/hand_item = get_active_hand()
if(istype(hand_item, /obj/item/weapon/gun) && A != hand_item)
- if(a_intent == I_HELP || !ismob(A))
+ if(a_intent == INTENT_HELP || !ismob(A))
visible_message("[src] points to [A] with [hand_item]")
return 1
A.visible_message("[src] points [hand_item] at [A]!",
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 3aec754eabb..548f1fb357b 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -108,7 +108,7 @@
/mob/living/mech_melee_attack(obj/mecha/M)
- if(M.occupant.a_intent == I_HARM)
+ if(M.occupant.a_intent == INTENT_HARM)
if(M.damtype == "brute")
step_away(src,M,15)
switch(M.damtype)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 06021939ac9..84f731d3669 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -677,7 +677,7 @@ var/list/ai_verbs_default = list(
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
visible_message("[M] caresses [src]'s plating with its scythe like arm.")
else //harm
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 3f1799c7c9f..3637b0e10b1 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -246,7 +246,7 @@
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
for(var/mob/O in viewers(src, null))
if((O.client && !( O.blinded )))
O.show_message(text("[M] caresses [src]'s casing with its scythe like arm."), 1)
@@ -508,7 +508,7 @@
/mob/living/silicon/pai/attack_hand(mob/user as mob)
if(stat == DEAD)
return
- if(user.a_intent == I_HELP)
+ if(user.a_intent == INTENT_HELP)
user.visible_message("[user] pets [src].")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
else
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
index f9c711b4b17..ba4c616b2f3 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
@@ -44,7 +44,7 @@
//Actual picking-up event.
/mob/living/silicon/robot/drone/attack_hand(mob/living/carbon/human/M as mob)
- if(M.a_intent == I_HELP)
+ if(M.a_intent == INTENT_HELP)
get_scooped(M)
..()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 9d93d0baa77..1f4430c3aea 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -575,7 +575,7 @@ var/list/robot_verbs_default = list(
return
- if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent == I_HELP)
+ if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent == INTENT_HELP)
if(W == module_active)
return
if(!getBruteLoss())
@@ -594,7 +594,7 @@ var/list/robot_verbs_default = list(
return
- else if(istype(W, /obj/item/stack/cable_coil) && user.a_intent == I_HELP && (wiresexposed || istype(src,/mob/living/silicon/robot/drone)))
+ else if(istype(W, /obj/item/stack/cable_coil) && user.a_intent == INTENT_HELP && (wiresexposed || istype(src,/mob/living/silicon/robot/drone)))
if(!getFireLoss())
to_chat(user, "Nothing to fix!")
return
@@ -818,15 +818,15 @@ var/list/robot_verbs_default = list(
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
for(var/mob/O in viewers(src, null))
if((O.client && !( O.blinded )))
O.show_message(text("[M] caresses [src]'s plating with its scythe like arm."), 1)
- if(I_GRAB)
+ if(INTENT_GRAB)
grabbedby(M)
- if(I_HARM)
+ if(INTENT_HARM)
M.do_attack_animation(src)
var/damage = rand(10, 20)
if(prob(90))
@@ -842,7 +842,7 @@ var/list/robot_verbs_default = list(
visible_message("[M] took a swipe at [src]!", \
"[M] took a swipe at [src]!")
- if(I_DISARM)
+ if(INTENT_DISARM)
if(!(lying))
M.do_attack_animation(src)
if(prob(85))
@@ -923,7 +923,7 @@ var/list/robot_verbs_default = list(
diag_hud_set_borgcell()
if(!opened && (!istype(user, /mob/living/silicon)))
- if(user.a_intent == I_HELP)
+ if(user.a_intent == INTENT_HELP)
user.visible_message("[user] pets [src]!", \
"You pet [src]!")
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 02a6c3aa88f..899608d0f1a 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -256,7 +256,7 @@
new /obj/effect/decal/cleanable/blood/oil(loc)
/mob/living/simple_animal/bot/attack_hand(mob/living/carbon/human/H)
- if(H.a_intent == I_HELP)
+ if(H.a_intent == INTENT_HELP)
interact(H)
else
return ..()
@@ -329,7 +329,7 @@
ejectpai(user)
else
user.changeNext_move(CLICK_CD_MELEE)
- if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM)
+ if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != INTENT_HARM)
if(health >= maxHealth)
to_chat(user, "[src] does not need a repair!")
return
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 12b69a249b7..37699e820f2 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -161,13 +161,13 @@ Auto Patrol[]"},
mode = BOT_HUNT
/mob/living/simple_animal/bot/ed209/attack_hand(mob/living/carbon/human/H)
- if(H.a_intent == I_HARM)
+ if(H.a_intent == INTENT_HARM)
retaliate(H)
return ..()
/mob/living/simple_animal/bot/ed209/attackby(obj/item/weapon/W, mob/user, params)
..()
- if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM) // Any intent but harm will heal, so we shouldn't get angry.
+ if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != INTENT_HARM) // Any intent but harm will heal, so we shouldn't get angry.
return
if(!istype(W, /obj/item/weapon/screwdriver) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass.
if(W.force && W.damtype != STAMINA)//If force is non-zero and damage type isn't stamina.
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index e2f643d46e1..9f8725067b0 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -18,7 +18,7 @@
health = 50
maxHealth = 50
damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
- a_intent = I_HARM //No swapping
+ a_intent = INTENT_HARM //No swapping
buckle_lying = 0
mob_size = MOB_SIZE_LARGE
radio_channel = "Supply"
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index f1614e54816..46a8ec12f76 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -173,13 +173,13 @@ Auto Patrol: []"},
mode = BOT_HUNT
/mob/living/simple_animal/bot/secbot/attack_hand(mob/living/carbon/human/H)
- if(H.a_intent == I_HARM)
+ if(H.a_intent == INTENT_HARM)
retaliate(H)
return ..()
/mob/living/simple_animal/bot/secbot/attackby(obj/item/weapon/W, mob/user, params)
..()
- if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM) // Any intent but harm will heal, so we shouldn't get angry.
+ if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != INTENT_HARM) // Any intent but harm will heal, so we shouldn't get angry.
return
if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!target) && (W.damtype != STAMINA) ) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass.
retaliate(user)
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 54cf810a081..3daacefb108 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -10,7 +10,7 @@
response_harm = "punches"
icon_dead = "shade_dead"
speed = 0
- a_intent = I_HARM
+ a_intent = INTENT_HARM
stop_automated_movement = 1
status_flags = CANPUSH
attack_sound = 'sound/weapons/punch1.ogg'
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 97702a28027..bf4ac4a1664 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -557,8 +557,8 @@
/mob/living/simple_animal/pet/corgi/attack_hand(mob/living/carbon/human/M)
. = ..()
switch(M.a_intent)
- if(I_HELP) wuv(1,M)
- if(I_HARM) wuv(-1,M)
+ if(INTENT_HELP) wuv(1,M)
+ if(INTENT_HARM) wuv(-1,M)
/mob/living/simple_animal/pet/corgi/proc/wuv(change, mob/M)
if(change)
diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm
index e6e9d2f93f1..6bec35b98db 100644
--- a/code/modules/mob/living/simple_animal/friendly/diona.dm
+++ b/code/modules/mob/living/simple_animal/friendly/diona.dm
@@ -51,7 +51,7 @@
/mob/living/simple_animal/diona/attack_hand(mob/living/carbon/human/M)
//Let people pick the little buggers up.
- if(M.a_intent == I_HELP)
+ if(M.a_intent == INTENT_HELP)
if(M.species && M.species.name == "Diona")
to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.")
to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.")
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 840c988dc98..4f3d4588378 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -136,7 +136,7 @@
milk_content = min(50, milk_content+rand(5, 10))
/mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M as mob)
- if(!stat && M.a_intent == I_DISARM && icon_state != icon_dead)
+ if(!stat && M.a_intent == INTENT_DISARM && icon_state != icon_dead)
M.visible_message("[M] tips over [src].","You tip over [src].")
Weaken(30)
icon_state = icon_dead
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index fdcf39dd51b..17740441153 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -77,7 +77,7 @@
client.time_died_as_mouse = world.time
/mob/living/simple_animal/mouse/attack_hand(mob/living/carbon/human/M as mob)
- if(M.a_intent == I_HELP)
+ if(M.a_intent == INTENT_HELP)
get_scooped(M)
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index 1f1ab0d0431..88db29b88a7 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -18,7 +18,7 @@
melee_damage_upper = 25
attacktext = "slashes"
speak_emote = list("hisses")
- a_intent = I_HARM
+ a_intent = INTENT_HARM
attack_sound = 'sound/weapons/bladeslice.ogg'
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
@@ -141,7 +141,7 @@
name = "lusty xenomorph maid"
melee_damage_lower = 0
melee_damage_upper = 0
- a_intent = I_HELP
+ a_intent = INTENT_HELP
friendly = "caresses"
environment_smash = 0
icon_state = "maid"
diff --git a/code/modules/mob/living/simple_animal/hostile/illusion.dm b/code/modules/mob/living/simple_animal/hostile/illusion.dm
index f08f5479a2a..746c1789e16 100644
--- a/code/modules/mob/living/simple_animal/hostile/illusion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/illusion.dm
@@ -7,7 +7,7 @@
icon_dead = "null"
melee_damage_lower = 5
melee_damage_upper = 5
- a_intent = I_HARM
+ a_intent = INTENT_HARM
attacktext = "gores"
maxHealth = 100
health = 100
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 7d5e157e068..dba3121f3a7 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -5,7 +5,7 @@
desc = "Attack the weak point for massive damage."
health = 1000
maxHealth = 1000
- a_intent = I_HARM
+ a_intent = INTENT_HARM
sentience_type = SENTIENCE_BOSS
environment_smash = 3
luminosity = 3
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm
index 3e6d98afd95..bd9c532bb45 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm
@@ -19,7 +19,7 @@
melee_damage_upper = 0
attacktext = "barrels into"
attack_sound = 'sound/weapons/punch1.ogg'
- a_intent = I_HELP
+ a_intent = INTENT_HELP
speak_emote = list("screeches")
throw_message = "sinks in slowly, before being pushed out of "
status_flags = CANPUSH
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 3298e334bd2..184f7b3ced3 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -11,7 +11,7 @@
response_disarm = "shoves"
response_harm = "strikes"
status_flags = 0
- a_intent = I_HARM
+ a_intent = INTENT_HARM
var/throw_message = "bounces off of"
var/icon_aggro = null // for swapping to when we get aggressive
see_in_dark = 8
@@ -68,7 +68,7 @@
melee_damage_lower = 12
melee_damage_upper = 12
attacktext = "bites into"
- a_intent = I_HARM
+ a_intent = INTENT_HARM
speak_emote = list("chitters")
attack_sound = 'sound/weapons/bladeslice.ogg'
aggro_vision_range = 9
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index d7984031052..25311673076 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -138,7 +138,7 @@
/mob/living/simple_animal/hostile/mushroom/attack_hand(mob/living/carbon/human/M as mob)
..()
- if(M.a_intent == I_HARM)
+ if(M.a_intent == INTENT_HARM)
Bruise()
/mob/living/simple_animal/hostile/mushroom/hitby(atom/movable/AM)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index cce4b32235c..c2ba962e2e0 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -13,7 +13,7 @@
speak = list("HONK", "Honk!", "Welcome to clown planet!")
emote_see = list("honks")
speak_chance = 1
- a_intent = I_HARM
+ a_intent = INTENT_HARM
maxHealth = 75
health = 75
speed = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
index df5b53f5368..d4a88b49e60 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
@@ -15,7 +15,7 @@
response_harm = "hits the"
speak = list("ALERT.","Hostile-ile-ile entities dee-twhoooo-wected.","Threat parameterszzzz- szzet.","Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.")
emote_see = list("beeps menacingly","whirrs threateningly","scans its immediate vicinity")
- a_intent = I_HARM
+ a_intent = INTENT_HARM
stop_automated_movement_when_pulled = 0
health = 300
maxHealth = 300
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
index 30bdb8c95e2..2f639d9e6f7 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -18,7 +18,7 @@
melee_damage_upper = 15
attacktext = "punches"
attack_sound = 'sound/weapons/punch1.ogg'
- a_intent = I_HARM
+ a_intent = INTENT_HARM
unsuitable_atmos_damage = 15
faction = list("russian")
status_flags = CANPUSH
diff --git a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
index b1393e84ef9..27bd2f3ee1c 100644
--- a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
+++ b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
@@ -28,7 +28,7 @@
maxbodytemp = 350
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- a_intent = I_HARM //so they don't get pushed around
+ a_intent = INTENT_HARM //so they don't get pushed around
environment_smash = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index 168ed2d441c..6ddb86fd818 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -8,7 +8,7 @@
icon_living = "angel"
icon_dead = "angel"
gender = NEUTER
- a_intent = I_HARM
+ a_intent = INTENT_HARM
response_help = "touches"
response_disarm = "pushes"
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 805059f25f7..469631951aa 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -18,7 +18,7 @@
melee_damage_upper = 10
attacktext = "punches"
attack_sound = 'sound/weapons/punch1.ogg'
- a_intent = I_HARM
+ a_intent = INTENT_HARM
unsuitable_atmos_damage = 15
faction = list("syndicate")
check_friendly_fire = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
index b4ac6212220..f27891f5965 100644
--- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
@@ -56,7 +56,7 @@
harm_intent_damage = 5
melee_damage_lower = 25
melee_damage_upper = 25
- a_intent = I_HARM
+ a_intent = INTENT_HARM
attack_sound = 'sound/weapons/bladeslice.ogg'
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 0
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 1aa6c82b4a8..5e4057c66df 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -304,12 +304,12 @@
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
if(health > 0)
visible_message(" [M] [response_help] [src].")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- if(I_GRAB)
+ if(INTENT_GRAB)
if(M == src || anchored)
return
if(!(status_flags & CANPUSH))
@@ -326,7 +326,7 @@
visible_message("[M] has grabbed [src] passively!")
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- if(I_HARM, I_DISARM)
+ if(INTENT_HARM, INTENT_DISARM)
M.do_attack_animation(src)
visible_message("[M] [response_harm] [src]!")
playsound(loc, "punch", 25, 1, -1)
@@ -338,13 +338,13 @@
switch(M.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
visible_message("[M] caresses [src] with its scythe like arm.")
- if(I_GRAB)
+ if(INTENT_GRAB)
grabbedby(M)
- if(I_HARM, I_DISARM)
+ if(INTENT_HARM, INTENT_DISARM)
M.do_attack_animation(src)
var/damage = rand(15, 30)
visible_message("[M] has slashed at [src]!", \
@@ -357,7 +357,7 @@
/mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L as mob)
switch(L.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
visible_message("[L] rubs its head against [src].")
diff --git a/code/modules/mob/living/simple_animal/spawner.dm b/code/modules/mob/living/simple_animal/spawner.dm
index ac3f0ef44ca..22b5fb705a9 100644
--- a/code/modules/mob/living/simple_animal/spawner.dm
+++ b/code/modules/mob/living/simple_animal/spawner.dm
@@ -12,7 +12,7 @@
status_flags = 0
anchored = 1
AIStatus = AI_OFF
- a_intent = I_HARM
+ a_intent = INTENT_HARM
stop_automated_movement = 1
wander = 0
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 2988363ffb9..49b43136563 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -75,7 +75,7 @@
var/overeatduration = 0 // How long this guy is overeating //Carbon
var/intent = null//Living
var/shakecamera = 0
- var/a_intent = I_HELP//Living
+ var/a_intent = INTENT_HELP//Living
var/m_intent = "run"//Living
var/lastKnownIP = null
var/atom/movable/buckled = null//Living
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index fffd02adf0a..ecc987530ab 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -316,7 +316,7 @@
var/mob/living/carbon/human/affected = affecting
var/mob/living/carbon/human/attacker = assailant
switch(assailant.a_intent)
- if(I_HELP)
+ if(INTENT_HELP)
/*if(force_down)
to_chat(assailant, "You no longer pin [affecting] to the ground.")
force_down = 0
@@ -324,10 +324,10 @@
//This specific example would allow you to stop pinning people to the floor without moving away from them.
return
- if(I_GRAB)
+ if(INTENT_GRAB)
return
- if(I_HARM) //This checks that the user is on harm intent.
+ if(INTENT_HARM) //This checks that the user is on harm intent.
if(last_hit_zone == "head") //This checks the hitzone the user has selected. In this specific case, they have the head selected.
if(affecting.lying)
return
@@ -368,7 +368,7 @@
//This specific example would allow you to squish people's eyes with a GRAB_NECK.
- if(I_DISARM) //This checks that the user is on disarm intent.
+ if(INTENT_DISARM) //This checks that the user is on disarm intent.
/* if(state < GRAB_AGGRESSIVE)
to_chat(assailant, "You require a better grab to do this.")
return
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 6c443b4aa30..e1a1bdc1d8b 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -319,20 +319,20 @@ proc/muffledspeech(phrase)
return 0
//converts intent-strings into numbers and back
-var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
+var/list/intents = list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM)
/proc/intent_numeric(argument)
if(istext(argument))
switch(argument)
- if(I_HELP) return 0
- if(I_DISARM) return 1
- if(I_GRAB) return 2
+ if(INTENT_HELP) return 0
+ if(INTENT_DISARM) return 1
+ if(INTENT_GRAB) return 2
else return 3
else
switch(argument)
- if(0) return I_HELP
- if(1) return I_DISARM
- if(2) return I_GRAB
- else return I_HARM
+ if(0) return INTENT_HELP
+ if(1) return INTENT_DISARM
+ if(2) return INTENT_GRAB
+ else return INTENT_HARM
//change a mob's act-intent. Input the intent as a string such as "help" or use "right"/"left
/mob/verb/a_intent_change(input as text)
@@ -341,7 +341,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
if(ishuman(src) || isalienadult(src) || isbrain(src))
switch(input)
- if(I_HELP,I_DISARM,I_GRAB,I_HARM)
+ if(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM)
a_intent = input
if("right")
a_intent = intent_numeric((intent_numeric(a_intent)+1) % 4)
@@ -352,14 +352,14 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
else if(isrobot(src) || islarva(src))
switch(input)
- if(I_HELP)
- a_intent = I_HELP
- if(I_HARM)
- a_intent = I_HARM
+ if(INTENT_HELP)
+ a_intent = INTENT_HELP
+ if(INTENT_HARM)
+ a_intent = INTENT_HARM
if("right","left")
a_intent = intent_numeric(intent_numeric(a_intent) - 3)
if(hud_used && hud_used.action_intent)
- if(a_intent == I_HARM)
+ if(a_intent == INTENT_HARM)
hud_used.action_intent.icon_state = "harm"
else
hud_used.action_intent.icon_state = "help"
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index c21733a7a39..51890a7337f 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -128,7 +128,7 @@
if("Drone")
new_xeno = new /mob/living/carbon/alien/humanoid/drone(loc)
- new_xeno.a_intent = I_HARM
+ new_xeno.a_intent = INTENT_HARM
new_xeno.key = key
to_chat(new_xeno, "You are now an alien.")
@@ -187,7 +187,7 @@
qdel(t)
var/mob/living/simple_animal/pet/corgi/new_corgi = new /mob/living/simple_animal/pet/corgi (loc)
- new_corgi.a_intent = I_HARM
+ new_corgi.a_intent = INTENT_HARM
new_corgi.key = key
to_chat(new_corgi, "You are now a Corgi. Yap Yap!")
@@ -218,7 +218,7 @@
var/mob/new_mob = new mobpath(src.loc)
new_mob.key = key
- new_mob.a_intent = I_HARM
+ new_mob.a_intent = INTENT_HARM
to_chat(new_mob, "You suddenly feel more... animalistic.")
@@ -235,7 +235,7 @@
var/mob/new_mob = new mobpath(src.loc)
new_mob.key = key
- new_mob.a_intent = I_HARM
+ new_mob.a_intent = INTENT_HARM
to_chat(new_mob, "You feel more... animalistic")
new_mob.update_pipe_vision()
diff --git a/code/modules/ninja/martial_art.dm b/code/modules/ninja/martial_art.dm
index 705098c9298..1ea05b1073e 100644
--- a/code/modules/ninja/martial_art.dm
+++ b/code/modules/ninja/martial_art.dm
@@ -162,7 +162,7 @@
if(!istype(A, /mob/living/carbon/human)) // Special moves only work on humans.
user.pointed(A)
return 0
- if(user.a_intent == I_HELP) // No special move for help intent.
+ if(user.a_intent == INTENT_HELP) // No special move for help intent.
user.pointed(A)
return 0
if(!(A in range(1,user))) // Is the target within one tile of us?
@@ -173,10 +173,10 @@
var/mob/living/carbon/human/target = A
switch(user.a_intent)
- if(I_DISARM)
+ if(INTENT_DISARM)
user_martial_art.wrist_wrench(user, target)
- if(I_GRAB)
+ if(INTENT_GRAB)
user_martial_art.choke_hold(user, target)
- if(I_HARM)
+ if(INTENT_HARM)
user_martial_art.palm_strike(user, target)
return 1
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index b70e847cab4..705e4ad8ed7 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -525,7 +525,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
if(!S)
return
- if(!(S.status & ORGAN_ROBOT) || user.a_intent != I_HELP || S.open == 2)
+ if(!(S.status & ORGAN_ROBOT) || user.a_intent != INTENT_HELP || S.open == 2)
return ..()
if(S.burn_dam)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 3f42b4d58ce..033e04e95ab 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -450,7 +450,7 @@
else if(TK in user.mutations)
to_chat(user, "You telekinetically remove the light [fitting].")
else
- if(user.a_intent == I_DISARM || user.a_intent == I_GRAB)
+ if(user.a_intent == INTENT_DISARM || user.a_intent == INTENT_GRAB)
to_chat(user, "You try to remove the light [fitting], but you burn your hand on it!")
var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
@@ -694,7 +694,7 @@
if(!proximity) return
if(istype(target, /obj/machinery/light))
return
- if(user.a_intent != I_HARM)
+ if(user.a_intent != INTENT_HARM)
return
shatter()
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 1417907bb6c..1baac918966 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -117,7 +117,7 @@
if(flag) //It's adjacent, is the user, or is on the user's person
if(target in user.contents) //can't shoot stuff inside us.
return
- if(!ismob(target) || user.a_intent == I_HARM) //melee attack
+ if(!ismob(target) || user.a_intent == INTENT_HARM) //melee attack
return
if(target == user && user.zone_sel.selecting != "mouth") //so we can't shoot ourselves (unless mouth selected)
return
@@ -232,7 +232,7 @@ obj/item/weapon/gun/proc/newshot()
feedback_add_details("gun_fired","[type]")
/obj/item/weapon/gun/attack(mob/M as mob, mob/user)
- if(user.a_intent == I_HARM) //Flogging
+ if(user.a_intent == INTENT_HARM) //Flogging
..()
else
return
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 2c02695d84d..f5cfede882d 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -218,7 +218,7 @@
/obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
if(flag)
if(!(target in user.contents) && ismob(target))
- if(user.a_intent == I_HARM) // Flogging action
+ if(user.a_intent == INTENT_HARM) // Flogging action
return
if(isliving(user))
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 6d4976e1d53..ff274a48993 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -243,7 +243,7 @@ proc/wabbajack(mob/living/M)
M.create_attack_log("[M.real_name] ([M.ckey]) became [new_mob.real_name].")
new_mob.attack_log = M.attack_log
- new_mob.a_intent = I_HARM
+ new_mob.a_intent = INTENT_HARM
if(M.mind)
M.mind.transfer_to(new_mob)
else
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 2714b8d1b16..839ce9c0a8d 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -151,7 +151,7 @@
return 1
if (!is_type_in_list(I, blend_items) && !is_type_in_list(I, juice_items))
- if(user.a_intent == I_HARM)
+ if(user.a_intent == INTENT_HARM)
return ..()
else
to_chat(user, "Cannot refine into a reagent!")
diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm
index 89233789903..241370668e0 100644
--- a/code/modules/reagents/chemistry/reagents/misc.dm
+++ b/code/modules/reagents/chemistry/reagents/misc.dm
@@ -373,8 +373,8 @@
color = "#FF83A5"
/datum/reagent/love/on_mob_life(mob/living/M)
- if(M.a_intent == I_HARM)
- M.a_intent = I_HELP
+ if(M.a_intent == INTENT_HARM)
+ M.a_intent = INTENT_HELP
if(prob(8))
var/lovely_phrase = pick("appreciated", "loved", "pretty good", "really nice", "pretty happy with yourself, even though things haven't always gone as well as they could")
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 9e5b93f8927..fc3baf62556 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -140,7 +140,7 @@
update_move_direction()
to_chat(user, "You rotate [src].")
- else if(user.a_intent != I_HARM)
+ else if(user.a_intent != INTENT_HARM)
if(user.drop_item())
I.forceMove(loc)
else
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 2a111433948..c5dcf75c69a 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -296,7 +296,7 @@
to_chat(M, mymessage)
/obj/spacepod/attackby(obj/item/W as obj, mob/user as mob, params)
- if(user.a_intent == I_HARM)
+ if(user.a_intent == INTENT_HARM)
..()
deal_damage(W.force)
else
@@ -408,7 +408,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
cargo_hold.max_combined_w_class += SPE.storage_mod["w_class"]
/obj/spacepod/attack_hand(mob/user as mob)
- if(user.a_intent == I_GRAB && unlocked)
+ if(user.a_intent == INTENT_GRAB && unlocked)
var/mob/target
if(pilot)
target = pilot
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 05486c9046d..96b4872f0ff 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -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
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 127077a621d..48ee29f3f45 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -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