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

[Feature] MedChem Sprite Update #101

Merged
merged 1 commit into from
Oct 31, 2024

Conversation

PuroSlavKing
Copy link
Member

Описание PR

Я хз, просто рандомная замена спрайтов.


Медиа

Содержание

Таблеточки в печати:

image

Все в сборе:
image

Все аптечки в сборе:
image


idk just random sprite update
Copy link
Contributor

coderabbitai bot commented Oct 26, 2024

Walkthrough

This pull request updates several meta.json files for various resources in the Resources/Textures/Objects/Specific directory. The primary changes involve updates to the copyright fields, replacing previous sources with new attributions to the BlueMoon-Labs repository. Additionally, some files have modifications to state delays and the addition of a new state for the pills resource. Overall, the structure and content of the JSON files remain largely unchanged.

Changes

File Path Change Summary
Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json Updated copyright field to new source from BlueMoon-Labs.
Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json Updated copyright field to new source; changed state delays from [0.1, 0.1] to [0.5, 0.5, 0.5, 0.5, 0.5].
Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json Updated copyright field to new source from BlueMoon-Labs.
Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json Updated copyright field to new source from tgstation; added new state "pill22".
Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json Updated copyright field to new source from BlueMoon-Labs.
Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json Updated copyright field to new source from BlueMoon-Labs.
Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/meta.json Updated copyright field to new source from TGStation.

Possibly related PRs

Suggested labels

Changes: Sprite, Changes: YML, Changes: Documentation


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

RSI Diff Bot; head commit ef00644 merging into d703498
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Specific/Chemistry/beaker.rsi

State Old New Status
beaker Modified
beaker1 Modified
beaker2 Modified
beaker3 Modified
beaker4 Modified
beaker5 Modified
beaker6 Modified

Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi

State Old New Status
beakerbluespace Modified

Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi

State Old New Status
beakerlarge Modified
beakerlarge1 Modified
beakerlarge2 Modified
beakerlarge3 Modified
beakerlarge4 Modified
beakerlarge5 Modified
beakerlarge6 Modified

Resources/Textures/Objects/Specific/Chemistry/pills.rsi

State Old New Status
pill Modified
pill1 Modified
pill10 Modified
pill11 Modified
pill12 Modified
pill13 Modified
pill14 Modified
pill15 Modified
pill16 Modified
pill17 Modified
pill18 Modified
pill19 Modified
pill2 Modified
pill20 Modified
pill21 Modified
pill3 Modified
pill4 Modified
pill5 Modified
pill6 Modified
pill7 Modified
pill8 Modified
pill9 Modified
pill22 Added

Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi

State Old New Status
pill_canister Modified

Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi

State Old New Status
advkit-inhand-left Modified
advkit-inhand-right Modified
advkit Modified
blackkit-inhand-left Modified
blackkit-inhand-right Modified
blackkit Modified
brutekit-inhand-left Modified
brutekit-inhand-right Modified
brutekit Modified
burnkit-inhand-left Modified
burnkit-inhand-right Modified
burnkit Modified
firstaid-inhand-left Modified
firstaid-inhand-right Modified
firstaid Modified
o2kit-inhand-left Modified
o2kit-inhand-right Modified
o2kit Modified
purplekit-inhand-left Modified
purplekit-inhand-right Modified
purplekit Modified
radkit-inhand-left Modified
radkit-inhand-right Modified
radkit Modified
toxinkit-inhand-left Modified
toxinkit-inhand-right Modified
toxinkit Modified

Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi

State Old New Status
orebag_off Modified
orebag_on Modified

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (1)
Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json (1)

43-45: Consider reordering states for better maintainability.

The new pill22 state is inserted between pill21 and pill7, breaking the numerical sequence. Consider reordering the states to maintain a consistent numerical order.

    {
      "name": "pill21"
    },
+   {
+     "name": "pill7"
+   },
+   {
+     "name": "pill8"
+   },
+   {
+     "name": "pill9"
+   },
+   {
+     "name": "pill10"
+   },
+   {
+     "name": "pill11"
+   },
+   {
+     "name": "pill12"
+   },
+   {
+     "name": "pill13"
+   },
+   {
+     "name": "pill14"
+   },
+   {
+     "name": "pill15"
+   },
+   {
+     "name": "pill16"
+   },
+   {
+     "name": "pill17"
+   },
    {
      "name": "pill22"
    },
-   {
-     "name": "pill7"
-   },
-   {
-     "name": "pill8"
-   },
-   {
-     "name": "pill9"
-   },
-   {
-     "name": "pill10"
-   },
-   {
-     "name": "pill11"
-   },
-   {
-     "name": "pill12"
-   },
-   {
-     "name": "pill13"
-   },
-   {
-     "name": "pill14"
-   },
-   {
-     "name": "pill15"
-   },
-   {
-     "name": "pill16"
-   },
-   {
-     "name": "pill17"
-   },
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between d703498 and ef00644.

⛔ Files ignored due to path filters (68)
  • Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill1.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill10.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill11.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill12.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill13.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill14.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill15.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill16.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill17.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill18.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill19.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill2.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill20.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill21.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill22.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill3.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill4.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill5.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill6.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill7.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill8.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/pill9.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/pill_canister.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit-inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/advkit.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit-inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/blackkit.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit-inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/brutekit.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit-inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/burnkit.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid-inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/firstaid.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit-inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/o2kit.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit-inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/purplekit.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit-inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/radkit.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit-inhand-left.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit-inhand-right.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/toxinkit.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/orebag_off.png is excluded by !**/*.png
  • Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/orebag_on.png is excluded by !**/*.png
📒 Files selected for processing (7)
  • Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json (1 hunks)
  • Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json (2 hunks)
  • Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json (1 hunks)
  • Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json (2 hunks)
  • Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json (1 hunks)
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json (1 hunks)
  • Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/meta.json (1 hunks)
✅ Files skipped from review due to trivial changes (5)
  • Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json
  • Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json
  • Resources/Textures/Objects/Specific/Chemistry/pills_canister.rsi/meta.json
  • Resources/Textures/Objects/Specific/Medical/firstaidkits.rsi/meta.json
  • Resources/Textures/Objects/Specific/Mining/ore_bag_holding.rsi/meta.json
🔇 Additional comments (3)
Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json (2)

14-18: Review the significant animation slowdown.

The animation timing has been increased from 0.2s (2 frames × 0.1s) to 2.5s (5 frames × 0.5s), which is a 12.5x slowdown. This might affect the visual feedback and user experience. Please confirm if this change is intentional and if it aligns with the game's visual design guidelines.

#!/bin/bash
# Description: Check for consistency in animation timings across similar sprites
# Expected: Find similar patterns in related chemical container sprites

# Test: Search for animation timing patterns in other chemical RSI files
fd -e json -p '**/Chemistry/*.rsi/meta.json' --exec rg -A 5 '"delays":'

4-4: Verify licensing compatibility with BlueMoon-Labs source.

Please ensure that the assets from BlueMoon-Labs are compatible with the CC-BY-SA-3.0 license declared in this file. Consider adding the specific commit hash to the URL for better version tracking.

✅ Verification successful

License compatibility verified for BlueMoon-Labs assets

The assets are properly attributed with CC-BY-SA-3.0 license which is compatible with the repository's licensing structure. The repository uses AGPLv3 and MIT licenses for code, while art assets commonly use CC-BY-SA-3.0. Multiple files consistently reference the same BlueMoon-Labs source with proper attribution and licensing.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check if the source repository's license is compatible
# Expected: Should find LICENSE or similar files in the BlueMoon repo

# Test: Search for any license declarations in the source URL
curl -s https://raw.githubusercontent.com/BlueMoon-Labs/MOLOT-BlueMoon-Station/master/LICENSE

Length of output: 381


Script:

#!/bin/bash
# Let's check the license information in our repository first
fd LICENSE --type f --exec head -n 20 {}

# Also check for any license declarations in meta.json files
fd meta.json --type f --exec rg -l "license|copyright" {}

# And check the specific meta.json file content
cat Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json

Length of output: 271747


Script:

#!/bin/bash
# Let's check the repository's license files and any license-related information
# First, check the root LICENSE file
cat LICENSE

# Check if there are any other license files in the repository
fd -g 'LICENSE*' -t f

# Let's also check if there are any other files from BlueMoon-Labs being used
rg -l "BlueMoon-Labs" --type json

Length of output: 702


Script:

#!/bin/bash
# Let's check the content of the AGPLv3 license and MIT license files
cat LICENSE-AGPLv3.txt
cat LICENSE-MIT.txt

# Let's also check one of the other files using BlueMoon-Labs assets to see if they have consistent licensing
cat Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json

Length of output: 36861

Resources/Textures/Objects/Specific/Chemistry/pills.rsi/meta.json (1)

4-4: Verify copyright attribution consistency.

The copyright attribution references tgstation, while the AI summary indicates other similar files in the Chemistry directory reference BlueMoon-Labs. Please verify if this inconsistency is intentional.

@Remuchi
Copy link
Collaborator

Remuchi commented Oct 27, 2024

Все прикольно кроме новой сумки утилизаторов. Не знаю она прямо очень странно выглядит. Кину ещё нашим спрайтерам посмотреть

@Remuchi Remuchi merged commit b959365 into WWhiteDreamProject:master Oct 31, 2024
12 checks passed
@PuroSlavKing PuroSlavKing deleted the MiscSpriteUpdate branch October 31, 2024 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants