Fixes Telekinetic Simple Mobs

This commit is contained in:
Fox-McCloud
2016-11-11 10:39:50 -05:00
parent fc22354185
commit 55ffd16db8
7 changed files with 11 additions and 11 deletions
+2 -2
View File
@@ -28,7 +28,7 @@
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
if(language && (language.flags & NONVERBAL))
if(!can_see()) //blind people can't see dumbass
if(!has_vision()) //blind people can't see dumbass
message = stars(message)
if(!speaker || !(speaker in view(src)))
@@ -95,7 +95,7 @@
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
if(language && (language.flags & NONVERBAL))
if(!can_see()) //blind people can't see dumbass
if(!has_vision()) //blind people can't see dumbass
message = stars(message)
if(!speaker || !(speaker in view(src)))
@@ -118,11 +118,11 @@
for(var/atom/check in check_list)
for(var/mob/living/M in viewers(world.view + 1, check) - src)
if(M.client && CanAttack(M) && !M.has_unlimited_silicon_privilege)
if(M.can_see())
if(M.has_vision())
return M
for(var/obj/mecha/M in view(world.view + 1, check)) //assuming if you can see them they can see you
if(M.occupant && M.occupant.client)
if(M.occupant.can_see())
if(M.occupant.has_vision())
return M.occupant
return null
+2 -2
View File
@@ -1,5 +1,5 @@
/mob/living/update_blind_effects()
if(!can_see())
if(!has_vision())
overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
throw_alert("blind", /obj/screen/alert/blind)
return 1
@@ -43,7 +43,7 @@
return !(ear_deaf || (disabilities & DEAF))
// Whether the mob is able to see
/mob/living/can_see()
/mob/living/has_vision()
return !(eye_blind || (disabilities & BLIND) || stat)
// Whether the mob is capable of talking
+2 -2
View File
@@ -62,7 +62,7 @@
if(!client) return
if(type)
if(type & 1 && !can_see())//Vision related
if(type & 1 && !has_vision())//Vision related
if(!( alt ))
return
else
@@ -74,7 +74,7 @@
else
msg = alt
type = alt_type
if(type & 1 && !can_see())
if(type & 1 && !has_vision())
return
// Added voice muffling for Issue 41.
if(stat == UNCONSCIOUS || (sleeping > 0 && stat != DEAD))
+1 -1
View File
@@ -37,7 +37,7 @@
/mob/proc/can_hear()
return 1
/mob/proc/can_see()
/mob/proc/has_vision()
return 1
/mob/proc/can_speak()