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
@@ -12,7 +12,7 @@
using.name = "mov_intent"
using.set_dir(SOUTHWEST)
using.icon = HUD.ui_style
using.icon_state = (m_intent == "run" ? "running" : "walking")
using.icon_state = (m_intent == I_RUN ? "running" : "walking")
using.screen_loc = ui_acti
using.layer = HUD_LAYER
HUD.adding += using
+1 -1
View File
@@ -132,7 +132,7 @@
using = new /obj/screen()
using.name = "mov_intent"
using.icon = HUD.ui_style
using.icon_state = (m_intent == "run" ? "running" : "walking")
using.icon_state = (m_intent == I_RUN ? "running" : "walking")
using.screen_loc = ui_movi
using.color = HUD.ui_color
using.alpha = HUD.ui_alpha
+3 -3
View File
@@ -85,7 +85,7 @@ var/obj/screen/robot_inventory
using = new /obj/screen()
using.name = "mov_intent"
using.icon = HUD.ui_style
using.icon_state = (m_intent == "run" ? "running" : "walking")
using.icon_state = (m_intent == I_RUN ? "running" : "walking")
using.screen_loc = ui_movi
using.color = HUD.ui_color
using.alpha = HUD.ui_alpha
@@ -230,7 +230,7 @@ var/obj/screen/robot_inventory
else if(speed == -1)
using.icon_state = "speed_2"
HUD.control_vtec = using
m_intent = "run"
m_intent = I_RUN
HUD.move_intent.icon_state = "running"
client.screen += HUD.control_vtec
@@ -254,7 +254,7 @@ var/obj/screen/robot_inventory
control_vtec.icon_state = "speed_1"
else if(R.speed == -1)
control_vtec.icon_state = "speed_2"
R.m_intent = "run"
R.m_intent = I_RUN
R.hud_used.move_intent.icon_state = "running"
R.client?.screen += control_vtec
else
+11 -11
View File
@@ -291,36 +291,36 @@
var/mob/living/carbon/C = usr
if(C.legcuffed)
to_chat(C, span_notice("You are legcuffed! You cannot run until you get [C.legcuffed] removed!"))
C.m_intent = "walk" //Just incase
C.m_intent = I_WALK //Just incase
C.hud_used.move_intent.icon_state = "walking"
return 1
var/mob/living/L = usr
switch(L.m_intent)
if("run")
L.m_intent = "walk"
if(I_RUN)
L.m_intent = I_WALK
L.hud_used.move_intent.icon_state = "walking"
if("walk")
L.m_intent = "run"
if(I_WALK)
L.m_intent = I_RUN
L.hud_used.move_intent.icon_state = "running"
if("m_intent")
if(!usr.m_int)
switch(usr.m_intent)
if("run")
if(I_RUN)
usr.m_int = "13,14"
if("walk")
if(I_WALK)
usr.m_int = "14,14"
if("face")
usr.m_int = "15,14"
else
usr.m_int = null
if("walk")
usr.m_intent = "walk"
if(I_WALK)
usr.m_intent = I_WALK
usr.m_int = "14,14"
if("face")
usr.m_intent = "face"
usr.m_int = "15,14"
if("run")
usr.m_intent = "run"
if(I_RUN)
usr.m_intent = I_RUN
usr.m_int = "13,14"
if("Reset Machine")
usr.unset_machine()