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

Fix merge

Browse Source
This commit is contained in:
Aronai Sieyes
2021-09-27 14:02:26 -04:00
parent 4fcb034d81
commit 41ad584cdf
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/random_map/automata/caves.dm
-4
View File
@@ -69,9 +69,5 @@
else if(map[current_cell] == EMPTY_CHAR)
T.make_ore(1)
get_additional_spawns(map[current_cell],T,get_spawn_dir(x, y))
<<<<<<< HEAD
//VOREStation Edit End
return T
=======
return T
>>>>>>> f8718ae0bcf... Merge pull request #8299 from MistakeNot4892/automata