From b38a42c665f3f7d276f3f28869ff42f6abf99b71 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 16 Dec 2015 10:53:10 +1030 Subject: [PATCH] Compile fixes/port fixes. --- code/_onclick/hud/hud.dm | 2 -- code/modules/mob/living/simple_animal/simple_animal.dm | 8 -------- code/modules/projectiles/targeting/targeting_mob.dm | 8 ++++++++ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 5a9b45bfca..a73779ef72 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -257,8 +257,6 @@ datum/hud/New(mob/owner) human_hud(ui_style, ui_color, ui_alpha, mymob) // Pass the player the UI style chosen in preferences else if(isrobot(mymob)) robot_hud() - else if(issmall(mymob)) - monkey_hud(ui_style, ui_color, ui_alpha) else if(isbrain(mymob)) brain_hud(ui_style) else if(isalien(mymob)) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index acce1e39b1..a66f6b772c 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -365,14 +365,6 @@ return (0) return 1 -//Call when target overlay should be added/removed -/mob/living/simple_animal/update_targeted() - if(!targeted_by && target_locked) - qdel(target_locked) - overlays = null - if (targeted_by && target_locked) - overlays += target_locked - /mob/living/simple_animal/say(var/message) var/verb = "says" if(speak_emote.len) diff --git a/code/modules/projectiles/targeting/targeting_mob.dm b/code/modules/projectiles/targeting/targeting_mob.dm index dfae47a604..a89bbc2c9a 100644 --- a/code/modules/projectiles/targeting/targeting_mob.dm +++ b/code/modules/projectiles/targeting/targeting_mob.dm @@ -42,3 +42,11 @@ aiming.update_aiming() if(aimed.len) trigger_aiming(TARGET_CAN_MOVE) + +/mob/living/proc/set_m_intent(var/intent) + if (intent != "walk" && intent != "run") + return 0 + m_intent = intent + if(hud_used) + if (hud_used.move_intent) + hud_used.move_intent.icon_state = intent == "walk" ? "walking" : "running" \ No newline at end of file