cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-31 01:00:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #885 from CHOMPStation2/cadyn-patch-2

Browse Source 
Tweaking metroids a bit
This commit is contained in:
Razgriz
2020-11-21 11:42:18 -07:00
committed by GitHub
parent 0f8b250789 01f889774e
commit 6c041d67d9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_mob/subtypes/metroid/metJuvenile.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/simple_mob/subtypes/metroid/metTypes.dm
+3 -3
View File
@@ -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