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

Update game.dm

Browse Source
This commit is contained in:
Raeschen
2023-07-15 23:30:05 +02:00
committed by GitHub
parent db975d1bb6
commit 6ed45a34d1
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/_helpers/game.dm
View File

@@ -699,8 +699,6 @@
hear |= recursive_mob_check(A, hear, 3, 1, 0, 1) hear |= recursive_mob_check(A, hear, 3, 1, 0, 1)
return hear return hear
<<<<<<< HEAD
=======
/proc/get_belly(var/atom/A) // return a belly we're in, one way or another; and if we aren't (or are too deep to comprehend being in belly), returns null /proc/get_belly(var/atom/A) // return a belly we're in, one way or another; and if we aren't (or are too deep to comprehend being in belly), returns null
var/atom/loc_check = A.loc var/atom/loc_check = A.loc
@@ -728,4 +726,3 @@
result |= get_all_prey_recursive(P, client_check) result |= get_all_prey_recursive(P, client_check)
return result return result
>>>>>>> 71677c47a8... Merge pull request #15139 from Heroman3003/custom-subtle