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

Clean up merge conflicts

Browse Source
This commit is contained in:
Arokha Sieyes
2020-05-14 09:44:52 -04:00
parent 21620a1814
commit a77da3b5df
5 changed files with 0 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/_helpers/game.dm
View File

@@ -281,15 +281,8 @@
//A list of every mob with a client
for(var/mob in player_list)
<<<<<<< HEAD
//VOREStation Edit - Trying to fix some vorestation bug.
if(!ismob(mob))
player_list -= mob
crash_with("There is a null or non-mob reference inside player_list ([mob]).")
=======
if(!ismob(mob))
player_list -= mob
>>>>>>> 3b3e5b3... Merge pull request #7080 from VOREStation/pol-uavs
continue
//VOREStation Edit End - Trying to fix some vorestation bug.
if(get_turf(mob) in hearturfs)