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

Carrier Eggsac Strain can now place eggs on Regular Weeds, Egg range Bugfix, and QOL notification for Egg generation #3891

Merged
merged 16 commits into from
Jul 25, 2023

Conversation

Ben10083
Copy link
Contributor

@Ben10083 Ben10083 commented Jul 14, 2023

About the pull request

Eggsac Strain can now place eggs on regular weeds instead of only hive weeds, notified when they generate an egg, and fixes #3869

Explain why it's good for the game

The eggsac strain is designed to be a mobile egg factory, able to place eggs closer to front for player huggers/general captures. However with limitations on only hiveweeds, it really limited the ability of the eggsac strain to utilize their strain's abilities, and the risk of losing a egg to marines forced them to stay at hive, making it a unpopular pick. This gives more purpose to the eggsac, allowing them to place eggs much closer to frontline for ghosts to spawn into/general captures, as well as an improv trap for approaching marines. They still have the risk of giving eggs to marines however, which I feel balances out this buff. Also bugs bad

Testing Photographs and Procedure

Things I have tested:

  • Carrier no strain range at 1
  • Carrier Eggsac strain range at 3
  • Drone has appropriate egg range
  • Queen ovi has longer egg plant range
  • Queen deovi back to basic 1 egg plant range

Changelog

🆑
balance: Carriers with Eggsac strain can now place eggs on regular weeds.
fix: Extra egg planting range now properly applied for Eggsac strain and Queen on ovi
qol: Eggsac Carriers now notified when they generate a egg.
code: new variable to xenomorphs to dictate egg planting distance, and removal of unused procs
/:cl:

@github-actions github-actions bot added the Balance You need to be a professional veteran game maintainer to comprehend what is being done here. label Jul 14, 2023
@Ben10083 Ben10083 changed the title Carrier Eggsac Strain can now place eggs on Regular Weeds Carrier Eggsac Strain can now place eggs on Regular Weeds, Egg range Bugfix, and QOL notification for Egg generation Jul 14, 2023
@Diegoflores31
Copy link
Contributor

while looking at this any chance the egg generation cooldown is reduced a little ? its comically slow currently

@Ben10083
Copy link
Contributor Author

while looking at this any chance the egg generation cooldown is reduced a little ? its comically slow currently

I am sure it can be done, but I don't want to expand the scope of this pr anymore

code/modules/mob/living/carbon/xenomorph/Xenomorph.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/egg_item.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/egg_item.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/egg_item.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft July 18, 2023 20:37
@Ben10083 Ben10083 marked this pull request as ready for review July 18, 2023 22:30
@Ben10083 Ben10083 requested a review from harryob July 18, 2023 23:11
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 24, 2023
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code looks fine just resolve ur conflicts

@harryob harryob enabled auto-merge July 24, 2023 22:38
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Jul 24, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@harryob harryob added this pull request to the merge queue Jul 24, 2023
Merged via the queue into cmss13-devs:master with commit 4b3140e Jul 25, 2023
25 checks passed
@Ben10083 Ben10083 deleted the Carrier_Egg_RegWeed branch July 25, 2023 01:55
cm13-github added a commit that referenced this pull request Jul 25, 2023
github-actions bot added a commit that referenced this pull request Jul 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance You need to be a professional veteran game maintainer to comprehend what is being done here.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Eggsac Carrier/Ovi Queen Egg Planting Range
4 participants