cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-22 04:28:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

intent cleanup (#16825)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/handcuffs.dm
+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
code/game/objects/items/weapons/tools/screwdriver.dm
+2 -2
View File
@@ -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
code/game/objects/items/weapons/traps.dm
+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]!"),