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

adding fuel pump sprites and machinery to the almayer. #6074

Merged
merged 39 commits into from
Apr 15, 2024

Conversation

Huffie56
Copy link
Contributor

@Huffie56 Huffie56 commented Apr 3, 2024

About the pull request

Sprites have been updated by esselnek /sleepynecrons with the help of Zenith and originally made three year ago by nauticall.
Placed the fuel pump.
added some blocker behind to make it look solid.
change layer so when your behind it make sense.

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

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

Changelog

🆑 Huffie56, Zenith, esselnek/sleepynecrons, samy/nauticall, drulikar.
add: Added fuel pump as machinery on the almayer sprite will change when power is on or off.
add: Fuel pumps are animated when activated and have different state depending on how full the lifeboats are.
imageadd: added the fuel pump icon. updated by esselnek /sleepynecrons and Zenith, they where originally made by nauticall.
maptweak: added the fuel pump to the proper locations.
/:cl:

@github-actions github-actions bot added Sprites Remove the soul from the game. Mapping did you remember to save in tgm format? Feature Feature coder badge labels Apr 3, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Apr 7, 2024
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Apr 7, 2024
@cm13-github
Copy link
Contributor

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

@Huffie56 Huffie56 marked this pull request as ready for review April 8, 2024 10:56
@Huffie56 Huffie56 requested a review from Nanu308 as a code owner April 8, 2024 10:56
Copy link
Contributor

@nauticall nauticall left a comment

Choose a reason for hiding this comment

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

nice to see my sprites getting a touchup after sitting unused in the code for 3 years grumble grumble

looks good tho. not your fault they gathered dust

@nauticall nauticall added the Sprites Approved confirmed no stray pixels label Apr 8, 2024
code/game/machinery/machinery.dm Outdated Show resolved Hide resolved
code/game/machinery/machinery.dm Outdated Show resolved Hide resolved
icons/obj/structures/machinery/fuelpump.dmi Outdated Show resolved Hide resolved
code/game/objects/structures/blocker.dm Show resolved Hide resolved
code/game/machinery/machinery.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft April 13, 2024 09:42
Huffie56 and others added 3 commits April 13, 2024 13:32
apply all the suggestions from drulikar

Co-authored-by: Drathek <[email protected]>
@Huffie56 Huffie56 marked this pull request as ready for review April 14, 2024 15:52
@Huffie56 Huffie56 requested a review from Drulikar April 14, 2024 15:53
@Huffie56
Copy link
Contributor Author

we could have the pump stop pumping after it reach 100... idk
animation is really good so better leave it be.

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

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

Looks to be all in order.

@Drulikar Drulikar added the Mapping Approved adds 500 new dict keys label Apr 15, 2024
@Drulikar Drulikar added this pull request to the merge queue Apr 15, 2024
Merged via the queue into cmss13-devs:master with commit 69d2021 Apr 15, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Apr 15, 2024
@Huffie56 Huffie56 deleted the fuel_pomp branch April 16, 2024 09:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Mapping Approved adds 500 new dict keys Mapping did you remember to save in tgm format? Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants