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

Icemoon Ruin: SRM Ice Lodge #3291

Merged
merged 61 commits into from
Oct 16, 2024
Merged

Icemoon Ruin: SRM Ice Lodge #3291

merged 61 commits into from
Oct 16, 2024

Conversation

Gristlebee
Copy link
Contributor

@Gristlebee Gristlebee commented Aug 13, 2024

About The Pull Request

Adds a new ruin, the Ice Lodge! Formerly an SRM settlement, Frontiersmen have since come in and taken it over for their own use.

Screenshots (Updated as of 05/09)

image

image

icelodgenew

Adds two new Frontiersmen mobs based off the new roles, flametroopers and surgeons.
Flametroopers will rush enemies and spray fire at their enemies.
Surgeons will fire syringes and attempt to sedate their enemies.

Modifies fireline code to support igniting tiles as an option.
Adds a var to hostile mob AI, shoot_point_blank. If enabled ranged mobs can shoot their guns at melee range instead of melee attacking if possible.

Deletes the cat butcher since the Surgeon fills the same niche and being much less questionable.

Fences no longer call update fence status on initialize. All this did was make closed fence doors spawn open and open fence doors spawn closed.

Adds gunpowder barrels, broken display cases and random chemical jug spawners, SRM corpse spawners for use in the ruin.

Adds a var for bullets, grown items, and nutrient bottles (auto_scatter) so you can choose whether they scatter on initialize.

Fixes the pathing for some internals pathed frontiersmen simple mobs.

Why It's Good For The Game

New ruins are good and the new frontiersmen simple mobs will hopefully diversify the enemy roster nicely. The cat butcher is cruft, and won't be missed.

Changelog

🆑
add: Ice Lodge Ruin Map and areas
add: Simple Mob Frontiersmen Flametrooper and Surgeon
add: shoot_point_blank option for simple mobs
add: dragon_fire_line supports igniting tiles
add: broken display case, gunpowder barrel, SRM corpse spawners, chemical jug spawners
del: Cat Butcher
fix: Frontiersmen simplemob pathing
fix: Fence doors spawning open when they should be closed and vice versa
code: scattering can be disabled with auto_scatter var for bullets, grown items and nutrient bottles
/:cl:

Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 21, 2024
craftxbox pushed a commit to craftxbox/shiptest that referenced this pull request Sep 24, 2024
Signed-off-by: Theos <[email protected]>
@SomeguyManperson
Copy link
Contributor

Map needs to be updated with new knife paths

@Gristlebee
Copy link
Contributor Author

knife paths are updated

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 12, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 12, 2024
Copy link
Contributor

@meemofcourse meemofcourse left a comment

Choose a reason for hiding this comment

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

yup

@goober3 goober3 added this pull request to the merge queue Oct 16, 2024
@goober3
Copy link
Member

goober3 commented Oct 16, 2024

this seems good to go

Merged via the queue into shiptest-ss13:master with commit ac84b9c Oct 16, 2024
14 checks passed
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Adds a new ruin, the Ice Lodge! Formerly an SRM settlement, Frontiersmen
have since come in and taken it over for their own use.

<details>
<summary>Screenshots (Updated as of 05/09)</summary>
<br>


![image](https://github.com/user-attachments/assets/d950e34e-baa2-4f38-89fa-ff967b52a088)



![image](https://github.com/user-attachments/assets/937f68f9-84b3-4958-9996-78a397a0f70a)


![icelodgenew](https://github.com/user-attachments/assets/dc34a037-ba30-473b-ba31-6bfab0befdce)


</details>

Adds two new Frontiersmen mobs based off the new roles, flametroopers
and surgeons.
Flametroopers will rush enemies and spray fire at their enemies.
Surgeons will fire syringes and attempt to sedate their enemies.

Modifies fireline code to support igniting tiles as an option.
Adds a var to hostile mob AI, shoot_point_blank. If enabled ranged mobs
can shoot their guns at melee range instead of melee attacking if
possible.

Deletes the cat butcher since the Surgeon fills the same niche and being
much less questionable.

Fences no longer call update fence status on initialize. All this did
was make closed fence doors spawn open and open fence doors spawn
closed.

Adds gunpowder barrels, broken display cases and random chemical jug
spawners, SRM corpse spawners for use in the ruin.

Adds a var for bullets, grown items, and nutrient bottles (auto_scatter)
so you can choose whether they scatter on initialize.

Fixes the pathing for some internals pathed frontiersmen simple mobs.

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->
New ruins are good and the new frontiersmen simple mobs will hopefully
diversify the enemy roster nicely. The cat butcher is cruft, and won't
be missed.
## Changelog

:cl:
add: Ice Lodge Ruin Map and areas
add: Simple Mob Frontiersmen Flametrooper and Surgeon
add: shoot_point_blank option for simple mobs
add: dragon_fire_line supports igniting tiles
add: broken display case, gunpowder barrel, SRM corpse spawners,
chemical jug spawners
del: Cat Butcher
fix: Frontiersmen simplemob pathing
fix: Fence doors spawning open when they should be closed and vice versa
code: scattering can be disabled with auto_scatter var for bullets,
grown items and nutrient bottles
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Theos <[email protected]>
Co-authored-by: Theos <[email protected]>
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Adds a new ruin, the Ice Lodge! Formerly an SRM settlement, Frontiersmen
have since come in and taken it over for their own use.

<details>
<summary>Screenshots (Updated as of 05/09)</summary>
<br>


![image](https://github.com/user-attachments/assets/d950e34e-baa2-4f38-89fa-ff967b52a088)



![image](https://github.com/user-attachments/assets/937f68f9-84b3-4958-9996-78a397a0f70a)


![icelodgenew](https://github.com/user-attachments/assets/dc34a037-ba30-473b-ba31-6bfab0befdce)


</details>

Adds two new Frontiersmen mobs based off the new roles, flametroopers
and surgeons.
Flametroopers will rush enemies and spray fire at their enemies.
Surgeons will fire syringes and attempt to sedate their enemies.

Modifies fireline code to support igniting tiles as an option.
Adds a var to hostile mob AI, shoot_point_blank. If enabled ranged mobs
can shoot their guns at melee range instead of melee attacking if
possible.

Deletes the cat butcher since the Surgeon fills the same niche and being
much less questionable.

Fences no longer call update fence status on initialize. All this did
was make closed fence doors spawn open and open fence doors spawn
closed.

Adds gunpowder barrels, broken display cases and random chemical jug
spawners, SRM corpse spawners for use in the ruin.

Adds a var for bullets, grown items, and nutrient bottles (auto_scatter)
so you can choose whether they scatter on initialize.

Fixes the pathing for some internals pathed frontiersmen simple mobs.

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->
New ruins are good and the new frontiersmen simple mobs will hopefully
diversify the enemy roster nicely. The cat butcher is cruft, and won't
be missed.
## Changelog

:cl:
add: Ice Lodge Ruin Map and areas
add: Simple Mob Frontiersmen Flametrooper and Surgeon
add: shoot_point_blank option for simple mobs
add: dragon_fire_line supports igniting tiles
add: broken display case, gunpowder barrel, SRM corpse spawners,
chemical jug spawners
del: Cat Butcher
fix: Frontiersmen simplemob pathing
fix: Fence doors spawning open when they should be closed and vice versa
code: scattering can be disabled with auto_scatter var for bullets,
grown items and nutrient bottles
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: Theos <[email protected]>
Co-authored-by: Theos <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Ruin Ruin successfully tested. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants