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

Dropship turf direction sprites #3642

Merged
merged 34 commits into from
Feb 26, 2024
Merged

Dropship turf direction sprites #3642

merged 34 commits into from
Feb 26, 2024

Conversation

mullenpaul
Copy link
Contributor

@mullenpaul mullenpaul commented Jun 15, 2023 •
edited by github-actions bot
Loading

About the pull request

This pull request brings some of the sprite work which @kugamo previously did but was not added into master. These sprites allow for rotational dropships. The mapping has fixed for the escape pods for the new floors but rotating escape shuttles has not been done.

There is some additional spriting required for the dropships.

Explain why it's good for the game

Dropships spin me right round.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.
image
image

Changelog

🆑 paulrpg,kugamo
imageadd: shuttle rotation sprites added
maptweak: escape pods now use new floors
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? labels Jun 15, 2023
@github-actions
Copy link
Contributor

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jun 26, 2023
@mullenpaul mullenpaul removed the Stale beg a maintainer to review your PR label Jun 28, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jul 6, 2023

This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself

@github-actions github-actions bot added the Stale beg a maintainer to review your PR label Jul 6, 2023
@github-actions github-actions bot closed this Jul 13, 2023
@mullenpaul mullenpaul reopened this Jul 14, 2023
@mullenpaul mullenpaul added Stale Exempt PR can't go stale and removed Stale beg a maintainer to review your PR labels Jul 14, 2023
@Nanu308 Nanu308 added the Mapping Approved adds 500 new dict keys label Jul 19, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Jul 29, 2023
@cm13-github
Copy link
Contributor

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

@mullenpaul
got the rear ramp working
c087d6e
@mullenpaul
saving old work
1728743
@mullenpaul
Merge branch 'master' into dropship_rotation_sprites
5e2cfdf 
# Conflicts:
#	code/modules/shuttle/shuttles/dropship.dm
#	maps/shuttles/dropship_alamo.dmm
#	maps/shuttles/dropship_normandy.dmm
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Aug 23, 2023
@cm13-github
Copy link
Contributor

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

@mullenpaul
Merge branch 'master' into dropship_rotation_sprites
b573275 
# Conflicts:
#	code/game/machinery/doors/door.dm
#	code/game/machinery/doors/multi_tile.dm
#	maps/shuttles/dropship_alamo.dmm
#	maps/shuttles/dropship_normandy.dmm
@mullenpaul mullenpaul reopened this Feb 5, 2024
@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Feb 5, 2024
@cm13-github
Copy link
Contributor

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

@mullenpaul mullenpaul changed the title added kugamos dropship sprites and reworked mapping Dropship turf direction sprites Feb 10, 2024
@mullenpaul mullenpaul marked this pull request as ready for review February 12, 2024 01:25
@mullenpaul
Copy link
Contributor Author

Undrafting this as the scope has been removed to just introduce directional sprites

Drulikar
Drulikar requested changes Feb 19, 2024
View reviewed changes
maps/shuttles/dropship_alamo.dmm Outdated Show resolved Hide resolved
maps/shuttles/dropship_normandy.dmm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft February 19, 2024 05:11
@mullenpaul mullenpaul marked this pull request as ready for review February 21, 2024 19:27
Drulikar
Drulikar requested changes Feb 22, 2024
View reviewed changes
maps/shuttles/dropship_normandy.dmm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft February 22, 2024 09:10
@Nanu308 Nanu308 removed the Mapping Approved adds 500 new dict keys label Feb 25, 2024
@mullenpaul
Copy link
Contributor Author

Resolved merge conflicts

@mullenpaul mullenpaul marked this pull request as ready for review February 25, 2024 21:25
@Drulikar Drulikar dismissed stale reviews from sleepynecrons and harryob February 26, 2024 10:03

Resolved

@Drulikar Drulikar added this pull request to the merge queue Feb 26, 2024
Merged via the queue into cmss13-devs:master with commit ec4ab3a Feb 26, 2024
29 checks passed
cm13-github added a commit that referenced this pull request Feb 26, 2024
@cm13-github
Automatic changelog for PR #3642 [ci skip]
a60a7c7
Drulikar added a commit to Drulikar/cmss13 that referenced this pull request Feb 26, 2024
@Drulikar
Revert "Dropship turf direction sprites (cmss13-devs#3642)"
fdbe53d 
This reverts commit ec4ab3a.
@spaceboi123 spaceboi123 mentioned this pull request Feb 26, 2024
Closed
3 tasks
@TheGamerdk TheGamerdk mentioned this pull request Mar 1, 2024
Merged
github-merge-queue bot pushed a commit that referenced this pull request Mar 2, 2024
@TheGamerdk
Fixes black tiles on lifeboats (#5855)
a7dfa0a 
# About the pull request

Caused by #3642

# Explain why it's good for the game
# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.
These: 

![image](https://github.com/cmss13-devs/cmss13/assets/5618080/1b32fe0b-3dae-4ada-9639-dd82aac9247d)

Back to these:

![image](https://github.com/cmss13-devs/cmss13/assets/5618080/d6be385f-1dd4-4df2-b5fa-b528756fec21)

</details>


# Changelog
:cl:
fix: Fixes the lifeboat black turfs of Doom
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drulikar Drulikar Drulikar approved these changes

@FransFeiffer FransFeiffer FransFeiffer approved these changes

@sleepynecrons sleepynecrons sleepynecrons left review comments

@harryob harryob harryob left review comments

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

Assignees
No one assigned
Labels
Mapping did you remember to save in tgm format? 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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.