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

Port Magic Crayon From Frontier #2410

Merged
merged 23 commits into from
Dec 27, 2024

Conversation

Avalon-Proto
Copy link
Contributor

@Avalon-Proto Avalon-Proto commented Dec 9, 2024

About the PR

Ported the rainbow crayon from Frontier to here! Artists Rejoice!

Why / Balance

We have a number of crayon artists on Delta cough Joy Bringer cough so i wanted to give them something they can really use for art

Technical details

Media

https://cdn.discordapp.com/attachments/1206353544186171482/1315816832048828477/image.png?ex=6758c96b&is=675777eb&hm=30f78de869bf562a16551bc066d17a6d1f939f800abb6972cea293fd73516097&

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog
🆑 add: New magic crayons have appeared in the sector, artists rejoice!

@Avalon-Proto Avalon-Proto requested review from IamVelcroboy and a team as code owners December 9, 2024 23:07
@github-actions github-actions bot added Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi size/M 64-255 lines S: Needs Review labels Dec 9, 2024
Copy link
Contributor

github-actions bot commented Dec 9, 2024

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

Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi

State Old New Status
icon-inhand-left Added
icon-inhand-right Added
icon Added

Edit: diff updated after 461eb0b

@Avalon-Proto
Copy link
Contributor Author

I jsut need help getting it into loadouts, as I currently cannot figure out how to

@Lyndomen
Copy link
Contributor

Lyndomen commented Dec 9, 2024

I jsut need help getting it into loadouts, as I currently cannot figure out how to

check my sec gun PR

@Lyndomen
Copy link
Contributor

Lyndomen commented Dec 9, 2024

Also pending Direction review, but I have some concerns providing this at roundstart with infinite uses. I'd much rather this be construct-able with real effort, researchable, or really anything but free.

@Kr8art
Copy link
Contributor

Kr8art commented Dec 9, 2024

Also pending Direction review, but I have some concerns providing this at roundstart with infinite uses. I'd much rather this be construct-able with real effort, researchable, or really anything but free.

If this doesn't get approved, I might do a PR for a rainbow crayon crafting recipe that lets you combine all crayons from a box to make one rainbow crayon.

That way artists still have a source of crayons that can actually paint all colours, but they'd have to do some work for it (finding them/asking logi for a few boxes).

@Avalon-Proto
Copy link
Contributor Author

Also pending Direction review, but I have some concerns providing this at roundstart with infinite uses. I'd much rather this be construct-able with real effort, researchable, or really anything but free.

I mean, I plan to lock it behind at least 5 hours playtime of each role, as well as giving it a small chance to appear in artists toolboxes. About every 1 in 3 boxes can have one. Or 1-100 of getting one from a maints locker on its own

@Avalon-Proto
Copy link
Contributor Author

Right, now locked behind 10 hours clown, for clown and mime. Cause I could NOT figure out how to make it require both

@Lyndomen
Copy link
Contributor

Alrighty, so the direction review is that we do not want this available roundstart via loudouts. Our suggestion is that it becomes craftable through 1 red, green, and blue crayon, as well as a bluespace crystal.

@Avalon-Proto
Copy link
Contributor Author

Alrighty, so the direction review is that we do not want this available roundstart via loudouts. Our suggestion is that it becomes craftable through 1 red, green, and blue crayon, as well as a bluespace crystal.

Alright help me do the construction graph then cause I dunno how to make those :blunt: . But is the 33% chance to spawn in a green toolbox. And 1/100 for Maints lockers fine?

@Lyndomen
Copy link
Contributor

You can check the Frontier port of Coffee to see construction graphs, and the 1/100 is fine but please change the green toolbox chance down to 5%

@Avalon-Proto
Copy link
Contributor Author

You can check the Frontier port of Coffee to see construction graphs, and the 1/100 is fine but please change the green toolbox chance down to 5%

I mean the only reason I made it 33% in green boxes is cause green boxes themselves are relatively rare. I tested opening around 30 Maints lockers. And in those lockers I got 0 magic crayons and 2 art boxes. Neither art box had a crayon

Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Loadouts/loadout_groups.yml Outdated Show resolved Hide resolved
SpaceStation14.sln Outdated Show resolved Hide resolved
SpaceStation14.sln Outdated Show resolved Hide resolved
SpaceStation14.sln Outdated Show resolved Hide resolved
BuildChecker/BuildChecker.csproj Outdated Show resolved Hide resolved
BuildChecker/BuildChecker.csproj Outdated Show resolved Hide resolved
BuildChecker/BuildChecker.csproj Outdated Show resolved Hide resolved
@Avalon-Proto Avalon-Proto requested review from deltanedas and a team as code owners December 11, 2024 20:46
Lyndomen
Lyndomen previously approved these changes Dec 12, 2024
Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

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

no construction but rare rng ok

@Lyndomen Lyndomen added the S: Approved Approved direction-wise, pending code review. label Dec 12, 2024
@Avalon-Proto
Copy link
Contributor Author

Hey @deltanedas Can you tell me what i need to do to untouch stuff, cause I don't even remember opening those files :blunt:

@deltanedas
Copy link
Member

git checkout upstream/master path/to/file where upstream is the name of your DeltaV-Station/Delta-v` remote

@Avalon-Proto
Copy link
Contributor Author

git checkout upstream/master path/to/file where upstream is the name of your DeltaV-Station/Delta-v` remote

Do I do this in smartgit, in Visual studio? Where?

@deltanedas
Copy link
Member

in a terminal

@Avalon-Proto
Copy link
Contributor Author

FINALLY!! FINALLY GOT IT THANK FOCK

@dvir001
Copy link
Contributor

dvir001 commented Dec 17, 2024

FINALLY!! FINALLY GOT IT THANK FOCK

It do be like this.

@Avalon-Proto
Copy link
Contributor Author

FINALLY!! FINALLY GOT IT THANK FOCK

It do be like this.

Untouching stuff is annoying when you don't know how to :elp:

@Avalon-Proto
Copy link
Contributor Author

@deltanedas I think this is all good now

@Monotheonist
Copy link
Contributor

Don't forget the mail, silly.

@Lyndomen Lyndomen self-requested a review December 20, 2024 21:16
Lyndomen
Lyndomen previously approved these changes Dec 20, 2024
Copy link
Contributor

@Lyndomen Lyndomen left a comment

Choose a reason for hiding this comment

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

direction approved

@Avalon-Proto
Copy link
Contributor Author

Added one last thing- gave it a 20% chance to come from the Mime Art Supply mail, and a 10% from the standard crayon mail

@deltanedas deltanedas enabled auto-merge (squash) December 27, 2024 14:53
@deltanedas deltanedas merged commit 9a22c09 into DeltaV-Station:master Dec 27, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Approved Approved direction-wise, pending code review. S: Needs Review size/M 64-255 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants