From 0e616ab2e181141ab08dabbbcdb2737d8638aa8a Mon Sep 17 00:00:00 2001 From: cadyn <35672377+cadyn@users.noreply.github.com> Date: Sat, 21 Nov 2020 08:21:29 -0800 Subject: [PATCH 1/2] Using the Global Vars system for queen_amount :v --- .../mob/living/simple_mob/subtypes/metroid/metTypes.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm b/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm index 1d1e15caf7..874b2ac051 100644 --- a/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm @@ -1,4 +1,4 @@ -var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. +GLOBAL_VAR_INIT(queen_amount, 0) //We only gonna want 1 queen in the world. /* //All the REAL types of metroids! @@ -619,12 +619,12 @@ var/global/list/queen_amount = 0 //We only gonna want 1 queen in the world. /mob/living/simple_mob/metroid/juvenile/queen/Initialize() playsound(src, 'sound/metroid/metroidqueen.ogg', 100, 1) - queen_amount++ + GLOB.queen_amount++ ..() /mob/living/simple_mob/metroid/juvenile/queen/death() playsound(src, 'sound/metroid/metroidqueendeath.ogg', 100, 1) - queen_amount-- + GLOB.queen_amount-- ..() /mob/living/simple_mob/metroid/juvenile/queen //active noms From 01f889774e77187e8ad7ba71365807dcfa27d22e Mon Sep 17 00:00:00 2001 From: cadyn <35672377+cadyn@users.noreply.github.com> Date: Sat, 21 Nov 2020 08:24:35 -0800 Subject: [PATCH 2/2] Changing it here too --- .../mob/living/simple_mob/subtypes/metroid/metJuvenile.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_mob/subtypes/metroid/metJuvenile.dm b/code/modules/mob/living/simple_mob/subtypes/metroid/metJuvenile.dm index 54b30ab564..c95d9af9d7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/metroid/metJuvenile.dm +++ b/code/modules/mob/living/simple_mob/subtypes/metroid/metJuvenile.dm @@ -65,7 +65,7 @@ return if(nutrition >= evo_point && !buckled && vore_fullness == 0 && !victim) - if(next == "/mob/living/simple_mob/metroid/juvenile/queen" && queen_amount > 0) + if(next == "/mob/living/simple_mob/metroid/juvenile/queen" && GLOB.queen_amount > 0) to_chat(src, span("warning", "There is already a queen.")) return playsound(src, 'sound/metroid/metroidgrow.ogg', 50, 1)