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

The Return of Spray Paint #1222

Merged
merged 8 commits into from
Nov 15, 2024
Merged

The Return of Spray Paint #1222

merged 8 commits into from
Nov 15, 2024

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented Nov 14, 2024 •
edited
Loading

Description

Fixes some issues described in space-wizards/space-station-14#26257 and does some other things.
This PR's changes are licensed under MIT.

Changelog

🆑

  • add: Added spray-painting back

metalgearsloth and others added 2 commits November 13, 2024 23:05
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Nov 14, 2024
@SimpleStation14 SimpleStation14 changed the title the return of spray paint The Return of Spray Paint Nov 14, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 14, 2024 •
edited
Loading

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

Resources/Textures/Objects/Fun/spraycans.rsi

State Old New Status
spray_cap Removed
clown-inhand-left Added
clown-inhand-right Added
spray-inhand-left Added
spray-inhand-right Added

Edit: diff updated after b5fda12

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Nov 14, 2024
VMSolidus
VMSolidus requested changes Nov 14, 2024
View reviewed changes
Content.Server/Paint/PaintSystem.cs Outdated Show resolved Hide resolved
Content.Server/Paint/PaintSystem.cs Outdated Show resolved Hide resolved
Content.Server/Paint/PaintSystem.cs Outdated Show resolved Hide resolved
Content.Server/Paint/PaintSystem.cs Outdated Show resolved Hide resolved
Content.Server/Paint/PaintSystem.cs Outdated Show resolved Hide resolved
Content.Client/Paint/PaintVisualizerSystem.cs Outdated Show resolved Hide resolved
@DEATHB4DEFEAT DEATHB4DEFEAT mentioned this pull request Nov 14, 2024
Merged
12 tasks
@DEATHB4DEFEAT DEATHB4DEFEAT added Size: 3-Medium For medium issues/PRs Priority: 3-Medium Needs to be resolved at some point Type: Port Brings something to here from another codebase Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels labels Nov 15, 2024
DEATHB4DEFEAT and others added 3 commits November 14, 2024 16:41
@DEATHB4DEFEAT @VMSolidus
review changes
b82d97c 
Co-authored-by: VMSolidus <[email protected]>
@DEATHB4DEFEAT
more style config changes
474191f 
I should put this in another PR
@DEATHB4DEFEAT
whitelist
7616431
@github-actions github-actions bot added the Changes: Config Changes any configuration files label Nov 15, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT marked this pull request as ready for review November 15, 2024 01:25
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Nov 15, 2024
@DEATHB4DEFEAT
Copy link
Member Author

Ignore the code style stuff in here; #1226

@VMSolidus VMSolidus merged commit 3423e93 into Simple-Station:master Nov 15, 2024
23 checks passed
sleepyyapril pushed a commit to sleepyyapril/Einstein-Engines that referenced this pull request Nov 15, 2024
@SimpleStation14
Automatic Changelog Update (Simple-Station#1222)
45fdd0c
@Mnemotechnician Mnemotechnician mentioned this pull request Dec 9, 2024
Merged
7 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Peptide90 Peptide90 Peptide90 approved these changes

@VMSolidus VMSolidus VMSolidus approved these changes

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Config Changes any configuration files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 3-Medium For medium issues/PRs Type: Port Brings something to here from another codebase Type: Rework Large changes to a system, like a mix between the Balancing, Codebase, and Respace labels
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DEATHB4DEFEAT @VMSolidus @Peptide90 @metalgearsloth