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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Wooden Grip for Antique Laser Pistol #34886

Merged
merged 7 commits into from
Feb 10, 2025
Merged

Wooden Grip for Antique Laser Pistol #34886

merged 7 commits into from
Feb 10, 2025

Conversation

GaussiArson
Copy link
Contributor

@GaussiArson GaussiArson commented Feb 4, 2025 •
edited
Loading

About the PR

Changed the sprite of the Antique Laser Pistol to have a wooden grip. Changed the description of the Antique Laser Pistol to mention the wood.

Why / Balance

Discussion around adding wooden furniture to other weapons led to a mention of a few people wanting the Antique Laser Pistol to have a wooden grip. After experimenting with it, I liked the look as well.

Technical details

Changed icon and base sprites for the Antique Laser Pistol. Inhand sprites are untouched because the grip was already brown. Changed battery_guns.yml to change the description of the Antique Laser Pistol.

Media

image

Requirements

Breaking changes

Changelog

No need, sprite changes

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/XS Denotes a PR that changes 0-9 lines. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Feb 4, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 4, 2025 •
edited
Loading

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

Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi

State Old New Status
base Modified
icon Modified
inhand-left Modified
mag-unshaded-1 Modified
mag-unshaded-2 Modified
mag-unshaded-3 Modified
mag-unshaded-4 Modified

Edit: diff updated after 264a476

@SlimmSlamm
Copy link
Contributor

a wooden grip just doesn't look good on the pistol

@ArtisticRoomba
Copy link
Contributor

I'm indifferent. If I had to say something I think you could make the wood even darker, just as a shot in the dark.

The dark leather that was previously there helped accentuate the grip so if you tried to emulate the darkness of that without overdoing it, I think it would look even better.

@Tayrtahn
Copy link
Member

Tayrtahn commented Feb 5, 2025 •
edited
Loading

The sprite is a System Shock 2 reference:

Mod_206061_sd_image.jpg

Wood is decidedly more "antique" though. I'm pretty neutral on this.

@Pumkin69
Copy link

Pumkin69 commented Feb 5, 2025

the wooden grip looks way worse than the one we have now imo

@ArtisticRoomba ArtisticRoomba added P3: Standard Priority: Default priority for repository items. S: Needs Review Status: Requires additional reviews before being fully accepted DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. A: Art Area: Art with no implications for other areas. T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Feb 5, 2025
@lzk228
Copy link
Contributor

lzk228 commented Feb 5, 2025

no need for such bug cnahgelog just for resprite and corresponding description change
even more no need for changelog for resprite at all

FairlySadPanda
FairlySadPanda reviewed Feb 5, 2025
View reviewed changes
Copy link
Contributor

@FairlySadPanda FairlySadPanda left a comment

Choose a reason for hiding this comment

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

Bit of feedback on the description.

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml Outdated Show resolved Hide resolved
@GaussiArson
Copy link
Contributor Author

no need for such bug cnahgelog just for resprite and corresponding description change even more no need for changelog for resprite at all

Oh, I somehow missed the section on what does and doesn't require a changelog. My bad!

@Kazaap88
redesigned shape similar to ps3moira, edited mag to match, changed li…
91635d5 
…ghts colors to match each other
@Kazaap88
fixing an only SLIGHTLY catastrophic fuckup with an experimental inha…
dc4b7b2 
…nd sprite that I didn't mean to save and sleepily added to the previous commit
@Kazaap88
I DID IT AGAIN
264a476
@GaussiArson
Copy link
Contributor Author

the inhand sprite should be properly reverted now and if it isn't I'll cry

@Emisse Emisse merged commit 03bab30 into space-wizards:master Feb 10, 2025
14 checks passed
@K3-1R
Copy link

K3-1R commented Feb 10, 2025

literal majority thumbs down. Gets merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FairlySadPanda FairlySadPanda FairlySadPanda left review comments

@Pumkin69 Pumkin69 Pumkin69 left review comments

@Emisse Emisse Emisse approved these changes

Assignees
No one assigned
Labels
A: Art Area: Art with no implications for other areas. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. DB: Beginner Friendly Difficulty: Great for beginners. Unambiguous in scope, and explains how to achieve the result. P3: Standard Priority: Default priority for repository items. S: Needs Review Status: Requires additional reviews before being fully accepted size/XS Denotes a PR that changes 0-9 lines. T: Visual Change Type: Deals with changes to art, sprites or other visuals in the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@GaussiArson @SlimmSlamm @ArtisticRoomba @Tayrtahn @Pumkin69 @lzk228 @K3-1R @FairlySadPanda @Emisse @Kazaap88