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

Already on GitHub? Sign in to your account

Jump to bottom

Removes red crosses from doctor's delight drink sprite #15785

Merged
merged 2 commits into from
Apr 13, 2021
Merged

Removes red crosses from doctor's delight drink sprite #15785

merged 2 commits into from
Apr 13, 2021

Conversation

AzuleUtama
Copy link
Contributor

What Does This PR Do

Updates the sprite for the doctor's delight drink to have purple crosses rather than red.

Why It's Good For The Game

We had a PR some time ago to remove all red crosses in the game files, this is an extension of that.

Images of changes

image

ddredone

Changelog

馃啈
imageadd: Reworked doctor's delight sprite
/:cl:

@S34NW
Copy link
Member

S34NW commented Mar 31, 2021

less war crimes

@Cocacolagua
Copy link
Contributor

i'm not really sure the warcrime applies here but whatever

@procdrone
Copy link
Contributor

damn i liked committing war crimes with my dietary drinks. Duh!

@AffectedArc07
Copy link
Member

The war crimes only apply when its being associated with a medical area. Having a red + itself is fine, just not if you associate it with medical things.

@AffectedArc07 AffectedArc07 added the Sprites This PR modifies the game sprites label Apr 1, 2021
@Wojz
Copy link

Wojz commented Apr 1, 2021

change taste to warcrimes

@AzuleUtama
Copy link
Contributor Author

The war crimes only apply when its being associated with a medical area. Having a red + itself is fine, just not if you associate it with medical things.

Yeah I wasn't completely sure on whether it was needed, but given the name of said item and the fact it heals toxin damage I figured it was better safe than sorry.

@Sirryan2002
Copy link
Contributor

I think this is a good sprite change anyway, if people prefer this over the other one, I say go ahead.

@AffectedArc07
Copy link
Member

Mistake?
image

AffectedArc07
AffectedArc07 requested changes Apr 6, 2021
View reviewed changes
Copy link
Member

@AffectedArc07 AffectedArc07 left a comment

Choose a reason for hiding this comment

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

You removed a sprite thats still in use
image

@AzuleUtama
Copy link
Contributor Author

Yeah sorry, that's been resolved and should now be back in the drinks.dmi file.

@AffectedArc07 AffectedArc07 merged commit 53462a2 into ParadiseSS13:master Apr 13, 2021
S34NW added a commit to S34NW/Paradise that referenced this pull request Apr 21, 2021
@S34NW
Squashed commit of the following:
11f837a 
commit 9a58267
Author: ppi13 <rainbowdestroy@gmail.com>
Date:   Tue Apr 20 22:50:17 2021 +0200

    Gives ERT Combat Gloves (ParadiseSS13#15879)

    * Gives ERT Combat Gloves

    * Removes pasta

commit 88752dc
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Tue Apr 20 20:57:13 2021 +0100

    Button swap (ParadiseSS13#15865)

commit 9532300
Author: Stokes52 <73205477+Stokes52@users.noreply.github.com>
Date:   Tue Apr 20 02:36:44 2021 -0700

    Fix eyepatch sprite to not cover both eyes (ParadiseSS13#15914)

commit b7001fe
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Apr 20 09:24:07 2021 +0100

    Bump ssri from 6.0.1 to 6.0.2 in /tgui (ParadiseSS13#15915)

    Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
    - [Release notes](https://github.com/npm/ssri/releases)
    - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
    - [Commits](npm/ssri@v6.0.1...v6.0.2)

    Signed-off-by: dependabot[bot] <support@github.com>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit e81c68f
Author: Norstead <82757886+Norstead@users.noreply.github.com>
Date:   Mon Apr 19 10:29:21 2021 -0400

    Tweaks fluff item (ParadiseSS13#15908)

    * Tweaks fluff item

    * oopsy

    * oopsy 2: Electric boogaloo

commit fb06547
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Mon Apr 19 14:50:30 2021 +0100

    Various bugfixes (ParadiseSS13#15873)

    * pAI Record Fix

    * AI Respawnability

    * Wine Reagents

    * Ghost Repulsing

    * Agent ID Card Numbers

    * Maint Drone Lights

    * Fix fixes

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

    * Headpocket runtimes

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

commit 3a12a54
Author: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date:   Mon Apr 19 07:27:54 2021 -0400

    Adds Ice to Daiquiri recipe (ParadiseSS13#15910)

    * Adds Water to Daiquiri recipe

    * fixing the recipe again

    changes water to ice to prevent conflicts with grog (rum & water)

    * Update code/modules/reagents/chemistry/recipes/drinks.dm

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit 9bccec9
Author: Dragonkiller93 <82484852+Dragonkiller93@users.noreply.github.com>
Date:   Sun Apr 18 03:41:39 2021 -0700

    Fixes: Preferences now properly loads the UI style. (ParadiseSS13#15906)

    * Preferences now properly saves the UI style.

    * Update code/modules/client/preference/preferences_mysql.dm

    Adds spaces for easier reading.

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

    Co-authored-by: Iwanabeu <35479849+Kineticinferno@users.noreply.github.com>
    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

commit 6842d37
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Sun Apr 18 11:38:39 2021 +0100

    how did this make any sense? (ParadiseSS13#15904)

commit b151dfb
Author: Dennis <d@irrgang.dev>
Date:   Sat Apr 17 14:48:17 2021 +0200

    Fixed a grammar mistake in the coroners cap description. (ParadiseSS13#15897)

    * Fixed grammar mistake.

    * fix stupidity

commit ac9df40
Author: Sean Williams <12197162+S34NW@users.noreply.github.com>
Date:   Sat Apr 17 13:47:26 2021 +0100

    Fixes turf spelling issues (ParadiseSS13#15898)

    * someone needs to learn how to spell

    * more turf spelling issues

commit 6eb6747
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sat Apr 17 13:45:40 2021 +0100

    Allows Ian to eat homework (ParadiseSS13#15786)

    * Dog food V1

    * m

    * Fixed string

    * Review thing

commit 2121275
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Fri Apr 16 20:16:14 2021 +0100

    deletes pAI pony sprite (ParadiseSS13#15868)

commit 0eaec89
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Thu Apr 15 22:04:24 2021 +0100

    Soup Drinking (and custom soups!) (ParadiseSS13#15620)

    * SOUP

    * Space stuff

    it compiled before I swear

    * =

commit 0e1e728
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Thu Apr 15 21:57:55 2021 +0100

    no more dismantling bike (ParadiseSS13#15892)

commit 0b30e7b
Author: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com>
Date:   Thu Apr 15 09:22:34 2021 -0400

    This has been bothering me (ParadiseSS13#15889)

commit 4b80316
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Thu Apr 15 14:13:20 2021 +0100

    Makes Drones and Swarmers unaffected by radiation (ParadiseSS13#15569)

    * Safety Drones

    * Just Drones and Swarmers

    * Corrected version

    Also cleaned up some swarmer vars

commit d6b99bb
Author: Abyll <abyllbreil@gmail.com>
Date:   Wed Apr 14 07:03:53 2021 -0600

    Fix summoning multiple guardians exploit  (ParadiseSS13#15882)

    * Check for existing guardian after picking observer.

    Repeat existing guardian check after picking observer, before finalizing creation.
    Refactor existing guardian check into separate proc

    * Fix indentation

    * Reset guardian item to unused if it cancels in the second has_guardian check

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

commit df656ed
Author: Sean Williams <12197162+S34NW@users.noreply.github.com>
Date:   Wed Apr 14 14:02:33 2021 +0100

    Fixes surgical table moving anchored things (ParadiseSS13#15886)

    * stinky table no longer moves anchoreds

    * Update code/game/objects/structures/tables_racks.dm

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

commit 53462a2
Author: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com>
Date:   Tue Apr 13 13:10:43 2021 +0100

    Removes red crosses from doctor's delight drink sprite (ParadiseSS13#15785)

    * updates sprite

    * oops, re-added daiquiri

commit 1746aab
Author: LordShekelstein <81524060+LordShekelstein@users.noreply.github.com>
Date:   Tue Apr 13 08:10:00 2021 -0400

    Adds an actual sprite for the singularity hammer. (ParadiseSS13#15806)

    * Fixes Gloves of the North Star exploit.

    * Update miscellaneous.dm

    * Update miscellaneous.dm

    * Create miscellaneous.dm

    * Update code/modules/clothing/gloves/miscellaneous.dm

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

    * Update code/modules/clothing/gloves/miscellaneous.dm

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

    * commit on 'master'

    * commit on 'master'

    * master

    * 'singularityhammer'

    * 'singularityhammer'

    * singularityhammer

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Merge branch 'master' into recordmaintenancepurge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dearmochi dearmochi dearmochi approved these changes

@Kyep Kyep Kyep approved these changes

@AffectedArc07 AffectedArc07 AffectedArc07 approved these changes

Assignees
No one assigned
Labels
Sprites This PR modifies the game sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@AzuleUtama @S34NW @Cocacolagua @procdrone @AffectedArc07 @Wojz @Sirryan2002 @dearmochi @Kyep