cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compile fixes/port fixes.

Browse Source
This commit is contained in:
Zuhayr
2015-12-16 10:53:10 +10:30
parent 33be12b355
commit b38a42c665
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/hud/hud.dm
View File

@@ -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 human_hud(ui_style, ui_color, ui_alpha, mymob) // Pass the player the UI style chosen in preferences
else if(isrobot(mymob)) else if(isrobot(mymob))
robot_hud() robot_hud()
else if(issmall(mymob))
monkey_hud(ui_style, ui_color, ui_alpha)
else if(isbrain(mymob)) else if(isbrain(mymob))
brain_hud(ui_style) brain_hud(ui_style)
else if(isalien(mymob)) else if(isalien(mymob))

8
code/modules/mob/living/simple_animal/simple_animal.dm
View File

@@ -365,14 +365,6 @@
return (0) return (0)
return 1 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) /mob/living/simple_animal/say(var/message)
var/verb = "says" var/verb = "says"
if(speak_emote.len) if(speak_emote.len)

8
code/modules/projectiles/targeting/targeting_mob.dm
View File

@@ -42,3 +42,11 @@
aiming.update_aiming() aiming.update_aiming()
if(aimed.len) if(aimed.len)
trigger_aiming(TARGET_CAN_MOVE) 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"