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

Falling Falcons: Paratroopers Edition #6150

Merged
merged 20 commits into from
May 10, 2024
Merged

Falling Falcons: Paratroopers Edition #6150

merged 20 commits into from
May 10, 2024

Conversation

ihatethisengine
Copy link
Contributor

@ihatethisengine ihatethisengine commented Apr 15, 2024 •
edited
Loading

About the pull request

Replaces rappel system with paradrop system. You need a parachute on your back to paradrop (successfully). You also can drop objects from the above, but in most cases it's not a great idea (they can break). Crates can be paradropped too, so this can be an interesting alternative to req drops. In order for marines to paradrop, PO needs to choose a flare on the console and lock the paradrop system to the signal. After that the aft hatch will be open and you are free to jump! Just don't forget the parachute. (SGs can wear parachutes with armor)

Credits to @SubjectD9341 for the sprites.

Explain why it's good for the game

It's cooler than rappel.

Testing Photographs and Procedure

Peek.2024-04-15.09-02.mp4
success.mp4
crates.mp4
icon.mp4

Changelog

🆑 ihatethisengine
add: Added paradropping
del: Removed rappeling
/:cl:

@github-actions github-actions bot added Mapping did you remember to save in tgm format? UI deletes nanoui/html Feature Feature coder badge Removal snap labels Apr 15, 2024
fira
fira previously requested changes Apr 15, 2024
View reviewed changes
ihatethisengine and others added 3 commits April 15, 2024 19:21
@ihatethisengine
cd
672d78a
@ihatethisengine @fira
Apply suggestions from code review
1befb14 
Co-authored-by: fira <loyauflorian@gmail.com>
@ihatethisengine
sug
a5c904d
@ihatethisengine

This comment was marked as outdated.

Sign in to view
@ihatethisengine ihatethisengine marked this pull request as draft April 16, 2024 03:40
@github-actions github-actions bot added the Sprites Remove the soul from the game. label Apr 16, 2024
@ihatethisengine ihatethisengine marked this pull request as ready for review April 16, 2024 09:00
@LC4492
Copy link
Contributor

LC4492 commented Apr 17, 2024

As I commented before down on discord in the contributor's channel, wouldn't be better if the marines also had the possibility of attaching the parachute on their armor (like a poncho), so they wouldn't need to sacrifice their back slot? Good PR anyway

@ihatethisengine
Copy link
Contributor Author

As I commented before down on discord in the contributor's channel, wouldn't be better if the marines also had the possibility of attaching the parachute on their armor (like a poncho), so they wouldn't need to sacrifice their back slot? Good PR anyway

You don't really need to sacrifice anything, you can jump with items in your hands, just like you could with rappel.

Drulikar
Drulikar requested changes Apr 21, 2024
View reviewed changes
@Drulikar Drulikar added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels May 3, 2024
cm13-github added a commit that referenced this pull request May 3, 2024
@cm13-github
TGS Test Merge (#6150)
64fa424
@AudiGzz AudiGzz mentioned this pull request May 4, 2024
Closed
3 tasks
cm13-github added a commit that referenced this pull request May 5, 2024
@cm13-github
TGS Test Merge (#6150)
4f139c8
cm13-github added a commit that referenced this pull request May 5, 2024
@cm13-github
TGS Test Merge (#6150)
0960c4e
cm13-github added a commit that referenced this pull request May 5, 2024
@cm13-github
TGS Test Merge (#6150)
f81c99e
cm13-github added a commit that referenced this pull request May 6, 2024
@cm13-github
TGS Test Merge (#6150)
85bd8f0
cm13-github added a commit that referenced this pull request May 6, 2024
@cm13-github
TGS Test Merge (#6150)
ca178ea
cm13-github added a commit that referenced this pull request May 7, 2024
@cm13-github
TGS Test Merge (#6150)
bc11f51
cm13-github added a commit that referenced this pull request May 8, 2024
@cm13-github
TGS Test Merge (#6150)
24e1aa0
cm13-github added a commit that referenced this pull request May 8, 2024
@cm13-github
TGS Test Merge (#6150)
5bf0393
cm13-github added a commit that referenced this pull request May 8, 2024
@cm13-github
TGS Test Merge (#6150)
3338e9f
cm13-github added a commit that referenced this pull request May 8, 2024
@cm13-github
TGS Test Merge (#6150)
f1f8ef3
cm13-github added a commit that referenced this pull request May 8, 2024
@cm13-github
TGS Test Merge (#6150)
6784c67
cm13-github added a commit that referenced this pull request May 9, 2024
@cm13-github
TGS Test Merge (#6150)
6a964b1
cm13-github added a commit that referenced this pull request May 9, 2024
@cm13-github
TGS Test Merge (#6150)
1104498
cm13-github added a commit that referenced this pull request May 9, 2024
@cm13-github
TGS Test Merge (#6150)
c0cb24c
cm13-github added a commit that referenced this pull request May 10, 2024
@cm13-github
TGS Test Merge (#6150)
dcb745a
cm13-github added a commit that referenced this pull request May 10, 2024
@cm13-github
TGS Test Merge (#6150)
5739b6d
@nauticall nauticall added the Sprites Approved confirmed no stray pixels label May 10, 2024
cm13-github added a commit that referenced this pull request May 10, 2024
@cm13-github
TGS Test Merge (#6150)
675f07c
@Drulikar Drulikar dismissed fira’s stale review May 10, 2024 09:45

Resolved

@Drulikar Drulikar added this pull request to the merge queue May 10, 2024
Merged via the queue into cmss13-devs:master with commit bec6653 May 10, 2024
26 checks passed
cm13-github added a commit that referenced this pull request May 10, 2024
@cm13-github
Automatic changelog for PR #6150 [ci skip]
7bb7279
@Drulikar Drulikar mentioned this pull request Aug 5, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Aug 22, 2024
@Drulikar
Add FORCEDROP_CONDITIONAL and SMARTGUNNER_BACKPACK_OVERRIDE to bitfie…
361e612 
…lds (#6881)

# About the pull request

This PR is a followup to #6150
and #5914 that added new
flags_item flags but not to the bitfields

# Explain why it's good for the game

Allows the VV to allow editing and displaying these flags correctly.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/user-attachments/assets/3b292717-c48a-4d22-89ef-c4a549db9a1c)

</details>


# Changelog
:cl: Drathek
code: Added missing bitfields for flags_item to VV
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nauticall nauticall nauticall approved these changes

@Drulikar Drulikar Drulikar approved these changes

@fira fira fira left review comments

@Nanu308 Nanu308 Awaiting requested review from Nanu308 Nanu308 is a code owner

Assignees
No one assigned
Labels
Balance Approved This PR has had its balance and gameplay-affecting aspects approved. Cry to the Head-maint about it. Balance You need to be a professional veteran game maintainer to comprehend what is being done here. Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Removal snap Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Stale Exempt PR can't go stale Testmerge Candidate we'll test this while you're asleep and the server has 10 players UI deletes nanoui/html
Projects
Review Backlog
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ihatethisengine @LC4492 @fira @nauticall @Drulikar