[MIRROR] Actually Actually Fixes Illegal Tech [MDB IGNORE] (#12878)

* actually actually fixes illegal tech (#66241)

* Actually Actually Fixes Illegal Tech

Co-authored-by: Y0SH1M4S73R <legoboyo@earthlink.net>
This commit is contained in:
SkyratBot
2022-04-18 16:27:21 -07:00
committed by GitHub
co-authored by Y0SH1M4S73R
parent af11b61ee7
commit eb384b9cb9
3 changed files with 6 additions and 5 deletions
+2 -2
View File
@@ -120,7 +120,6 @@
#define INIT_ORDER_VIS 80
#define INIT_ORDER_DISCORD 78
#define INIT_ORDER_ACHIEVEMENTS 77
#define INIT_ORDER_RESEARCH 75
#define INIT_ORDER_STATION 74 //This is high priority because it manipulates a lot of the subsystems that will initialize after it.
#define INIT_ORDER_QUIRKS 73
#define INIT_ORDER_REAGENTS 72 //HAS to be before mapping and assets - both create objects, which creates reagents, which relies on lists made in this subsystem
@@ -133,7 +132,8 @@
#define INIT_ORDER_TCG 55
#define INIT_ORDER_MAPPING 50
#define INIT_ORDER_EARLY_ASSETS 48
#define INIT_ORDER_TIMETRACK 47
#define INIT_ORDER_RESEARCH 47
#define INIT_ORDER_TIMETRACK 46
#define INIT_ORDER_NETWORKS 45
#define INIT_ORDER_SPATIAL_GRID 43
#define INIT_ORDER_ECONOMY 40
@@ -1,6 +1,7 @@
/// Sends information needed for uplinks
/datum/asset/json/uplink
name = "uplink"
early = TRUE
/datum/asset/json/uplink/generate()
var/list/data = list()
+3 -3
View File
@@ -2089,8 +2089,8 @@
/datum/techweb_node/syndicate_basic/New() //Crappy way of making syndicate gear decon supported until there's another way.
. = ..()
if(!SSassets.initialized)
RegisterSignal(SSassets, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/register_uplink_items)
if(!SSearly_assets.initialized)
RegisterSignal(SSearly_assets, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/register_uplink_items)
else
register_uplink_items()
@@ -2100,7 +2100,7 @@
*/
/datum/techweb_node/syndicate_basic/proc/register_uplink_items()
SIGNAL_HANDLER
UnregisterSignal(SSassets, COMSIG_SUBSYSTEM_POST_INITIALIZE)
UnregisterSignal(SSearly_assets, COMSIG_SUBSYSTEM_POST_INITIALIZE)
boost_item_paths = list()
for(var/datum/uplink_item/item_path as anything in SStraitor.uplink_items_by_type)
var/datum/uplink_item/item = SStraitor.uplink_items_by_type[item_path]