This commit is contained in:
kevinz000
2020-01-10 13:28:56 -08:00
parent f1a4956afc
commit c0274b1bc6
8 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -574,9 +574,9 @@
if(stam > DAMAGE_PRECISION)
var/total_health = (health - stam)
if(total_health <= crit_threshold && !stat)
if(!IsKnockdown())
if(CHECK_BITFIELD(mobility_flags, MOBILITY_STAND))
to_chat(src, "<span class='notice'>You're too exhausted to keep going...</span>")
DefaultCombatKnockdown(100)
KnockToFloor(TRUE)
update_health_hud()
/mob/living/carbon/update_sight()
+1 -1
View File
@@ -15,7 +15,7 @@
cameraFollow = null
anchored = FALSE //unbolt floorbolts
update_canmove()
update_mobility()
if(eyeobj)
eyeobj.setLoc(get_turf(src))
set_eyeobj_visible(FALSE)
@@ -21,7 +21,7 @@
rotate_on_lying = TRUE
else
icon = initial(icon)
icon_state = "[chassis][resting? "_rest" : (stat == DEAD? "_dead" : "")]"
icon_state = "[chassis][_REFACTORING_resting? "_rest" : (stat == DEAD? "_dead" : "")]"
rotate_on_lying = FALSE
pixel_x = ((chassis == "dynamic") && chassis_pixel_offsets_x[dynamic_chassis]) || 0
update_transform()
@@ -1271,7 +1271,7 @@
/mob/living/silicon/robot/update_mobility()
. = ..()
if(client && stat != DEAD && dogborg == FALSE)
if(resting)
if(_REFACTORING_resting)
cut_overlays()
icon_state = "[module.cyborg_base_icon]-rest"
else
@@ -86,7 +86,7 @@
if(!on)
icon_state = "medibot0"
return
if(IsStun())
if(_REFACTORING_IsStun())
icon_state = "medibota"
return
if(mode == BOT_HEALING)
@@ -278,7 +278,7 @@
if(mode == BOT_HEALING)
return
if(IsStun())
if(_REFACTORING_IsStun())
oldpatient = patient
patient = null
mode = BOT_IDLE
@@ -24,7 +24,7 @@
stat = DEAD
cut_overlays()
update_canmove()
update_mobility()
if(SSticker.mode)
SSticker.mode.check_win()
@@ -457,13 +457,13 @@
SStun = world.time + rand(20,60)
spawn(0)
canmove = 0
DISABLE_BITFIELD(mobility_flags, MOBILITY_MOVE)
if(user)
step_away(src,user,15)
sleep(3)
if(user)
step_away(src,user,15)
update_canmove()
update_mobility()
/mob/living/simple_animal/slime/pet
docile = 1
+2 -2
View File
@@ -60,14 +60,14 @@
/mob/proc/blur_eyes(amount)
if(amount>0)
eye_blurry = max(amount, eye_blurry)
update_eye_blur()
update_eyeblur()
/**
* Adjust the current blurriness of the mobs vision by amount
*/
/mob/proc/adjust_blurriness(amount)
eye_blurry = max(eye_blurry+amount, 0)
update_eye_blur()
update_eyeblur()
///Set the mobs blurriness of vision to an amount
/mob/proc/set_blurriness(amount)