Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show facehugger limit when examining eggs/morphers #6386

Merged
merged 41 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
80af14e
Update egg_morpher.dm
zzzmike Jun 6, 2024
05de1c4
Update egg.dm
zzzmike Jun 6, 2024
c48f887
beagle fixed it for me <3
zzzmike Jun 6, 2024
59baeea
thx beagle
zzzmike Jun 6, 2024
6f95d73
woops my bad
zzzmike Jun 6, 2024
202ac1b
second file fix
zzzmike Jun 6, 2024
ba0b6a0
test
zzzmike Jun 6, 2024
3b59f77
test
zzzmike Jun 6, 2024
6ba4c20
test
zzzmike Jun 6, 2024
da9cad4
test
zzzmike Jun 6, 2024
b67ef84
test
zzzmike Jun 6, 2024
d71598e
test
zzzmike Jun 6, 2024
d1e2421
test
zzzmike Jun 6, 2024
6c7f315
test
zzzmike Jun 6, 2024
fd58c9a
test
zzzmike Jun 6, 2024
53a613c
test
zzzmike Jun 6, 2024
d5f24d4
test
zzzmike Jun 6, 2024
1e4bf93
test
zzzmike Jun 6, 2024
a1a8ac3
test
zzzmike Jun 6, 2024
4c9a5fd
test
zzzmike Jun 6, 2024
0b124f4
test
zzzmike Jun 6, 2024
3b23941
test
zzzmike Jun 6, 2024
5d2090e
test
zzzmike Jun 6, 2024
e4d017b
test
zzzmike Jun 6, 2024
30f78fa
Merge branch 'master' into patch-2
zzzmike Jun 6, 2024
7bf1a91
revert
zzzmike Jun 6, 2024
5e37880
test
zzzmike Jun 6, 2024
d6cd6be
test
zzzmike Jun 6, 2024
f2b628f
test
zzzmike Jun 6, 2024
6f695c8
test
zzzmike Jun 6, 2024
190cd67
test
zzzmike Jun 6, 2024
669dc83
test
zzzmike Jun 6, 2024
31177ba
fix
zzzmike Jun 6, 2024
ffc8953
harry review!
zzzmike Jun 8, 2024
4d32325
harry review!
zzzmike Jun 8, 2024
4105f6c
harry review!
zzzmike Jun 8, 2024
a98f234
testing fix
zzzmike Jun 8, 2024
9f9370c
Merge branch 'master' into patch-2
zzzmike Jun 8, 2024
70c49cd
drulikar review, thanks for the reviews both of you
zzzmike Jun 19, 2024
b7dab23
drulikar review, thanks for the reviews both of you
zzzmike Jun 19, 2024
6210ca5
Merge branch 'master' into patch-2
zzzmike Jun 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/modules/cm_aliens/structures/egg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,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)
var/datum/hive_status/hive = GLOB.hive_datum[hivenumber]
var/current_hugger_count = hive.get_current_playable_facehugger_count();
. += "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)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/cm_aliens/structures/special/egg_morpher.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
. = ..()
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 = linked_hive.get_current_playable_facehugger_count();
. += "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))
Expand Down
7 changes: 7 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/hive_status.dm
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,13 @@

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

/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)
Expand Down
Loading