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

Resprites - 2/2024 Edition #5838

Merged
merged 18 commits into from
Mar 13, 2024
Merged

Conversation

nauticall
Copy link
Contributor

@nauticall nauticall commented Feb 27, 2024

About the pull request

Resprites various items in the game to be subjectively prettier and more up-to-date with modern standards. Among them are the following:

  • First aid kits.
  • Coffins.
  • Material stacks.
  • Mortar shells.
  • Beakers, bottles and pill bottles (sprites ported and hue-shifted from Baystation/Aurora).

Explain why it's good for the game

Sprites

Sprites

image
image
image
image
image

Changelog

🆑 nauticall
imageadd: Resprites first aid kits, coffins, material stacks, mortar shells, and chemistry items. Chemistry sprites ported from Baystation / Aurora.
fix: Recolors several reagent sprites to be more in-line with their established colors, such as on autoinjectors.
fix: Fixed invisible cloth tables.
fix: Fixed wrong shading on the large floodlight.
/:cl:

@nauticall nauticall changed the title Resprites - 2/24 Edition Resprites - 2/2024 Edition Feb 27, 2024
@github-actions github-actions bot added Sprites Remove the soul from the game. Feature Feature coder badge Fix Fix one bug, make ten more labels Feb 27, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Mar 1, 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 Mar 1, 2024
@cm13-github
Copy link
Contributor

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

Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

everything looks great sprite-wise minus a few gripes

the values on the mortar shells are a little dull. i think they need a darker shade for an outline/accentuating the fins, and a sharper highlight to give it a more metallic look. the base palette also has a couple basically identical shades of grey

the groove on the lid (i have no idea what to call it 😭) of the coffins change position between closed and open versions. i do not know if that's intentional or not

@Nanu308 Nanu308 marked this pull request as draft March 6, 2024 09:57
Copy link
Contributor

@sleepynecrons sleepynecrons left a comment

Choose a reason for hiding this comment

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

sprites now approved

@sleepynecrons sleepynecrons added the Sprites Approved confirmed no stray pixels label Mar 10, 2024
@nauticall nauticall marked this pull request as ready for review March 12, 2024 15:37
@Drulikar Drulikar added Testmerge Candidate we'll test this while you're asleep and the server has 10 players and removed Feature Feature coder badge labels Mar 12, 2024
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.

Code changes look fine. However a bit too many changes to verify so will TM a round or two to see if anyone notices anything wonky.

cm13-github added a commit that referenced this pull request Mar 13, 2024
cm13-github added a commit that referenced this pull request Mar 13, 2024
@Drulikar Drulikar added this pull request to the merge queue Mar 13, 2024
Merged via the queue into cmss13-devs:master with commit ca94d2e Mar 13, 2024
27 checks passed
cm13-github added a commit that referenced this pull request Mar 13, 2024
@Lagomorphica Lagomorphica mentioned this pull request Mar 13, 2024
3 tasks
github-merge-queue bot pushed a commit that referenced this pull request Mar 15, 2024
# About the pull request

Apparently a little `pills_closed` bottle overlay got accidentally
obliterated in one of my commits from #5838 a while back. Whoops.
This fixes it. Pill bottles should once again don their hats when
they're not opened.

# Changelog
:cl: nauticall
fix: Makes pill bottle caps appear on closed pill bottles again.
/:cl:
github-merge-queue bot pushed a commit that referenced this pull request Mar 17, 2024
# About the pull request
Adds a Pizza Galaxy space diner to the game for the Pizza ERT. They
deserve their own station as well!

The clothed tables will spawn incorrectly spritewise until Naut's PR
#5838 is added to the game.

Once new cooking sprites are added I'll go back and tweak the kitchen
area some more.

# Explain why it's good for the game
More Soulful lore and RP spots.

# Testing Photographs and Procedure

<details>
<summary>Screenshots & Videos</summary>


![bilde](https://github.com/cmss13-devs/cmss13/assets/59782240/d740b48b-a3bf-44ee-bc41-a2579ab32bd5)

</details>


# Changelog

:cl:
mapadd: Added the Galaxy Pizza Space Diner ERT station, for all your
outer expanse food needs!
maptweak: Placed APC's on ert stations and minor tweaks+fixes.
/:cl:

---------

Co-authored-by: Drathek <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more Sprites Approved confirmed no stray pixels Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants