From 17b97009ffc45809a1cd9aaac6656aedabc4a596 Mon Sep 17 00:00:00 2001 From: ihatethisengine Date: Wed, 28 Feb 2024 10:49:29 +0300 Subject: [PATCH] Auto stash before rebase of "cmss13-devs/master" --- code/__DEFINES/mobs.dm | 4 ++-- code/_globalvars/global_lists.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index e2bd868f9a80..1b04df69337d 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -126,6 +126,7 @@ #define XENO_HIVE_NORMAL "xeno_hive_normal" #define XENO_HIVE_CORRUPTED "xeno_hive_corrupted" +#define XENO_HIVE_RENEGADE "xeno_hive_renegade" #define XENO_HIVE_ALPHA "xeno_hive_alpha" #define XENO_HIVE_BRAVO "xeno_hive_bravo" #define XENO_HIVE_CHARLIE "xeno_hive_charlie" @@ -135,11 +136,10 @@ #define XENO_HIVE_MUTATED "xeno_hive_mutated" #define XENO_HIVE_FORSAKEN "xeno_hive_forsaken" #define XENO_HIVE_YAUTJA "xeno_hive_yautja" -#define XENO_HIVE_RENEGADE "xeno_hive_renegade" #define XENO_HIVE_TUTORIAL "xeno_hive_tutorial" -#define ALL_XENO_HIVES list(XENO_HIVE_NORMAL, XENO_HIVE_CORRUPTED, XENO_HIVE_ALPHA, XENO_HIVE_BRAVO, XENO_HIVE_CHARLIE, XENO_HIVE_DELTA, XENO_HIVE_FERAL, XENO_HIVE_TAMED, XENO_HIVE_MUTATED, XENO_HIVE_FORSAKEN, XENO_HIVE_YAUTJA, XENO_HIVE_RENEGADE, XENO_HIVE_TUTORIAL) +#define ALL_XENO_HIVES list(XENO_HIVE_NORMAL, XENO_HIVE_CORRUPTED, XENO_HIVE_RENEGADE, XENO_HIVE_ALPHA, XENO_HIVE_BRAVO, XENO_HIVE_CHARLIE, XENO_HIVE_DELTA, XENO_HIVE_FERAL, XENO_HIVE_TAMED, XENO_HIVE_MUTATED, XENO_HIVE_FORSAKEN, XENO_HIVE_YAUTJA, XENO_HIVE_TUTORIAL) //================================================= diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index 4dbf46086f02..3eb47c2260a9 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -173,6 +173,7 @@ GLOBAL_LIST_INIT(player_origins, USCM_ORIGINS) GLOBAL_LIST_INIT_TYPED(hive_datum, /datum/hive_status, list( XENO_HIVE_NORMAL = new /datum/hive_status(), XENO_HIVE_CORRUPTED = new /datum/hive_status/corrupted(), + XENO_HIVE_RENEGADE = new /datum/hive_status/corrupted/renegade(), XENO_HIVE_ALPHA = new /datum/hive_status/alpha(), XENO_HIVE_BRAVO = new /datum/hive_status/bravo(), XENO_HIVE_CHARLIE = new /datum/hive_status/charlie(), @@ -182,7 +183,6 @@ GLOBAL_LIST_INIT_TYPED(hive_datum, /datum/hive_status, list( XENO_HIVE_MUTATED = new /datum/hive_status/mutated(), XENO_HIVE_FORSAKEN = new /datum/hive_status/forsaken(), XENO_HIVE_YAUTJA = new /datum/hive_status/yautja(), - XENO_HIVE_RENEGADE = new /datum/hive_status/corrupted/renegade(), XENO_HIVE_TUTORIAL = new /datum/hive_status/tutorial() ))