mob/living/Life() now handles even more regular hud updates. Relocates action handling.

This commit is contained in:
PsiOmegaDelta
2015-06-17 16:09:13 +02:00
parent 9d38bcc149
commit 6ed7cee041
8 changed files with 9 additions and 15 deletions
@@ -1,2 +1,2 @@
/mob/living/carbon/slime/regular_hud_updates()
/mob/living/carbon/slime/handle_regular_hud_updates()
return
+4 -1
View File
@@ -47,6 +47,8 @@
handle_disabilities() // eye, ear, brain damages
handle_status_effects() //all special effects, stunned, weakened, jitteryness, hallucination, sleeping, etc
handle_actions()
update_canmove()
if(client)
@@ -122,8 +124,9 @@
adjustEarDamage(-0.05,-1)
//this handles hud updates. Calls update_vision() and handle_hud_icons()
/mob/living/proc/handle_regular_hud_updates()
/mob/living/handle_regular_hud_updates()
if(!client) return 0
..()
handle_vision()
handle_hud_icons()
-5
View File
@@ -1,8 +1,3 @@
/mob/living/Life()
..()
if(stat != DEAD)
handle_actions()
//mob verbs are faster than object verbs. See mob/verb/examine.
/mob/living/verb/pulled(atom/movable/AM as mob|obj in oview(1))
set name = "Pull"
@@ -247,10 +247,6 @@
//Scale quadratically so that single digit numbers of fire stacks don't burn ridiculously hot.
return round(FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE*(fire_stacks/FIRE_MAX_FIRESUIT_STACKS)**2)
/mob/living/regular_hud_updates()
..()
update_action_buttons()
/mob/living/proc/handle_actions()
//Pretty bad, i'd use picked/dropped instead but the parent calls in these are nonexistent
for(var/datum/action/A in actions)
+1 -1
View File
@@ -151,7 +151,7 @@
theAPC = null
process_queued_alarms()
regular_hud_updates()
handle_regular_hud_updates()
switch(src.sensor_mode)
if (SEC_HUD)
process_sec_hud(src,0,src.eyeobj)
+1 -1
View File
@@ -10,7 +10,7 @@
M.show_message("\red The data cable rapidly retracts back into its spool.", 3, "\red You hear a click and the sound of wire spooling rapidly.", 2)
qdel(src.cable)
regular_hud_updates()
handle_regular_hud_updates()
if(src.secHUD == 1)
process_sec_hud(src, 1)
@@ -173,7 +173,7 @@
src.see_invisible = SEE_INVISIBLE_LIVING // This is normal vision (25), setting it lower for normal vision means you don't "see" things like darkness since darkness
// has a "invisible" value of 15
regular_hud_updates()
handle_regular_hud_updates()
var/obj/item/borg/sight/hud/hud = (locate(/obj/item/borg/sight/hud) in src)
if(hud && hud.hud)