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

Removes a few outdated mob mentions. Fixes a few things. Almost definitely fixes #7570.

Browse Source
This commit is contained in:
Kelenius
2015-08-18 10:48:22 +03:00
parent f2b2f2a22c
commit afc5414ed9
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/ZAS/Airflow.dm
View File

@@ -19,7 +19,7 @@ mob/proc/airflow_stun()
mob/living/silicon/airflow_stun() mob/living/silicon/airflow_stun()
return return
mob/living/carbon/metroid/airflow_stun() mob/living/carbon/slime/airflow_stun()
return return
mob/living/carbon/human/airflow_stun() mob/living/carbon/human/airflow_stun()
@@ -242,6 +242,6 @@ zone/proc/movables()
. = list() . = list()
for(var/turf/T in contents) for(var/turf/T in contents)
for(var/atom/movable/A in T) for(var/atom/movable/A in T)
if(!A.simulated || A.anchored || istype(A, /obj/effect) || istype(A, /mob/aiEye)) if(!A.simulated || A.anchored || istype(A, /obj/effect) || istype(A, /mob/eye))
continue continue
. += A . += A

4
code/__HELPERS/unsorted.dm
View File

@@ -834,7 +834,7 @@ proc/GaussRandRound(var/sigma,var/roundto)
if(!istype(O,/obj)) continue if(!istype(O,/obj)) continue
O.loc = X O.loc = X
for(var/mob/M in T) for(var/mob/M in T)
if(!istype(M,/mob) || istype(M, /mob/aiEye)) continue // If we need to check for more mobs, I'll add a variable if(!istype(M,/mob) || istype(M, /mob/eye)) continue // If we need to check for more mobs, I'll add a variable
M.loc = X M.loc = X
// var/area/AR = X.loc // var/area/AR = X.loc
@@ -965,7 +965,7 @@ proc/DuplicateObject(obj/original, var/perfectcopy = 0 , var/sameloc = 0)
for(var/mob/M in T) for(var/mob/M in T)
if(!istype(M,/mob) || istype(M, /mob/aiEye)) continue // If we need to check for more mobs, I'll add a variable if(!istype(M,/mob) || istype(M, /mob/eye)) continue // If we need to check for more mobs, I'll add a variable
mobs += M mobs += M
for(var/mob/M in mobs) for(var/mob/M in mobs)

2
code/defines/procs/hud.dm
View File

@@ -72,7 +72,7 @@ mob/proc/regular_hud_updates() //Used in the life.dm of mobs that can use HUDs.
mob/proc/in_view(var/turf/T) mob/proc/in_view(var/turf/T)
return view(T) return view(T)
/mob/aiEye/in_view(var/turf/T) /mob/eye/in_view(var/turf/T)
var/list/viewed = new var/list/viewed = new
for(var/mob/living/carbon/human/H in mob_list) for(var/mob/living/carbon/human/H in mob_list)
if(get_dist(H, T) <= 7) if(get_dist(H, T) <= 7)

2
code/modules/admin/topic.dm
View File

@@ -2112,7 +2112,7 @@
if("friendai") if("friendai")
feedback_inc("admin_secrets_fun_used",1) feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","FA") feedback_add_details("admin_secrets_fun_used","FA")
for(var/mob/aiEye/aE in mob_list) for(var/mob/eye/aiEye/aE in mob_list)
aE.icon_state = "ai_friend" aE.icon_state = "ai_friend"
for(var/obj/machinery/M in machines) for(var/obj/machinery/M in machines)
if(istype(M, /obj/machinery/ai_status_display)) if(istype(M, /obj/machinery/ai_status_display))

2
code/modules/mob/mob_helpers.dm
View File

@@ -415,7 +415,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
var/atom/oldeye=M.client.eye var/atom/oldeye=M.client.eye
var/aiEyeFlag = 0 var/aiEyeFlag = 0
if(istype(oldeye, /mob/aiEye)) if(istype(oldeye, /mob/eye/aiEye))
aiEyeFlag = 1 aiEyeFlag = 1
var/x var/x