mirror of
https://github.com/fulpstation/fulpstation.git
synced 2025-12-09 07:54:14 +00:00
Merge branch 'tgui-thing' of https://github.com/JohnFulpWillard/fulpstation into tgui-thing
This commit is contained in:
@@ -13,6 +13,9 @@
|
||||
#include "map_files\NorthStar\north_star.dmm"
|
||||
#include "map_files\IceBoxStation\IceBoxStation.dmm"
|
||||
#include "map_files\tramstation\tramstation.dmm"
|
||||
#include "map_files\PubbyStation\PubbyStation.dmm"
|
||||
#include "map_files\SeleneStation\SeleneStation.dmm"
|
||||
#include "map_files\Heliostation\Heliostation.dmm"
|
||||
|
||||
#ifdef CIBUILDING
|
||||
#include "templates.dm"
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
#ifndef LOWMEMORYMODE
|
||||
#ifdef ALL_MAPS
|
||||
#include "..\..\_maps\map_files\PubbyStation\PubbyStation.dmm"
|
||||
#include "..\..\_maps\map_files\SeleneStation\SeleneStation.dmm"
|
||||
#include "..\..\_maps\map_files\Heliostation\Heliostation.dmm"
|
||||
#endif
|
||||
#endif
|
||||
@@ -5388,7 +5388,6 @@
|
||||
#include "fulp_modules\fulp_world\fulp_config.dm"
|
||||
#include "fulp_modules\fulp_world\fulp_preferences.dm"
|
||||
#include "fulp_modules\fulp_world\fulp_world.dm"
|
||||
#include "fulp_modules\mapping\_basemap.dm"
|
||||
#include "fulp_modules\mapping\areas\areas.dm"
|
||||
#include "fulp_modules\mapping\helpers\commission_plaques.dm"
|
||||
#include "fulp_modules\mapping\helpers\fulp_logo\fulp_logo.dm"
|
||||
|
||||
Reference in New Issue
Block a user