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.

Sign up for GitHub

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

Jump to bottom

Clarity for facehugger/drone text #6577

Merged
merged 8 commits into from
Jul 3, 2024
Merged

Clarity for facehugger/drone text #6577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
930ce0a
Update egg.dm
zzzmike Jun 27, 2024
557d88a
Update egg_morpher.dm
zzzmike Jun 27, 2024
445499c
Update egg.dm
zzzmike Jun 27, 2024
168416a
Update egg_morpher.dm
zzzmike Jun 27, 2024
0092206
Merge branch 'master' into patch-2
harryob Jun 27, 2024
e259bad
Update pylon_core.dm
zzzmike Jun 28, 2024
ab6af5d
Merge branch 'master' into patch-2
zzzmike Jun 28, 2024
243e674
Update pylon_core.dm
zzzmike Jun 28, 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
2 changes: 1 addition & 1 deletion code/modules/cm_aliens/structures/egg.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
. += "There are currently [SPAN_NOTICE("[current_hugger_count]")] facehuggers in the hive. The hive can support [SPAN_NOTICE("[hive.playable_hugger_limit]")] facehuggers."
. += "There are currently [SPAN_NOTICE("[current_hugger_count]")] facehuggers in the hive. The hive can support a total of [SPAN_NOTICE("[hive.playable_hugger_limit]")] facehuggers at present."

/obj/effect/alien/egg/attack_alien(mob/living/carbon/xenomorph/M)
if(status == EGG_BURST || status == EGG_DESTROYED)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_aliens/structures/special/egg_morpher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
. += "There are currently [SPAN_NOTICE("[current_hugger_count]")] facehuggers in the hive. The hive can support [SPAN_NOTICE("[linked_hive.playable_hugger_limit]")] facehuggers."
. += "There are currently [SPAN_NOTICE("[current_hugger_count]")] facehuggers in the hive. The hive can support a total of [SPAN_NOTICE("[linked_hive.playable_hugger_limit]")] facehuggers at present."

/obj/effect/alien/resin/special/eggmorph/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/grab))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_aliens/structures/special/pylon_core.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
lesser_count++

. += "Currently holding [SPAN_NOTICE("[floor(lesser_drone_spawns)]")]/[SPAN_NOTICE("[lesser_drone_spawn_limit]")] lesser drones."
. += "There are currently [SPAN_NOTICE("[lesser_count]")] lesser drones in the hive. The hive can support [SPAN_NOTICE("[linked_hive.lesser_drone_limit]")] lesser drones."
. += "There are currently [SPAN_NOTICE("[lesser_count]")] lesser drones in the hive. The hive can support a total of [SPAN_NOTICE("[linked_hive.lesser_drone_limit]")] lesser drones at present."

/obj/effect/alien/resin/special/pylon/attack_ghost(mob/dead/observer/user)
. = ..()
Expand Down
Loading