From 80af14e5ee288c25d417285968aa26665eb5f40a Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:00:56 -0700 Subject: [PATCH 01/38] Update egg_morpher.dm --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index e24ff8d167d8..2b622614abc3 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -44,6 +44,8 @@ . = ..() if(isxeno(user) || isobserver(user)) . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." + if(isobserver(user)) + . += "Current facehugger limit: [current_hugger_count]/[playable_hugger_limit]" /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/grab)) From 05de1c49fa5e318e48e083d618f66ebdc415e3e2 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:03:41 -0700 Subject: [PATCH 02/38] Update egg.dm --- code/modules/cm_aliens/structures/egg.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 889359bb7eef..75d2d2ba923d 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -55,6 +55,8 @@ . = ..() if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." + if(isobserver(user) && status == EGG_GROWN) + . += "Current facehugger limit: [current_hugger_count]/[playable_hugger_limit]" /obj/effect/alien/egg/attack_alien(mob/living/carbon/xenomorph/M) if(status == EGG_BURST || status == EGG_DESTROYED) From c48f8871df2be72bdeb6e8512a40a9dad4d389fe Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:21:45 -0700 Subject: [PATCH 03/38] beagle fixed it for me <3 --- code/modules/cm_aliens/structures/egg.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 75d2d2ba923d..0612ca00607d 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,6 +56,7 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) + var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [current_hugger_count]/[playable_hugger_limit]" /obj/effect/alien/egg/attack_alien(mob/living/carbon/xenomorph/M) From 59baeeadc25d5c92100a70c7f73b789441f47a1f Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:22:52 -0700 Subject: [PATCH 04/38] thx beagle --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 2b622614abc3..71676f526dd2 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -45,6 +45,7 @@ if(isxeno(user) || isobserver(user)) . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) + var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [current_hugger_count]/[playable_hugger_limit]" /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) From 6f95d7357e9836b4df70922c78585c230e70801d Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:26:44 -0700 Subject: [PATCH 05/38] woops my bad --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 0612ca00607d..54908d058e4f 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -57,7 +57,7 @@ . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] - . += "Current facehugger limit: [current_hugger_count]/[playable_hugger_limit]" + . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/egg/attack_alien(mob/living/carbon/xenomorph/M) if(status == EGG_BURST || status == EGG_DESTROYED) From 202ac1b805978e6fc56af584893b195360893c30 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 20:27:55 -0700 Subject: [PATCH 06/38] second file fix From ba0b6a02af8d902377b8fec4ff12dcc0ff713ee2 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 21:01:01 -0700 Subject: [PATCH 07/38] test --- code/modules/cm_aliens/structures/egg.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 54908d058e4f..d711e68a1f83 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,6 +56,7 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) + #include "code/modules/mob/living/carbon/xenomorph/hive_status.dm" var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" From 3b59f77cf4f8492a7423cd49001aa877a9b71562 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 21:03:57 -0700 Subject: [PATCH 08/38] test --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index d711e68a1f83..c0b0c8475cb3 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,7 +56,7 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) - #include "code/modules/mob/living/carbon/xenomorph/hive_status.dm" + #include "cmss13/code/modules/mob/living/carbon/xenomorph/hive_status.dm" var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" From 6ba4c20f388bebf695219330891b6c9d448b951b Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 21:12:18 -0700 Subject: [PATCH 09/38] test --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index c0b0c8475cb3..cc4392ebcc6e 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,7 +56,7 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) - #include "cmss13/code/modules/mob/living/carbon/xenomorph/hive_status.dm" + #include "../mob/living/carbon/xenomorph/hive_status.dm" var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" From da9cad45178abc6c4cec88b1905ff94dfe510c7a Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 21:22:36 -0700 Subject: [PATCH 10/38] test --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index cc4392ebcc6e..123f5dccf03e 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,7 +56,7 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) - #include "../mob/living/carbon/xenomorph/hive_status.dm" + #include "../../../mob/living/carbon/xenomorph/hive_status.dm" var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" From b67ef84f37baf4d727a71de1923fbe22a11375c3 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 21:28:32 -0700 Subject: [PATCH 11/38] test --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 123f5dccf03e..d711e68a1f83 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,7 +56,7 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) - #include "../../../mob/living/carbon/xenomorph/hive_status.dm" + #include "code/modules/mob/living/carbon/xenomorph/hive_status.dm" var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" From d71598ea59352713b93e24c492d2b5517f8d39cc Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 21:37:13 -0700 Subject: [PATCH 12/38] test --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 71676f526dd2..0a2b4b8815ce 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -45,6 +45,7 @@ if(isxeno(user) || isobserver(user)) . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) + #include "code/modules/mob/living/carbon/xenomorph/hive_status.dm" var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [current_hugger_count]/[playable_hugger_limit]" From d1e242132f2d9c55b299319ecb1a4ff1810a1723 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 23:04:31 -0700 Subject: [PATCH 13/38] test --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index d711e68a1f83..ae5762b28ca2 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,7 +56,7 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) - #include "code/modules/mob/living/carbon/xenomorph/hive_status.dm" + #include "code\modules\mob\living\carbon\xenomorph\hive_status.dm" var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" From 6c7f3158a2e756b6f00ee4519c43f873b83a693a Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 23:05:10 -0700 Subject: [PATCH 14/38] test --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 0a2b4b8815ce..b7f2034d47a0 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -45,7 +45,7 @@ if(isxeno(user) || isobserver(user)) . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) - #include "code/modules/mob/living/carbon/xenomorph/hive_status.dm" + #include "code\modules\mob\living\carbon\xenomorph\hive_status.dm" var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [current_hugger_count]/[playable_hugger_limit]" From fd58c9ae9aaa1255606937694a55748b0a4e63ab Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 23:45:24 -0700 Subject: [PATCH 15/38] test --- code/modules/cm_aliens/structures/egg.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index ae5762b28ca2..4a2b15098a12 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,7 +56,10 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) - #include "code\modules\mob\living\carbon\xenomorph\hive_status.dm" + var/current_hugger_count = 0 + for(var/mob/mob as anything in totalXenos) + if(isfacehugger(mob)) + current_hugger_count++ var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" From 53a613c9b34a387d6a8e359d6874516510d208bc Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 5 Jun 2024 23:46:44 -0700 Subject: [PATCH 16/38] test --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index b7f2034d47a0..217af1d96490 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -45,9 +45,12 @@ if(isxeno(user) || isobserver(user)) . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) - #include "code\modules\mob\living\carbon\xenomorph\hive_status.dm" + var/current_hugger_count = 0 + for(var/mob/mob as anything in totalXenos) + if(isfacehugger(mob)) + current_hugger_count++ var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] - . += "Current facehugger limit: [current_hugger_count]/[playable_hugger_limit]" + . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/grab)) From d5f24d485bb525fd03ab8db2073ed33ef42ae9e5 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 00:27:26 -0700 Subject: [PATCH 17/38] test --- code/modules/mob/living/carbon/xenomorph/hive_status.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index e7e1fab0dd45..342ba1816c42 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -1,3 +1,5 @@ +var/current_hugger_count = 0 + /datum/hive_status var/name = "Normal Hive" @@ -858,7 +860,6 @@ update_hugger_limit() - var/current_hugger_count = 0 for(var/mob/mob as anything in totalXenos) if(isfacehugger(mob)) current_hugger_count++ From 1e4bf93776b9a9aad41382df6ea8b1729ffddcce Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 00:28:46 -0700 Subject: [PATCH 18/38] test --- code/modules/cm_aliens/structures/egg.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 4a2b15098a12..54908d058e4f 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,10 +56,6 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) - var/current_hugger_count = 0 - for(var/mob/mob as anything in totalXenos) - if(isfacehugger(mob)) - current_hugger_count++ var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" From a1a8ac344c12bcefd736b3689c64088ec8ac2000 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 00:29:32 -0700 Subject: [PATCH 19/38] test --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 217af1d96490..43721dc4f429 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -45,10 +45,6 @@ if(isxeno(user) || isobserver(user)) . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) - var/current_hugger_count = 0 - for(var/mob/mob as anything in totalXenos) - if(isfacehugger(mob)) - current_hugger_count++ var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" From 4c9a5fd064a07071604d5cac920620949f3f0c1f Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 00:34:21 -0700 Subject: [PATCH 20/38] test --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 43721dc4f429..442afde6b437 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -45,7 +45,6 @@ if(isxeno(user) || isobserver(user)) . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) - var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) From 0b124f468e8432d39354fe5495df17bb87e58bd5 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 00:36:44 -0700 Subject: [PATCH 21/38] test --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 442afde6b437..2b622614abc3 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -45,7 +45,7 @@ if(isxeno(user) || isobserver(user)) . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) - . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" + . += "Current facehugger limit: [current_hugger_count]/[playable_hugger_limit]" /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/grab)) From 3b23941d58dfcda1a24939ecf83c2db8df9c22ac Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 00:40:06 -0700 Subject: [PATCH 22/38] test --- code/modules/mob/living/carbon/xenomorph/hive_status.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index 342ba1816c42..6503c3500cf5 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -1,4 +1,6 @@ var/current_hugger_count = 0 +/// How many huggers can the hive support +var/playable_hugger_limit = 0 /datum/hive_status var/name = "Normal Hive" @@ -116,8 +118,6 @@ var/current_hugger_count = 0 //Joining as Facehugger vars /// When can huggers join the round var/hugger_timelock = 15 MINUTES - /// How many huggers can the hive support - var/playable_hugger_limit = 0 /// Minimum number of huggers available at any hive size var/playable_hugger_minimum = 2 /// This number divides the total xenos counted for slots to give the max number of facehuggers From 5d2090e18cea3b14a7f930992fb52889e4883944 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:24:51 -0700 Subject: [PATCH 23/38] test --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 54908d058e4f..e8db7ce6397d 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,7 +56,7 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) - var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] + var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL] . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/egg/attack_alien(mob/living/carbon/xenomorph/M) From e4d017bec51838782fe45245e6b6b3f9edba599a Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:27:52 -0700 Subject: [PATCH 24/38] test --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 2b622614abc3..29b3b4c865d6 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -45,7 +45,8 @@ if(isxeno(user) || isobserver(user)) . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) - . += "Current facehugger limit: [current_hugger_count]/[playable_hugger_limit]" + var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL] + . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/grab)) From 7bf1a91751f99259b366e097e839bd2d7875a61b Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:35:43 -0700 Subject: [PATCH 25/38] revert --- code/modules/mob/living/carbon/xenomorph/hive_status.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index 6503c3500cf5..e7e1fab0dd45 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -1,7 +1,3 @@ -var/current_hugger_count = 0 -/// How many huggers can the hive support -var/playable_hugger_limit = 0 - /datum/hive_status var/name = "Normal Hive" @@ -118,6 +114,8 @@ var/playable_hugger_limit = 0 //Joining as Facehugger vars /// When can huggers join the round var/hugger_timelock = 15 MINUTES + /// How many huggers can the hive support + var/playable_hugger_limit = 0 /// Minimum number of huggers available at any hive size var/playable_hugger_minimum = 2 /// This number divides the total xenos counted for slots to give the max number of facehuggers @@ -860,6 +858,7 @@ var/playable_hugger_limit = 0 update_hugger_limit() + var/current_hugger_count = 0 for(var/mob/mob as anything in totalXenos) if(isfacehugger(mob)) current_hugger_count++ From 5e378809bd3c21b25f50a18dbf2d63c48bda1a04 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 15:54:33 -0700 Subject: [PATCH 26/38] test --- code/modules/mob/living/carbon/xenomorph/hive_status.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index e7e1fab0dd45..136850357754 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -874,6 +874,14 @@ return TRUE +/datum/hive_status/proc/get_current_playable_facehugger_count() + var/count = 0 + for(var/mob/mob as anything in totalXenos) + if(isfacehugger(mob)) + count++ + return count +endproc + /datum/hive_status/proc/spawn_as_hugger(mob/dead/observer/user, atom/A) var/mob/living/carbon/xenomorph/facehugger/hugger = new /mob/living/carbon/xenomorph/facehugger(A.loc, null, hivenumber) user.mind.transfer_to(hugger, TRUE) From d6cd6be31a037a01046086c1dee43feb6db6edc1 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:00:29 -0700 Subject: [PATCH 27/38] test --- code/modules/cm_aliens/structures/egg.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index e8db7ce6397d..2b235d1af86b 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -57,7 +57,8 @@ . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL] - . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" + var/current_hugger_count = get_current_facehugger_count(); + . += "Current facehugger limit: [current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/egg/attack_alien(mob/living/carbon/xenomorph/M) if(status == EGG_BURST || status == EGG_DESTROYED) From f2b628fd9286bfbaa8c7302fa73d2c9b29d0260f Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:03:12 -0700 Subject: [PATCH 28/38] test --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 29b3b4c865d6..9aa3c1a4d535 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -46,7 +46,8 @@ . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL] - . += "Current facehugger limit: [hive.current_hugger_count]/[hive.playable_hugger_limit]" + var/current_hugger_count = hive.get_current_facehugger_count(); + . += "Current facehugger limit: [current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/grab)) From 6f695c8dfe87f72739e6288baa6f1d87d73f5452 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:04:11 -0700 Subject: [PATCH 29/38] test --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 2b235d1af86b..9057718a4fb9 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -57,7 +57,7 @@ . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL] - var/current_hugger_count = get_current_facehugger_count(); + var/current_hugger_count = hive.get_current_facehugger_count(); . += "Current facehugger limit: [current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/egg/attack_alien(mob/living/carbon/xenomorph/M) From 190cd67d060f306293609ccecef9ad36317f563e Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:04:58 -0700 Subject: [PATCH 30/38] test --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 9057718a4fb9..7d7a6f7c7847 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -57,7 +57,7 @@ . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL] - var/current_hugger_count = hive.get_current_facehugger_count(); + var/current_hugger_count = hive.get_current_playable_facehugger_count(); . += "Current facehugger limit: [current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/egg/attack_alien(mob/living/carbon/xenomorph/M) From 669dc838819fa0296369f8690ab37592eb8ca8d3 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:05:32 -0700 Subject: [PATCH 31/38] test --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 9aa3c1a4d535..130e875f2a0c 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -46,7 +46,7 @@ . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL] - var/current_hugger_count = hive.get_current_facehugger_count(); + var/current_hugger_count = hive.get_current_playable_facehugger_count(); . += "Current facehugger limit: [current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) From 31177ba137b6ba8ae9628214a08dd8d903a2d258 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:09:33 -0700 Subject: [PATCH 32/38] fix --- .../modules/mob/living/carbon/xenomorph/hive_status.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index 136850357754..0e16dbe1067f 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -875,11 +875,11 @@ return TRUE /datum/hive_status/proc/get_current_playable_facehugger_count() - var/count = 0 - for(var/mob/mob as anything in totalXenos) - if(isfacehugger(mob)) - count++ - return count + var/count = 0 + for(var/mob/mob as anything in totalXenos) + if(isfacehugger(mob)) + count++ + return count endproc /datum/hive_status/proc/spawn_as_hugger(mob/dead/observer/user, atom/A) From ffc89532c268367a55971102cc7c8017c542c389 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 8 Jun 2024 00:46:10 -0700 Subject: [PATCH 33/38] harry review! Co-authored-by: harryob <55142896+harryob@users.noreply.github.com> --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 7d7a6f7c7847..2f82b40a092d 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -56,7 +56,7 @@ if(isxeno(user) && status == EGG_GROWN) . += "Ctrl + Click egg to retrieve child into your empty hand if you can carry it." if(isobserver(user) && status == EGG_GROWN) - var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL] + var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] var/current_hugger_count = hive.get_current_playable_facehugger_count(); . += "Current facehugger limit: [current_hugger_count]/[hive.playable_hugger_limit]" From 4d32325bafd970146ac7df98bccc475cb31d2765 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 8 Jun 2024 00:46:24 -0700 Subject: [PATCH 34/38] harry review! Co-authored-by: harryob <55142896+harryob@users.noreply.github.com> --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 130e875f2a0c..b301445bb802 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -45,8 +45,7 @@ if(isxeno(user) || isobserver(user)) . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) - var/datum/hive_status/hive = GLOB.hive_datum[XENO_HIVE_NORMAL] - var/current_hugger_count = hive.get_current_playable_facehugger_count(); + var/current_hugger_count = linked_hive.get_current_playable_facehugger_count(); . += "Current facehugger limit: [current_hugger_count]/[hive.playable_hugger_limit]" /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) From 4105f6cbf3bef662c4c1bec07adfd055ca1df3e8 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 8 Jun 2024 00:46:35 -0700 Subject: [PATCH 35/38] harry review! Co-authored-by: harryob <55142896+harryob@users.noreply.github.com> --- code/modules/mob/living/carbon/xenomorph/hive_status.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/carbon/xenomorph/hive_status.dm b/code/modules/mob/living/carbon/xenomorph/hive_status.dm index 0e16dbe1067f..4782bcd8b288 100644 --- a/code/modules/mob/living/carbon/xenomorph/hive_status.dm +++ b/code/modules/mob/living/carbon/xenomorph/hive_status.dm @@ -880,7 +880,6 @@ if(isfacehugger(mob)) count++ return count -endproc /datum/hive_status/proc/spawn_as_hugger(mob/dead/observer/user, atom/A) var/mob/living/carbon/xenomorph/facehugger/hugger = new /mob/living/carbon/xenomorph/facehugger(A.loc, null, hivenumber) From a98f23412494a4a01e511ea2d929d5852994f74a Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Sat, 8 Jun 2024 00:51:30 -0700 Subject: [PATCH 36/38] testing fix --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index b301445bb802..2f260dcc8e0f 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -46,7 +46,7 @@ . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) var/current_hugger_count = linked_hive.get_current_playable_facehugger_count(); - . += "Current facehugger limit: [current_hugger_count]/[hive.playable_hugger_limit]" + . += "Current facehugger limit: [current_hugger_count]/[linked_hive.playable_hugger_limit]" /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/grab)) From 70c49cd1eacf00da22d489ca8bc49c5872cb6664 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 19 Jun 2024 16:26:38 -0700 Subject: [PATCH 37/38] drulikar review, thanks for the reviews both of you Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/cm_aliens/structures/egg.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/egg.dm b/code/modules/cm_aliens/structures/egg.dm index 2f82b40a092d..4e22f1b5e6ba 100644 --- a/code/modules/cm_aliens/structures/egg.dm +++ b/code/modules/cm_aliens/structures/egg.dm @@ -58,7 +58,7 @@ if(isobserver(user) && status == EGG_GROWN) var/datum/hive_status/hive = GLOB.hive_datum[hivenumber] var/current_hugger_count = hive.get_current_playable_facehugger_count(); - . += "Current facehugger limit: [current_hugger_count]/[hive.playable_hugger_limit]" + . += "There are currently [SPAN_NOTICE("[current_hugger_count]")] facehuggers in the hive. The hive can support [SPAN_NOTICE("[hive.playable_hugger_limit]")] facehuggers." /obj/effect/alien/egg/attack_alien(mob/living/carbon/xenomorph/M) if(status == EGG_BURST || status == EGG_DESTROYED) From b7dab23b04d60008384982ea1b2a8a6bbe3ec629 Mon Sep 17 00:00:00 2001 From: zzzmike <85382350+zzzmike@users.noreply.github.com> Date: Wed, 19 Jun 2024 16:26:54 -0700 Subject: [PATCH 38/38] drulikar review, thanks for the reviews both of you Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/cm_aliens/structures/special/egg_morpher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_aliens/structures/special/egg_morpher.dm b/code/modules/cm_aliens/structures/special/egg_morpher.dm index 2f260dcc8e0f..32cf0ee591b5 100644 --- a/code/modules/cm_aliens/structures/special/egg_morpher.dm +++ b/code/modules/cm_aliens/structures/special/egg_morpher.dm @@ -46,7 +46,7 @@ . += "It has [stored_huggers] facehuggers within, with [huggers_to_grow] more to grow (reserved: [huggers_reserved])." if(isobserver(user)) var/current_hugger_count = linked_hive.get_current_playable_facehugger_count(); - . += "Current facehugger limit: [current_hugger_count]/[linked_hive.playable_hugger_limit]" + . += "There are currently [SPAN_NOTICE("[current_hugger_count]")] facehuggers in the hive. The hive can support [SPAN_NOTICE("[linked_hive.playable_hugger_limit]")] facehuggers." /obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user) if(istype(I, /obj/item/grab))