intent cleanup (#16825)

This commit is contained in:
Kashargul
2025-01-03 08:14:28 +01:00
committed by GitHub
parent e03fe8c077
commit 3094e65b71
40 changed files with 80 additions and 77 deletions
+1 -1
View File
@@ -61,7 +61,7 @@
..()
/obj/item/deskbell/proc/ring(mob/user)
if(user.a_intent == "harm")
if(user.a_intent == I_HURT)
playsound(src, 'sound/effects/deskbell_rude.ogg', 50, 1)
to_chat(user,span_notice("You hammer [src] rudely!"))
if (prob(2))
+2 -2
View File
@@ -183,7 +183,7 @@
/obj/item/glass_jar/fish/afterattack(var/atom/A, var/mob/user, var/proximity)
if(!filled)
if(istype(A, /obj/structure/sink) || istype(A, /turf/simulated/floor/water))
if(contains && user.a_intent == "help")
if(contains && user.a_intent == I_HELP)
to_chat(user, span_warning("That probably isn't the best idea."))
return
@@ -197,7 +197,7 @@
/obj/item/glass_jar/fish/attack_self(var/mob/user)
if(filled)
if(contains == JAR_ANIMAL)
if(user.a_intent == "help")
if(user.a_intent == I_HELP)
to_chat(user, span_notice("Maybe you shouldn't empty the water..."))
return
+1 -1
View File
@@ -257,7 +257,7 @@
return
if((ishuman(H))) //i guess carp and shit shouldn't set them off
var/mob/living/carbon/M = H
if(M.m_intent == "run")
if(M.m_intent == I_RUN)
to_chat(M, span_warning("You step on the snap pop!"))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+6 -6
View File
@@ -274,8 +274,8 @@ var/last_chew = 0
lcuffs.loc = target
target.legcuffed = lcuffs
target.update_inv_legcuffed()
if(target.m_intent != "walk")
target.m_intent = "walk"
if(target.m_intent != I_WALK)
target.m_intent = I_WALK
if(target.hud_used && user.hud_used.move_intent)
target.hud_used.move_intent.icon_state = "walking"
return 1
@@ -283,8 +283,8 @@ var/last_chew = 0
/obj/item/handcuffs/legcuffs/equipped(var/mob/living/user,var/slot)
. = ..()
if(slot == slot_legcuffed)
if(user.m_intent != "walk")
user.m_intent = "walk"
if(user.m_intent != I_WALK)
user.m_intent = I_WALK
if(user.hud_used && user.hud_used.move_intent)
user.hud_used.move_intent.icon_state = "walking"
@@ -325,8 +325,8 @@ var/last_chew = 0
lcuffs.loc = target
target.legcuffed = lcuffs
target.update_inv_legcuffed()
if(target.m_intent != "walk")
target.m_intent = "walk"
if(target.m_intent != I_WALK)
target.m_intent = I_WALK
if(target.hud_used && user.hud_used.move_intent)
target.hud_used.move_intent.icon_state = "walking"
return 1
@@ -55,7 +55,7 @@
..()
/obj/item/tool/screwdriver/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(!istype(M) || user.a_intent == "help")
if(!istype(M) || user.a_intent == I_HELP)
return ..()
if(user.zone_sel.selecting != O_EYES && user.zone_sel.selecting != BP_HEAD)
return ..()
@@ -112,4 +112,4 @@
attack_verb = list("drilled", "screwed", "jabbed", "whacked")
hitsound = 'sound/items/drill_hit.ogg'
usesound = 'sound/items/drill_use.ogg'
toolspeed = 0.25
toolspeed = 0.25
+2 -2
View File
@@ -124,7 +124,7 @@
return
if(deployed && isliving(AM))
var/mob/living/L = AM
if(L.m_intent == "run")
if(L.m_intent == I_RUN)
L.visible_message(
span_danger("[L] steps on \the [src]."),
span_danger("You step on \the [src]!"),
@@ -271,7 +271,7 @@
return
if(anchored && isliving(AM))
var/mob/living/L = AM
if(L.m_intent == "run")
if(L.m_intent == I_RUN)
L.visible_message(
span_danger("[L] steps in \the [src]."),
span_danger("You step in \the [src]!"),
@@ -42,7 +42,7 @@
add_fingerprint(M)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.m_intent == "walk")
if(H.m_intent == I_WALK)
to_chat(H, span_warning("You stop at the edge of \the [src.name]."))
return FALSE
else