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

Claymores & Mine Tweaks #2988

Merged
merged 24 commits into from
Oct 22, 2024
Merged

Claymores & Mine Tweaks #2988

merged 24 commits into from
Oct 22, 2024

Conversation

Sun-Soaked
Copy link
Contributor

@Sun-Soaked Sun-Soaked commented May 13, 2024 •
edited
Loading

About The Pull Request

TODO:

  • Actually implement claymores (should we let players have them?)(Cargo?)

  • Remove weird sprite shim I made when world icons are merged, add world icons to mines

  • Sprites (this time we actually need them since the placeholder ones are tgmc & I didn't ask for permission)

Adds Mines that explode when an object passes in front of them & fire an ammo casing in that direction.
Adds claymores as an implemented example of this- short range, shreds people at point blank.
Adds World Icons to normal Mines

I had to do some tweaking behind the scenes to implement mobless casing firing- but I'm pleased to say that fire_casing() can now deal emotionally with being handed a null user.

Also minorly tweaks explosion devastation, so heavy explosions can only strip tiles that have already been damaged
You can still immediately strip tiles with devastating explosions

Why It's Good For The Game

FRONT TOWARDS ENEMY

Changelog

🆑
add: Directional Mines, implemented as Claymores.
add: Mines now have World Icons
balance: explosions now only strip to space when a tile is already damaged
fix: Prox mines explode from slightly further away & no longer activate through walls.
fix: Multiple mines can no longer be stacked on a tile
code: fire_casing() can now be called by non-mobs, allowing objects to shoot casings.
/:cl:

@Sun-Soaked
la bomba
b6d0ab6 
main pr body
-dir mines
-claymores
-fire_casing now works without a mob
-mines can no longer be placed on a tile that already has a deployed mine
@github-actions github-actions bot added Sprites A bikeshed full of soulless bikes. Code change Watch something violently break. labels May 13, 2024
@Sun-Soaked
fixes create & destroy test (I think)
db41fdd 
live mine was trying to draw tripwires in nullspace after being move()'d there
@Sun-Soaked
Merge branch 'master' into claymores
872235f
FalloutFalcon
FalloutFalcon approved these changes May 15, 2024
View reviewed changes
Copy link
Contributor

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

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

code seems fine!

@Sun-Soaked
Copy link
Contributor Author

this could use a testmerge now that they're accessible via cargo, I want to see how the balance shakes out

@Sun-Soaked
oops again
56ab18e 
?" can I get a : right now... : right now...
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 2, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 2, 2024

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 Jun 2, 2024
@FalloutFalcon FalloutFalcon added the Test Merge Candidate You do it for free. label Jun 2, 2024
@Sun-Soaked
Copy link
Contributor Author

urge to kill mojave world icons grows

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 6, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 6, 2024

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 Jun 6, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

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

  • Sprites (this time we actually need them since the placeholder ones are tgmc & I didn't ask for permission)

Sprites are CC-BY-NC, no permission required.

@TheVekter TheVekter mentioned this pull request Aug 24, 2024
Closed
@thgvr thgvr removed the Test Merged They've done it for free. label Aug 25, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 14, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 29, 2024
@Sun-Soaked Sun-Soaked marked this pull request as ready for review September 29, 2024 13:31
@Sun-Soaked Sun-Soaked requested a review from a team as a code owner September 29, 2024 13:31
@Sun-Soaked
Copy link
Contributor Author

this is good to merge now btw

@thgvr
Copy link
Member

thgvr commented Oct 3, 2024

think you could add a red glow to armed mines so you can see them in the dark?

@Anticept Anticept mentioned this pull request Oct 10, 2024
Open
FalloutFalcon
FalloutFalcon requested changes Oct 14, 2024
View reviewed changes
Copy link
Contributor

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

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

Please don't put jokes in auto-doc! I would rather just not making it auto-doc if its not a proper explanation.

I would skim the auto-doc guide if you don't remember it.

@Anticept Anticept mentioned this pull request Oct 19, 2024
Open
@MajorMeltdown MajorMeltdown mentioned this pull request Oct 20, 2024
Open
@Sun-Soaked
another pr sterilized
f29a6ed 
thgvr and fallcon's requested changes
@Sun-Soaked
Copy link
Contributor Author

Please don't put jokes in auto-doc! I would rather just not making it auto-doc if its not a proper explanation.

I would skim the auto-doc guide if you don't remember it.

bumping to remind you I made changes

@FalloutFalcon FalloutFalcon added this pull request to the merge queue Oct 22, 2024
Merged via the queue into shiptest-ss13:master with commit 0751c47 Oct 22, 2024
14 checks passed
shiptest-server pushed a commit that referenced this pull request Oct 22, 2024
@actions-user
Automatic changelog generation for PR #2988 [ci skip]
869db87
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thgvr thgvr thgvr left review comments

@FalloutFalcon FalloutFalcon FalloutFalcon approved these changes

Assignees
No one assigned
Labels
Code change Watch something violently break. Sprites A bikeshed full of soulless bikes. Test Merge Candidate You do it for free.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Sun-Soaked @thgvr @Anticept @FalloutFalcon @SomeguyManperson