mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-24 17:11:40 +00:00
20cdc4b676
* Converts move intents to /decl/move_intent Adds /decl/move_intent/walk and /decl/move_intent/run. Switches all move intent checks to use the new IS_RUNNING and IS_WALKING macros. Renames and refactors /mob/living/proc/set_m_intent() to /mob/living/proc/set_move_intent(decl/move_intent/intent). Removes the unnecessary /mob/var/m_int and associated code. Updates all move intent setters to use set_move_intent(). * Swaps incorrect config values Swaps incorrect move delays since I got them backwards somehow, oopsies. * Adds suggested ?. operator Compactifies two if statements using the ?. operator instead.
71 lines
1.6 KiB
Plaintext
71 lines
1.6 KiB
Plaintext
/mob/living/var/obj/aiming_overlay/aiming
|
|
/mob/living/var/list/aimed = list()
|
|
|
|
/mob/verb/toggle_gun_mode()
|
|
set name = "Toggle Gun Mode"
|
|
set desc = "Begin or stop aiming."
|
|
set category = "IC"
|
|
|
|
if(isliving(src))
|
|
var/mob/living/M = src
|
|
if(!M.aiming)
|
|
M.aiming = new(src)
|
|
M.aiming.toggle_active()
|
|
else
|
|
to_chat(src, "<span class='warning'>This verb may only be used by living mobs, sorry.</span>")
|
|
return
|
|
|
|
/mob/living/proc/stop_aiming(var/obj/item/thing, var/no_message = 0)
|
|
if(!aiming)
|
|
aiming = new(src)
|
|
if(thing && aiming.aiming_with != thing)
|
|
return
|
|
aiming.cancel_aiming(no_message)
|
|
|
|
/mob/living/death(gibbed,deathmessage="seizes up and falls limp...")
|
|
if(..())
|
|
stop_aiming(no_message=1)
|
|
|
|
/mob/living/update_canmove()
|
|
..()
|
|
if(lying)
|
|
stop_aiming(no_message=1)
|
|
|
|
/mob/living/Weaken(amount)
|
|
stop_aiming(no_message=1)
|
|
..()
|
|
|
|
/mob/living/Destroy()
|
|
if(aiming)
|
|
qdel(aiming)
|
|
aiming = null
|
|
aimed.Cut()
|
|
return ..()
|
|
|
|
/turf/Enter(var/mob/living/mover)
|
|
. = ..()
|
|
if(istype(mover))
|
|
if(mover.aiming && mover.aiming.aiming_at)
|
|
mover.aiming.update_aiming()
|
|
if(mover.aimed.len)
|
|
mover.trigger_aiming(TARGET_CAN_MOVE)
|
|
|
|
/mob/living/forceMove(var/atom/destination)
|
|
. = ..()
|
|
if(aiming && aiming.aiming_at)
|
|
aiming.update_aiming()
|
|
if(aimed.len)
|
|
trigger_aiming(TARGET_CAN_MOVE)
|
|
|
|
/mob/living/proc/set_move_intent(decl/move_intent/intent)
|
|
if(move_intent.type == intent)
|
|
return
|
|
|
|
var/new_intent = GET_DECL(intent)
|
|
if(isnull(new_intent))
|
|
return
|
|
|
|
move_intent = new_intent
|
|
if(hud_used?.move_intent)
|
|
hud_used.move_intent.icon_state = move_intent.hud_icon_state
|