Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into mutantrace

This commit is contained in:
Zuhayr
2014-12-24 12:47:56 +10:30
4 changed files with 19 additions and 10 deletions
@@ -960,6 +960,9 @@
var/datum/disease2/disease/V = virus2[ID]
V.cure(src)
losebreath = 0
failed_last_breath = 0 //So mobs that died of oxyloss don't revive and have perpetual out of breath.
..()
/mob/living/carbon/human/proc/is_lung_ruptured()
@@ -1285,4 +1288,4 @@
/mob/living/carbon/human/slip(var/slipped_on, stun_duration=8)
if((species.flags & NO_SLIP) || (shoes && (shoes.flags & NOSLIP)))
return 0
..(slipped_on,stun_duration)
..(slipped_on,stun_duration)
@@ -166,8 +166,9 @@
src.sight &= ~SEE_MOBS
src.sight &= ~SEE_TURFS
src.sight &= ~SEE_OBJS
src.see_in_dark = 8
src.see_invisible = SEE_INVISIBLE_MINIMUM
src.see_in_dark = 8 // see_in_dark means you can FAINTLY see in the dark, humans have a range of 3 or so, tajaran have it at 8
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()
@@ -95,7 +95,10 @@
turns_since_move++
if(turns_since_move >= turns_per_move)
if(!(stop_automated_movement_when_pulled && pulledby)) //Soma animals don't move when pulled
Move(get_step(src,pick(cardinal)))
/var/moving_to = 0 // otherwise it always picks 4, fuck if I know. Did I mention fuck BYOND
moving_to = pick(cardinal)
dir = moving_to //How about we turn them the direction they are moving, yay.
Move(get_step(src,moving_to))
turns_since_move = 0
//Speaking
@@ -368,4 +371,4 @@
message = capitalize(trim_left(message))
..(message, null, verb)
..(message, null, verb)