cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update atoms.dm

Browse Source
This commit is contained in:
Novacat
2021-05-05 12:28:30 -04:00
committed by Aronai Sieyes
parent 4831f3c37b
commit b7f4e95b75
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms.dm
+1 -5
View File
@@ -492,18 +492,14 @@
// blind_message (optional) is what blind people will hear e.g. "You hear something!"
/atom/proc/visible_message(var/message, var/blind_message, var/list/exclude_mobs, var/range = world.view)
<<<<<<< HEAD
//VOREStation Edit
var/list/see
if(isbelly(loc))
var/obj/belly/B = loc
see = B.get_mobs_and_objs_in_belly()
else
see = get_mobs_and_objs_in_view_fast(get_turf(src),world.view,remote_ghosts = FALSE)
see = get_mobs_and_objs_in_view_fast(get_turf(src), range, remote_ghosts = FALSE)
//VOREStation Edit End
=======
var/list/see = get_mobs_and_objs_in_view_fast(get_turf(src), range, remote_ghosts = FALSE)
>>>>>>> d40a022... Merge pull request #7987 from MistakeNot4892/chirp
var/list/seeing_mobs = see["mobs"]
var/list/seeing_objs = see["objs"]