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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Port] resprites all soda cans, adds wellcheers juice #77424 + Fix for dirty ice cups #1298

Merged
merged 5 commits into from
Feb 27, 2024

Commits on Feb 26, 2024

  1. Dirty Ice Cup Fix

    AlbertNanotracen committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    789c72c View commit details
    Browse the repository at this point in the history
  2. resprites all soda cans, adds wellcheers juice (tgstation#77424)

    this one was a labor of love. all the existing soda cans have been
    resprited, with the help of @retlaw34 (new top palettes), @Imaginos16
    (new top shapes, can palettes), and some original sprites done by
    @Krysonism (monkey energy, the 13 loko).
    you can see the before and afters here:
    
    ![image](https://github.com/tgstation/tgstation/assets/110322848/f23f0b06-d3b3-40dd-b0f9-353fb5864b92)
    (now includes crushed cans, and inhands!)
    let me know if there's any promotional stuff i should also include in
    this PR, like if sol dry has a poster somewhere, and i'll go update that
    with any changes made.
    
    also adds a new drink, idea courtesy of @YesterdaysPromise:
    wellcheers juice!
    
    ![image](https://github.com/tgstation/tgstation/assets/110322848/96c6d57a-79c3-4b70-8bd5-c8f3d1bbec41)
    it will make you drowsy, and has a variable affect on your mood
    if you are unhappy, it will deal stamina damage
    if you are neutral, it will give you a mood boost
    if you are happy, it will heal some brute damage
    
    also, six packs of cans have been resprited. can i interest anyone in an
    alamo? or just a space beer?
    
    ![image](https://github.com/tgstation/tgstation/assets/110322848/567d677b-d89b-4c52-b576-b15293aabf49)
    
    old can sprites were _crusty_. it was nearly impossible to tell what
    some of the logos were, and the palettes were dated as well. this tries
    to keep the logo similar where possible, giving them new life where i
    can, and sometimes reimagining them. the result is still internally
    consistent, but much more polished.
    
    :cl:
    add: Added wellcheers, a contraband soda with various side effects.
    image: resprites all cans in the drinks icon file
    image: resprites the canholder sprite in storage.dmi
    /:cl:
    CoiledLamb authored and AlbertNanotracen committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    bd1ad49 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    eec9082 View commit details
    Browse the repository at this point in the history
  4. missing icons

    AlbertNanotracen committed Feb 26, 2024
    Configuration menu
    Copy the full SHA
    b7729dd View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. quiver icon

    AlbertNanotracen committed Feb 27, 2024
    Configuration menu
    Copy the full SHA
    b8ee3a7 View commit details
    Browse the repository at this point in the history