shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes map conflicts on this pr for the (3rd? 4th? I've lost count.) time.

Browse Source
This commit is contained in:
Detective Google
2020-02-08 01:20:50 -06:00
parent 6e969808f3
commit c434382d6d
2 changed files with 951 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+950 -257
View File
File diff suppressed because it is too large Load Diff
tgstation.dme
+1 -1
View File
@@ -489,8 +489,8 @@
#include "code\datums\elements\dusts_on_leaving_area.dm"
#include "code\datums\elements\earhealing.dm"
#include "code\datums\elements\ghost_role_eligibility.dm"
#include "code\datums\elements\swimming.dm"
#include "code\datums\elements\mob_holder.dm"
#include "code\datums\elements\swimming.dm"
#include "code\datums\elements\wuv.dm"
#include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm"