Port Magic Crayon From Frontier #2410

Avalon-Proto · 2024-12-09T23:07:59Z

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!

github-actions · 2024-12-09T23:08:42Z

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 · 2024-12-09T23:08:56Z

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

Lyndomen · 2024-12-09T23:30:11Z

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

check my sec gun PR

Lyndomen · 2024-12-09T23:32:33Z

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 · 2024-12-09T23:38:00Z

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 · 2024-12-09T23:53:02Z

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 · 2024-12-10T00:56:43Z

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

Lyndomen · 2024-12-10T18:35:42Z

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 · 2024-12-10T19:06:21Z

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 · 2024-12-10T19:10:35Z

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 · 2024-12-10T19:45:00Z

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

Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/clown.yml

Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/mime.yml

Resources/Prototypes/Loadouts/loadout_groups.yml

SpaceStation14.sln

BuildChecker/BuildChecker.csproj

Lyndomen

no construction but rare rng ok

deltanedas · 2024-12-15T01:34:52Z

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

Avalon-Proto · 2024-12-15T01:49:49Z

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 · 2024-12-15T11:02:18Z

in a terminal

Avalon-Proto · 2024-12-17T18:32:22Z

FINALLY!! FINALLY GOT IT THANK FOCK

dvir001 · 2024-12-17T18:33:36Z

FINALLY!! FINALLY GOT IT THANK FOCK

It do be like this.

Avalon-Proto · 2024-12-17T18:34:18Z

FINALLY!! FINALLY GOT IT THANK FOCK

It do be like this.

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

Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml

…/Delta-v into Rainbow-crayon-port

Avalon-Proto · 2024-12-18T04:27:55Z

@deltanedas I think this is all good now

Monotheonist · 2024-12-20T19:46:48Z

Don't forget the mail, silly.

Lyndomen

direction approved

Avalon-Proto · 2024-12-21T02:16:59Z

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

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

Signed-off-by: Avalon <[email protected]>

Signed-off-by: deltanedas <[email protected]>

Avalon-Proto · 2024-12-28T15:30:31Z

FUCK I FUCKED THA CHANGELOG

# Description ## **!!! DO NOT "Squash and commit", ONLY "Create a merge commit" !!!** Merges a lot of PRs from Delta-V, most of these are plain YML changes so they shouldn't cause wizmerge-like issues. - DeltaV-Station/Delta-v#1008 - DeltaV-Station/Delta-v#1077 - DeltaV-Station/Delta-v#1092 - DeltaV-Station/Delta-v#1094 - DeltaV-Station/Delta-v#1143 - Excluded the lobby art with DeltaV branding. - DeltaV-Station/Delta-v#1176 - DeltaV-Station/Delta-v#1209 - DeltaV-Station/Delta-v#1227 - DeltaV-Station/Delta-v#1252 - not directly cherry-picked due to harpy singing now being stored in a different file, but implemented the same thing in df50140 - DeltaV-Station/Delta-v#1261 - DeltaV-Station/Delta-v#1271 - DeltaV-Station/Delta-v#1272 - Also made available to Humans and Tajarans like the other Felinid tails. - DeltaV-Station/Delta-v#1426 - DeltaV-Station/Delta-v#1462 - DeltaV-Station/Delta-v#1542 - DeltaV-Station/Delta-v#1759 - DeltaV-Station/Delta-v#1763 - DeltaV-Station/Delta-v#1765 - DeltaV-Station/Delta-v#1780 - DeltaV-Station/Delta-v#1781 - DeltaV-Station/Delta-v#1804 - DeltaV-Station/Delta-v#1814 - TODO in another pr, vulp sprite for the colorable neck gaiter (PR only adds vulp states to pre-existing black/red neck gaiters) - DeltaV-Station/Delta-v#1828 - Added to Loadouts for Corpsman, costs 2 points. - DeltaV-Station/Delta-v#1838 - DeltaV-Station/Delta-v#1877 - DeltaV-Station/Delta-v#1905 - Added to Loadout Uniforms, costs 1 point. - DeltaV-Station/Delta-v#1910 - DeltaV-Station/Delta-v#1935 - DeltaV-Station/Delta-v#1946 - DeltaV-Station/Delta-v#1994 - DeltaV-Station/Delta-v#1997 - DeltaV-Station/Delta-v#1998 - DeltaV-Station/Delta-v#2031 - DeltaV-Station/Delta-v#2089 - DeltaV-Station/Delta-v#2113 - DeltaV-Station/Delta-v#2213 - DeltaV-Station/Delta-v#2209 - DeltaV-Station/Delta-v#2210 - Prerequisite Wizden PR added: space-wizards/space-station-14#29243 - Prerequisite Wizden PR added: space-wizards/space-station-14#30856 - DeltaV-Station/Delta-v#2233 - DeltaV-Station/Delta-v#2245 - DeltaV-Station/Delta-v#2250 - DeltaV-Station/Delta-v#2266 - DeltaV-Station/Delta-v#2267 - DeltaV-Station/Delta-v#2294 - DeltaV-Station/Delta-v#2307 - DeltaV-Station/Delta-v#2318 - DeltaV-Station/Delta-v#2398 - DeltaV-Station/Delta-v#2410 - DeltaV-Station/Delta-v#2462 - DeltaV-Station/Delta-v#2478 - DeltaV-Station/Delta-v#2501 - DeltaV-Station/Delta-v#2503 - DeltaV-Station/Delta-v#2504 - Prerequisite Wizden PR added: space-wizards/space-station-14#30957 - DeltaV-Station/Delta-v#2524 - DeltaV-Station/Delta-v#2539 - DeltaV-Station/Delta-v#2635 - Prerequisite Wizden PR added: space-wizards/space-station-14#32193 - Prerequisite Wizden PR added: space-wizards/space-station-14#32327 ## Changelog Too much changes to count so some changes are unlisted :cl: Several Contributors - add: Added Lone Digger by Caravan Palace to the jukebox! (by MilonPL) - add: Added Deck The Halls by Kevin Macleod to the jukebox! (by Lyndomen) - tweak: Now medical belts have a slot for medkits. (by Radezolid) - add: Added a way for muskets, flintlocks, and musket cartridges (NOT .60) to be crafted. (by Tryded) - add: Added Vulpkanin-specific sprites to a lot of helmets and masks. (by Adrian16199, TadJohnson00) - add: Security dogs (such as Laika) now have Vulpkanin vocal emotes. Howl! (by Remuchi) - add: Split the Emag into the Cryptographic Sequencer and the Airlock Access Override. (by Warmechanic) - add: Added Corpsman Glasses, no more getting flashed as Corpsman! Also available in Loadouts. (by Unkn0wnGh0st333) - add: Harpies can now mimic harps! (by TheOneWhoIsManyFrame) - tweak: Cats will now play with mouse toys. (by Deltanedas) - add: Added a black turtleneck, available in Loadouts! (by Aikakakah) - add: Added the Binary Translator Key to the uplink costing 1 TC and the listening post operative headset. (by Radezolid) - add: Spesos now have a new pretty look transferred from the Frontier Station. (by whatston3) - add: The home-run bat has been re-added to the traitor uplink. - add: Added the CrystalThistle, mutated from the Galaxythistle that generates Quartzite which when heated produces glass sheets. (by jimmy12or) - add: Added a Ghost Pepper! A friendly looking Pepper that's so Spicy, it hurts! (by jimmy12or) - add: Added a Cosmic Revenant! A spooky mutation of the Ghost pepper that produced Ectoplasm. (by jimmy12or) - add: Added blue and purple tomato soup, made using Blue Tomatoes. (by DisposableCrewmember42) - add: Added new drinks: the double ice cream (by dge21) and Dr. Gibb Blood Red (by BlitzTheSquishy). - add: Some drink reactions now require shaking with the shaker or stirring with a spoon. (by Vermidia) - add: Added "Selene" wing customization option for moths (by boogiebogus) - add: Added the tiger tail sprite for Felinids, Humans and Tajarans. (by Adrian16199) - add: NanoTrasen has established business relations with HydroCo! You can now order powdered milk and juice via your Logistics department. (by DisposableCrewmember42) - tweak: Bar and kitchen shelves no longer restrict the items that can be placed in them. (by Velcroboy) - tweak: Bookshelves can now fit any kind of item, not just books. (by Deltanedas) - add: New magic crayons have appeared in the sector, artists rejoice! (by AvalonProto)

* ART * Update clown.yml * Loadout fixes, time req * loadout bgone * Fixes, moved things * fixoneoops * More fixes * CRAFTING WORKS! * Flipped slashes * UNTOUCHED! AT LAST * Fix comment * Mailladd * Webedit ops Signed-off-by: Avalon <[email protected]> * untroll indent Signed-off-by: deltanedas <[email protected]> --------- Signed-off-by: Avalon <[email protected]> Signed-off-by: deltanedas <[email protected]> Co-authored-by: deltanedas <[email protected]>

Avalon-Proto added 2 commits December 9, 2024 01:41

ART

e650491

Update clown.yml

6a4e14c

Avalon-Proto requested review from IamVelcroboy and a team as code owners December 9, 2024 23:07

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

Merge branch 'master' into Rainbow-crayon-port

fe3e421

Loadout fixes, time req

fc39e83

Lyndomen reviewed Dec 11, 2024

View reviewed changes

loadout bgone

439027c

Avalon-Proto requested review from deltanedas and a team as code owners December 11, 2024 20:46

Lyndomen previously approved these changes Dec 12, 2024

View reviewed changes

Lyndomen added the S: Approved Approved direction-wise, pending code review. label Dec 12, 2024

UNTOUCHED! AT LAST

faa7bbd

Merge branch 'master' into Rainbow-crayon-port

422d7e1

Radezolid reviewed Dec 17, 2024

View reviewed changes

Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml Outdated Show resolved Hide resolved

Avalon-Proto added 2 commits December 17, 2024 14:11

Fix comment

fd88a56

Merge branch 'Rainbow-crayon-port' of https://github.com/Avalon-Proto…

1234bd2

…/Delta-v into Rainbow-crayon-port

Avalon-Proto added 2 commits December 19, 2024 06:51

Merge branch 'master' into Rainbow-crayon-port

02fd429

Merge branch 'master' into Rainbow-crayon-port

59240e7

Lyndomen self-requested a review December 20, 2024 21:16

Lyndomen previously approved these changes Dec 20, 2024

View reviewed changes

Mailladd

a9da62f

Avalon-Proto dismissed Lyndomen’s stale review via a9da62f December 21, 2024 02:15

deltanedas requested changes Dec 21, 2024

View reviewed changes

Resources/Textures/_NF/Objects/Fun/magic_crayon.rsi/meta.json Outdated Show resolved Hide resolved

Avalon-Proto and others added 3 commits December 27, 2024 07:28

Merge branch 'master' into Rainbow-crayon-port

08c4acf

Webedit ops

c53f47e

Signed-off-by: Avalon <[email protected]>

untroll indent

461eb0b

Signed-off-by: deltanedas <[email protected]>

deltanedas approved these changes Dec 27, 2024

View reviewed changes

deltanedas enabled auto-merge (squash) December 27, 2024 14:53

deltanedas merged commit 9a22c09 into DeltaV-Station:master Dec 27, 2024
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port Magic Crayon From Frontier #2410

Port Magic Crayon From Frontier #2410

Avalon-Proto commented Dec 9, 2024 •

edited

Loading

github-actions bot commented Dec 9, 2024 •

edited

Loading

Avalon-Proto commented Dec 9, 2024

Lyndomen commented Dec 9, 2024

Lyndomen commented Dec 9, 2024

Kr8art commented Dec 9, 2024

Avalon-Proto commented Dec 9, 2024

Avalon-Proto commented Dec 10, 2024

Lyndomen commented Dec 10, 2024

Avalon-Proto commented Dec 10, 2024

Lyndomen commented Dec 10, 2024

Avalon-Proto commented Dec 10, 2024

Lyndomen left a comment

deltanedas commented Dec 15, 2024

Avalon-Proto commented Dec 15, 2024

deltanedas commented Dec 15, 2024

Avalon-Proto commented Dec 17, 2024

dvir001 commented Dec 17, 2024

Avalon-Proto commented Dec 17, 2024

Avalon-Proto commented Dec 18, 2024

Monotheonist commented Dec 20, 2024

Lyndomen left a comment

Avalon-Proto commented Dec 21, 2024

Avalon-Proto commented Dec 28, 2024

Port Magic Crayon From Frontier #2410

Port Magic Crayon From Frontier #2410

Conversation

Avalon-Proto commented Dec 9, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

github-actions bot commented Dec 9, 2024 • edited Loading

Avalon-Proto commented Dec 9, 2024

Lyndomen commented Dec 9, 2024

Lyndomen commented Dec 9, 2024

Kr8art commented Dec 9, 2024

Avalon-Proto commented Dec 9, 2024

Avalon-Proto commented Dec 10, 2024

Lyndomen commented Dec 10, 2024

Avalon-Proto commented Dec 10, 2024

Lyndomen commented Dec 10, 2024

Avalon-Proto commented Dec 10, 2024

Lyndomen left a comment

Choose a reason for hiding this comment

deltanedas commented Dec 15, 2024

Avalon-Proto commented Dec 15, 2024

deltanedas commented Dec 15, 2024

Avalon-Proto commented Dec 17, 2024

dvir001 commented Dec 17, 2024

Avalon-Proto commented Dec 17, 2024

Avalon-Proto commented Dec 18, 2024

Monotheonist commented Dec 20, 2024

Lyndomen left a comment

Choose a reason for hiding this comment

Avalon-Proto commented Dec 21, 2024

Avalon-Proto commented Dec 28, 2024

Avalon-Proto commented Dec 9, 2024 •

edited

Loading

github-actions bot commented Dec 9, 2024 •

edited

Loading