cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MODULAR] Modularized Interlink Loading (#22933)

Browse Source 
* Modularized Interlink loading

Should resolve issues #21821 & #19343, and make #20115 N/A, alongside any other areas where SS13 assumes station levels are Z2+.

* This should fix the CI runtimes

* Another little something that you were forgetting, that was screaming during CI

---------

Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
CliffracerX
2023-08-11 14:44:07 -04:00
committed by GitHub
co-authored by GoldenAlpharex
parent 0524923210
commit 7d6eb06e84
5 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/_basemap.dm
-2
View File
@@ -2,8 +2,6 @@
#include "map_files\generic\CentCom.dmm"
#include "map_files\generic\CentCom_skyrat_z2.dmm" //SKYRAT EDIT ADDITION - SMMS
#ifndef LOWMEMORYMODE
#ifdef ALL_MAPS
#include "map_files\Birdshot\birdshot.dmm"
_maps/map_files/generic/CentCom_skyrat_z2.dmm
+2 -11
View File
@@ -4613,11 +4613,7 @@
name = "Shinto Cabin"
},
/obj/structure/fans/tiny/invisible,
/obj/effect/turf_decal/siding{
icon = 'icons/turf/floors/carpet.dmi';
icon_state = "carpet-1"
},
/turf/open/floor/sepia,
/turf/open/floor/carpet,
/area/centcom/holding/cafedorms)
"bGH" = (
/obj/effect/turf_decal/trimline/dark_red/filled/arrow_cw{
@@ -6548,12 +6544,7 @@
/turf/open/floor/iron/dark,
/area/centcom/interlink)
"gLq" = (
/obj/effect/turf_decal/siding{
icon = 'icons/turf/floors/carpet.dmi';
icon_state = "carpet-2";
pixel_y = -16
},
/turf/open/floor/bamboo,
/turf/open/floor/carpet,
/area/centcom/holding/cafedorms)
"gMw" = (
/turf/closed/wall/mineral/sandstone,
code/__DEFINES/maps.dm
-3
View File
@@ -150,9 +150,6 @@ Always compile, always use that verb, and always make sure that it works for wha
// must correspond to _basemap.dm for things to work correctly
#define DEFAULT_MAP_TRAITS list(\
DECLARE_LEVEL("CentCom", ZTRAITS_CENTCOM),\
/* SKYRAT EDIT ADDITION BEGIN - MODULAR_MAPS */\
DECLARE_LEVEL("Offstation_skyrat", ZTRAITS_CENTCOM),\
/* SKYRAT EDIT ADDITION END - MODULAR_MAPS */\
)
// Camera lock flags
modular_skyrat/modules/mapping/code/interlink_helper.dm
+16
View File
@@ -0,0 +1,16 @@
/// A file to help with making it possible to load the Interlink *modularly* instead of leaving it stuck in Z-2 where station should be and spawning all manner of bad behaviour.
#define INIT_ANNOUNCE(X) to_chat(world, span_boldannounce("[X]")); log_world(X)
/datum/controller/subsystem/mapping/loadWorld()
. = ..()
var/list/FailedZsRat = list()
LoadGroup(FailedZsRat, "The Interlink", "map_files/generic", "CentCom_skyrat_z2.dmm", default_traits = ZTRAITS_CENTCOM)
if(LAZYLEN(FailedZsRat)) //but seriously, unless the server's filesystem is messed up this will never happen
var/msg = "RED ALERT! The following map files failed to load: [FailedZsRat[1]]"
if(FailedZsRat.len > 1)
for(var/I in 2 to FailedZsRat.len)
msg += ", [FailedZsRat[I]]"
msg += ". Yell at your server host!"
INIT_ANNOUNCE(msg)
#undef INIT_ANNOUNCE
tgstation.dme
+1
View File
@@ -6703,6 +6703,7 @@
#include "modular_skyrat\modules\mapping\code\holocall.dm"
#include "modular_skyrat\modules\mapping\code\icemoon.dm"
#include "modular_skyrat\modules\mapping\code\interdyne_mining.dm"
#include "modular_skyrat\modules\mapping\code\interlink_helper.dm"
#include "modular_skyrat\modules\mapping\code\jobs.dm"
#include "modular_skyrat\modules\mapping\code\laptop_presets.dm"
#include "modular_skyrat\modules\mapping\code\lavaland.dm"