Adds four new pear based meal recipes. #2047
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR adds four new pear meal recipes. A "tart", a savory and dessert poached recipe and a simple muffin. Finally the noble pear has a home.
|
RSI Diff Bot; head commit 762925d merging into fc95ec3 Resources/Textures/_NF/Objects/Consumable/Food/Baked/bread.rsi
Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi
Resources/Textures/_NF/Objects/Consumable/Food/bowl.rsi
|
|
Excited Loops and Alma noises |
Recipes looks fine to me and values .The sprites made me wanting to have some ice cream and cake , very good. The thing i noticed is like the MaxVol on some stuff is lower than what it contains (not sure if it really matters if it needs to be equal from the stuff thats inside) i also like that you left some room in the muffin/pie for adding condiments . Maybe another suggestion would be -1 or -2 ChocolateBar on the bella pears,adding 1-2 oranges to recipe,and change the small orange above the cream in the sprite to a small lemon (just yellow colouring)since it uses one in the recipe, but it would also be fine how it currently is. |
|
Thank you for the spot on the Bella pears maxVol. I dropped a chocolate bar from the recipe, one per pear is a bit much. For now I'm going to keep the fruit where they are. Distant rumblings has informed that there will be a new way of looking at how nutritional values and expectations are calculated in foods and when that day comes I'll almost certainly be revisiting quantities and types of ingredients. If that seems reasonable. Determining how much nutriment should be inherited, how much should be converted to flavorol, etc, are all fairly challenging considerations to make at the moment and have resulted in some pretty wobbly foods. I want ice cream too now. |
Cheackraze
approved these changes
Sep 25, 2024
arimah
previously requested changes
Sep 26, 2024
Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml
Outdated
Show resolved
Hide resolved
whatston3
approved these changes
Sep 27, 2024
There was a problem hiding this comment.
Added a missing flavor for pear, edited food IDs for consistency with others (e.g. FoodTartPearCheese, akin to FoodTartGrape). I think Arimah's suggestions should be resolved - the tart recipe suggestions were included.
I've removed the solution definition for the tart and used the base from the pie (seems fine, close enough anyways, a little extra flavorol never hurt). Moved the pie recipe to 15 seconds for consistency with others.
Tested locally, all recipes baked alright, flavors make sense, and the values seem sane.
Resources/Textures/_NF/Objects/Consumable/Food/Baked/pie.rsi/meta.json
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/meals.yml
Outdated
Show resolved
Hide resolved
|
RSI test failure seems to be related to the build server's environment - I did edit the copyright attribution in pie.rsi/meta.json, re-reading it, the but this seems unrelated. I'll give it some time before rerunning the tests, but this feature seems fine to my eyes. |
|
Thank you Whatstone. It was very generous of you to offer up your time and energy in the final polish pass. I apologize for the outstanding issues that I left behind and I'll strive for greater consistency and care in the future. |
|
Failing test passes here. Going to merge this, seems fine. |
FrontierATC
added a commit
that referenced
this pull request
Sep 27, 2024
Sh1ntra
added a commit
to Corvax-Frontier/Frontier
that referenced
this pull request
Oct 2, 2024
* Dialog windows now grab the keyboard focus (#31294) * Dialog windows now grab the keyboard focus * Comment * Automatic changelog update * Allows you to buckle transfer person from bed to bed (#32089) * unbuckle if the target is buckled * better way to do it * Automatic changelog update * Fland change - Add glasslocks to the Contiguous Fland Hallway Volume (#32264) * Add glasslocks to the Contiguous Fland Hallway Volume * Fix up the firelocks, hopefully! * Automatic changelog update * Removes cockroach/mothroach melee damage (#32221) no more cockroach and mothroach damage * Automatic changelog update * Makes the rat king's cheeseEm order more convenient to use (#32181) more convenient cheeseem * Automatic changelog update * Cog update (Mail) (#32315) make mailing better * Modifications to bring Omega up to date. (#32317) * Make small clamp use 2% battery instead of recharging 2% battery. (#32320) Make small clamp user 2% battery instead of recharge 2% battery. Co-authored-by: JIPDawg <JIPDawg93@gmail.com> * Automatic changelog update * Add respirator to hostile humanoid mobs (new-frontiers-14#2032) * Add fancy chairs (new-frontiers-14#2031) * Add Fancy Chairs * Update chairs.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#2031) * Fireaxe Removes Plating (Delta-V#1700), Maintenance Jack (new-frontiers-14#2018) * the return of fireaxe prying (new-frontiers-14#1700) * bullshit * fixed the fucking typo!!! * Add a maintenance jack for prying up plating * maintenance jack swing angle * Maintenance jack: huge, not ginormous --------- Co-authored-by: Milon <plmilonpl@gmail.com> * Automatic Changelog (new-frontiers-14#2018) * Bounty hunter clothes sprites, inf BountyVend (new-frontiers-14#1987) * initial commit * boots * bountyvend POI * combat gloves as C1 * fffffix * mercenary colors --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1987) * fix issues with proximity beeper (#32322) implement * Disable resizing of lobby character editor (#32313) No resizing character editor Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> * Rolebanlist command UI (#30827) * rolebanlist command opens ui * removed commented out section * More unshaded bluespace bag sprites (new-frontiers-14#1960) * bag of holding consistency * Fix 1-frame bag of holding animation lengths * fix ore bag animation lengths * Learn to count. --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1960) * Fix disposal units flushing too soon after power-on (#32314) * Don't flush disposals immediately on power-on * Update Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs --------- Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Move tank harness to outer clothing (new-frontiers-14#2028) * Move tank harness to outer clothing * Valet outer clothing fixes * Fix valet outer clothing * outerclothing, not jumpsuit * Fix pirate outer clothing * tank: hideEffects, not effects * Fix mercenary loadouts: remove tank harness --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2028) * Emp Fixups (new-frontiers-14#2034) * Fixup * Update launchers.yml * Update launchers.yml * Automatic Changelog (new-frontiers-14#2034) * Psychologist's Stamp (#31881) * added sprite and began implementation * fixed sprite name, fixed meta files * silly whitespace * added paper-stamp file * figured out where to add the componet, added 'credits' * spelling is hard * hmm * GAHHHHH * how did i do this again * Automatic changelog update * BankSystem: cached balances (new-frontiers-14#1909) * BankSystem: cache bank accounts * BankSystem: fix cache lookup player * BankSystem rewrite * BankSystem: no-ent functions, spawn event sessions * fix delta-v/frontier comments * Additional frontier session comments * BankSystem: ComponentInit function * New event for preferences being loaded --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Vagabond Piping Fix (new-frontiers-14#1976) * fix old piping + directional fans * replaces exterior waste air vent with a passive vent * Update vagabond.yml * Update vagabond.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#1976) * Edison Power POI (new-frontiers-14#1890) * initial POI and dev test quick setup * finalize * Update edison.yml * Map Fixups * Cleanup * Last fixup + NoSpawn --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Security Clown Mask is now security restricted. (#32335) made security clown masks security contraband. * Crossbows update (new-frontiers-14#1971) * initial commit * bolts * hand crossbows, additional functionality for bolts * fixes * tweaks * shootable plunger and bread * mail capsule * attack options for crossbows, bread * wooden stake changes * tag bloat (fucking bs) * sponge * fixes * quiver fix * broadhead bolt * parenting and small fix * moving things around * Update belts_crossbow_quiver.yml * Fixup * Update weapons.yml * EMP * Update crossbow.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#1971) * Remove the Crown from the shipyard (new-frontiers-14#2036) * Automatic Changelog (new-frontiers-14#2036) * Avocado and Cucumber plants, with foods (new-frontiers-14#2023) * Avocado and Cucumber plants, with foods This PR adds avocado and cucumber, in addition to several new foods and drinks to make use of them. * Remove pit * Olive oil rebranding and fixes. Updates seed sprites to more contemporary forms. Uh, Olive Oil is now... Vegetable oil. Worked with Whatstone on this one. It seemed preferable to adding "avocado oil" or other redundant vegetable based oils in addition to providing a renewable way of producing oil for frying and kitchen use. Addressed issues with bad nutritional values and iffy meat tag. * Revert "Olive oil rebranding and fixes." This reverts commit 6bbe4fd. * Reverts olive oil to vegetable oil changes. Retains "oil" reagent for avocado. * Cucumber slice color, longer cukes, recipe amounts * Cucumber water cucumber colour (cucumber) * Add vegetable oil * Add the forgotten cucumber sprite * fix avocado oil, description is small --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2023) * Soda water and Vodka recipes (#32252) * SodaWater and Vodka recipes * Changed crystals recipe in fun.yml * plasma is now a catalyst to create crystals * Revert "plasma is now a catalyst to create crystals" This reverts commit 1002d9927a3597f7a02611071ef3f706cd056a41. * Revert "Changed crystals recipe in fun.yml" This reverts commit 30b6b602228ec1b11a46e390c6a5868494e2b61f. * Stir to make Vodka * Shake to make soda water * fix * Automatic changelog update * PTech Changes: Infinite ID cards and Encryption keys (new-frontiers-14#2014) * Make ptech great again * Cleanup * Content * Update vending_machine_restock.yml * Remove pens from SR PTech, add sr/nfsd forms * Brown and green PAL folders with docs --------- Co-authored-by: Dvir <dvirf01@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> * Fix medical PDA/health analyzer long range intel bug (#31879) * hide spriteview from health analyzer while inactive * add out of range indicator if analyzer becomes inactive * hide out of range icon if there is no patient data * Automatic changelog update * Added a directory to station maps (#31156) * Added directory to station maps * Add null checks to map directory sorting/filtering * Reworked station map directory to be more readable and responsive * Automatic changelog update * Add skirt of life in contraband medidrobe (#32214) * Fix a spelling mistake in the DonutVend's advertisments (#32348) change that one line so i never think about this again * Allow some mobs to not despawn with events (new-frontiers-14#2039) * Allow some mobs to not despawn with events * Update BluespaceErrorRule.cs * Comments, field rename --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Flora anomaly seeds (#31987) * content * Update meta.json * Update mobspawn.yml * Update mobspawn.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml * Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml * Update Resources/Prototypes/Entities/Effects/mobspawn.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Bank Data (Take 2) (new-frontiers-14#1399) * BankLable Corvax * Update PlayerTabHeader.xaml * Fixup * Update PlayerTab.xaml.cs * Update PlayerTabEntry.xaml.cs * Cleanup * Update BankSystem.cs * Update PlayerTabHeader.xaml * Allow bank update of 0, group overlay fields * Update Content.Client/Administration/AdminNameOverlay.cs Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> * Update Content.Client/Administration/AdminNameOverlay.cs Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> * Update Content.Server/_NF/Bank/BankSystem.cs Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> * Update Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Long gun, long case (new-frontiers-14#2044) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2044) * fix cargo order scams, fix internals crate desc (#32350) fix description, fix scams * Better dock signage (new-frontiers-14#2040) * New bus and dock signs * Attribution * Stratos indentation fix * Small edit * Update migration.yml --------- Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#2040) * NT Fishbowl 2.0 (new-frontiers-14#1995) * updated fishbowl * CentCom --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#1995) * Akupara directional fan compliance patch (new-frontiers-14#1979) * fixed guidebook typo, reverted SMES feedback, deleted stray MV cable, added emergency air locker at entrance * refactored the lv cables for better access and coverage added intercoms in atmos: radioless ghostroles rejoice! * Update akupara.yml * Update akupara.yml --------- Co-authored-by: Dvir <dvirf01@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1979) * Rat kings can butcher things (#32232) * rat kings can butcher things * minor organization * fix * important comma * Automatic changelog update * Update Credits (#32362) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * AI now "can" use media console (#32334) * Make buckle mint (#32370) - Fix the unbuckle mispredicts. - Fix unbuckle offset existing. - Fix interaction range not aligning with interactionoutline system. * Automatic changelog update * Adding a holy watermelon helmet (#32272) * lolkekhatholy alalalla * animationcreate blelebleblbeleb * Automatic changelog update * added the ability for pigs to feed themselves (#32358) * pigs can eat * disable carcinisation * Smuggling posters are now random and NFSD gets rewarded for getting prints of posters and dead drops (new-frontiers-14#1667) * Changed the time between dead drops and distance * Removed deprecated GetMapEntityId for TryGetMap * Removed tags that match autogenereated ones and simplified new Color * Made the distance even smaller * Revert "Made the distance even smaller" This reverts commit a008ba6. * Added check to see how many dead drop components are nearby * Changed behaviour of dead drop posters and added all of the previous posters to the dead drop system * Posters are finally random, only one can be active per point of interest * Added a message of the drop pod location to the NSFD after 15 minutes and made the wait time faster for posters * Scanning activated dead drop posters gives 30k cash to NFSD and dead drop location is now said by NFSD Outpost * NFSD scanning objects on the dead drop will reward them with 60k spessos and functioned the code for giving rewards * Changed spessos rewards to FUC * The timer now resets for the current poster if it detects any other posters that are active nearby * Lowered the chance of posters appearing and thus being Dead Drops, made pirates have a 1/3 of knowing the smuggler's ship ID after 15 minutes and added a guidebook entry * Increased the MinimumCooldown to 15 minutes and NFSD now gets progressive hints at dead drop posters' locations * Syndicate Supply Ships are now limited to 5 and if more are spawned, the oldest one gets deleted. Also only detectives get rewards for scanning dead drops and their posters * Moved all of the radio strings to locale and additional comments * Forensic scanner system now tracks based on access level rather than role name, removed accidental file and added a 1/10 chance to spawn a syndicate mob in the dead drop. Also fixed some stuff from last commit * Removed the syndicate mob guy because he would step on mines and lose his gun after FTL * Changed the dead drop poster cooldown to 5-10 minutes but now only 2 can be active at a time * Random contraband generation, part one * Station dead drop config, generation * Forensics cartridge, nfsd uplink entry * forensic scanner, staton definitions * Missing/inconsistent localization strings * HardSuit->Hardsuit * A few more uplink fixes * Revise dead drop tracking, always payout, add $ * Prototype-based smuggling message passing * POI map fixes, revert health, remove MapInit * Logging, anchored items, no drops @ courthouse * Dead drop value fiddling, uplink rewrites * cleanup * CVARS! * Move prototype to Shared * Fix config, cleanup, random error in drop pod msgs * fix forensic printouts, dead drop spawn menu * separate speso/fuc reward prints * Min/Max delay to floats * DeadDropSystem: type fix * Fix pirate delay, NFSD delay: 14-16 mins * Random fax generator & event * Roundstart hint generation * Remove test dead drop hints * Bugfixes for dead drop hint gen * more paper! * Smuggling guidebook entry, remove unneeded sec pgs * More smoog crate value, c3 trade crates, debug * Better drop pod scanner rewards * DD writable VV field, fix crate parent * WindowedEvent fixes * event naming * Add time to dead drop notes * Freelancer->Freelance channel * PodLocation messages: fix precision for vectors * Disable shipyard sale component, tweak smoog param * Multiple faxes per event * fax and logic * security_uplink_catalog: forensic module 2->4 FUC --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1667) * Lemons, limes, and oranges can now be mutated into each other (#32306) * Automatic changelog update * Makes it possible to disable the vent pressure lockout temporarily with a screwdriver (#31050) * builds * doesn't crash * seems to work * distance cap was dumb * Requested changes * can't find any issues from making the changes * Check for anchor and minor optimisation * Removed unnecessary usings * Code less verbose and cleanup * Automatic changelog update * reach update :3 (#32387) * Add the Syndicate Instigator Shuttle (#32083) * Instigator * sustenance * Predict vending machine BUI (#32376) * Include container ents in examine (#32267) Mainly for closets but if it's like a mouse in a bag they can see what's in the bag type deal. * Automatic changelog update * L6 Fits in the Suit Storage Slot (#30525) * L6 Fits in the Suit Storage Slot * 5x4 item * Automatic changelog update * Entity menu lookup changes (#32395) * Automatic changelog update * Computer wirepanel (#32273) * Computer wirehacking * Power wire now shocks * deconstruction fix * updated tests * Better parenting * maintenance panel sprite * new sprite for maintenance panel open * Apothecary directional Fan update and housekeeping. (new-frontiers-14#1926) * Removes Apothecary Microwave and adds some housekeeping. Microwave out. Cosmetic adjustments to decals and some pipe and locker reworks in. Details in the PR. * Updates with directional fans Swapped out tiny fans with directional fans. Tested orientation and walked around in the ship. Seem to work a treat. * Updates with new FSB posters and fluff text. * Correct chemistry shelf and power/guidebook updates. Replaced chemistry shelf with unsecure version. Whoops. Added n2/o2 emergency closet. Added doctor emergency EVA suit. Replaced plasma generator with uranium (plasma couldn't practically keep up with medical power draw) Updated guidebook for uranium instructions. Added secure metal shelf to ward wall. --------- Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1926) * Stasis Directional Fan Update (new-frontiers-14#1967) * Stasis Directional Fan Update Adds directional fans to the Stasis, along with some housekeeping. * Updates with new SFB posters. * Noticed the guidebook update seemed to have been lost or overwritten in the shuffle. Updated. * Medical EVA locker and o2/n2 lockers. --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1967) * NSF Broadhead 2.0 (new-frontiers-14#2033) * updated broadhead * set generator power * Automatic Changelog (new-frontiers-14#2033) * SBB Lyrae 1.2 (new-frontiers-14#2016) * updated lyrae * updated price * Automatic Changelog (new-frontiers-14#2016) * Update Ceres with directional fans + other goodies (new-frontiers-14#2041) * Automatic Changelog (new-frontiers-14#2041) * Update Bookworm with directional fans, atmos mixer + more (new-frontiers-14#2043) * NC Piecrust: Update (new-frontiers-14#1992) * update piecrust.yml * added another sink * pricing * Replaced kitchen tinyfan, air mixer 79 / 21 --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#2043) * Automatic Changelog (new-frontiers-14#1992) * Prospector tiny fan update (new-frontiers-14#2050) * Prospector tiny fan update * SignShipDock->NFSignDock pending a better sign --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2050) * loader directional fan update (new-frontiers-14#2051) * Garden Directional Fan Update (new-frontiers-14#2052) * Garden Directional Fan Update * Updates garden main room air sensors * Garden: remove invalid configurators --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2051) * Update chisel.yml (new-frontiers-14#2053) * Automatic Changelog (new-frontiers-14#2052) * Automatic Changelog (new-frontiers-14#2053) * Updates Kestrel Directional Fans (new-frontiers-14#2054) Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2054) * Comet Directional Fan Update (new-frontiers-14#2055) * Comet Directional Fan Update * Minor cleanup: AME, pump, paper * Replace waste pump with max version (consistency) * add floor tile to dock --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2055) * Bulker Directional Fan Update (new-frontiers-14#2057) * Automatic Changelog (new-frontiers-14#2057) * Bocadillo Directional Fan Update (new-frontiers-14#2058) * Bocadillo Directional Fan Update * Fix invalid entity references --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2058) * Spirit Directional Fan Update (new-frontiers-14#2059) * Spirit Directional Fan Update * Rotate NanoMed, remove invalid ents, attrib --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2059) * Pathfinder directional fans update (new-frontiers-14#2060) * Pathfinder directional fans update Replaced all tiny fans with directional fans Also added coloured decals for the O2 and N2 connector ports and gave them names. * Removed custom connector port names Also changed gas mix to 79/21 from 78/22 per request. * Remove whitespace --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Sprinter shuttle update (new-frontiers-14#2062) * Sprinter directional fans update Replaced tiny fans with directional fans. Named O2 and N2 ports and added decals. Replaced medical doctor's locker with wallmount. Added dirt where the locker used to be. * Fixed uid conflict Fixed conflicting uids that prevented the map from loading. Fixed rotation on two directional fans. * Removed redundant whitespace * Replaced AME fuel rack with wall locker. Moved gyroscope into engineering, using the space vacated by the fuel rack. * Revert gyroscope change I missed the matching gyroscope on the other side, and the fact that the LV cables were required for the thrusters, not just the gyroscope. * Requested changes Removed custom named from connector ports. Removed mapped coat. * NT Bottleneck 2.0 (new-frontiers-14#1996) * updated bottleneck * adjust generator again * Add security button to cond. illegal matches --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2060) * Automatic Changelog (new-frontiers-14#1996) * Resolve most C# conflicts except vending machine * First building version * changelog script, yaml fixes * Contraband edits * YAML linter fixes * Fix changelog * remove AI from preferences, change borg time to 3h * Make shuttles dead drop hint exempt, parenting (new-frontiers-14#2061) * Capfruit contraband (new-frontiers-14#2073) * Automatic Changelog (new-frontiers-14#2073) * Bahama Mama's: (New) Alternative POI to Tinnia's Rest (new-frontiers-14#1932) * Adds new POI * Adds Yip Yip to Bahama Mama's (thanks, PolterTzi) * Yip Yip palettes for consistent appearance * bar firelocks, yipyip, temp fax fix, other tweaks * adjusts yip yip descriptions somewhat * Update warp_point.yml * Hide the Yip Yip palettes, touch up yip/pun * noSpawn cleanup * hide yip yip's palettes * give yip yip non-antag rules * kitchen signs * Contraband dead drop posters, freezer dir fans * Bahama Mama's: remove invalid configurators * rework hydro and anchor stuff * anchor the smokes for consistency --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1932) * Add a signal receiver to thrusters (and gyros) for remote power control (new-frontiers-14#2027) * Add a signal receiver to thrusters (and gyros) for remote power control * frontier labels * ThrusterSystem: set power when enabled is changes * Remove Frontier comment * More Frontier comments removed --------- Co-authored-by: spacedwarf14 <> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2027) * Bazaar Directional Fan Update (new-frontiers-14#2056) * Bazaar Directional Fan Update * Airtight plastic flap consistency --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2056) * Shuttle nav console, Frontier changelog title * Update GameTicker.Spawning.cs (new-frontiers-14#1966) * Automatic Changelog (new-frontiers-14#1966) * No in-hand draw into the same hand (new-frontiers-14#2038) * Automatic Changelog (new-frontiers-14#2038) * Pirate contraband turn-in (new-frontiers-14#2078) * Automatic Changelog (new-frontiers-14#2078) * condense apothecary changelog * Update toys.yml * Cave (Event) (new-frontiers-14#2042) * Cave * Update cave.yml * Update pets.yml * Update cave.yml * Update cave.yml * Minor cleanup --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2042) * Adds four new pear based meal recipes. (new-frontiers-14#2047) * Adds four new pear based meal recipes. This PR adds four new pear meal recipes. A "tart", a savory and dessert poached recipe and a simple muffin. Finally the noble pear has a home. * Recipe tweak and nutritional adjustments. * Pear fixes, pear flavor, pear ID consistency --------- Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2047) * debug map fix * brass knuckles should not be creatable, its metal weapon * Move Frontier Changelog to a separate file. (new-frontiers-14#2092) * Frontier changelog to separate file, scripts * Frontier.yml to 500 logs (manual_changelog.py) * Automatic Changelog (new-frontiers-14#2092) * Weaponry Works Cleanup * Replicated bank account, Vendor access, department * Grav generator APC moved to PowerChargeSystem * Update gourd.yml (new-frontiers-14#2088) * Automatic Changelog (new-frontiers-14#2088) * Update investigator.yml (new-frontiers-14#2090) * Automatic Changelog (new-frontiers-14#2090) * Weapon racks (Update) (new-frontiers-14#2070) * new racks * removed old racks * fixes * Revert "fixes" This reverts commit 27fe078. * Revert "removed old racks" This reverts commit 806e4f4. * ftl, filled version of salv rack * removed old racks * fixes * more fixes * tiny fix * migrations * tiny edits * Automatic Changelog (new-frontiers-14#2070) * Hauler Directional Fan Update (new-frontiers-14#2067) * Automatic Changelog (new-frontiers-14#2067) * Update placebo.yml (new-frontiers-14#2068) * Automatic Changelog (new-frontiers-14#2068) * Update phoenix.yml (new-frontiers-14#2091) * Automatic Changelog (new-frontiers-14#2091) * Update disciple.yml (new-frontiers-14#2079) * Automatic Changelog (new-frontiers-14#2079) * Spent BBs are no longer reloadable, add RGBB gun. (new-frontiers-14#2046) * Spent BBs, RGBBs, RGBB mail * Fix empty bb gun * Add eye damage * Update ProjectileSystem.cs * Add screaming --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#2046) * Update Bison tiny fans with directional fans. (new-frontiers-14#2080) * Update bison.yml * Update bison.yml * Automatic Changelog (new-frontiers-14#2080) * Update nugget.yml (new-frontiers-14#2081) * Automatic Changelog (new-frontiers-14#2081) * Update orange.yml (new-frontiers-14#2082) * Automatic Changelog (new-frontiers-14#2082) * Update point.yml (new-frontiers-14#2083) * Automatic Changelog (new-frontiers-14#2083) * Update canister.yml (new-frontiers-14#2084) * Automatic Changelog (new-frontiers-14#2084) * Update decadedove.yml (new-frontiers-14#2085) * Automatic Changelog (new-frontiers-14#2085) * Update dragonfly.yml (new-frontiers-14#2086) * Automatic Changelog (new-frontiers-14#2086) * flavour (new-frontiers-14#2026) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2026) * Fix atmos blocker indices * Expeditions: teardown resources on failures to generate. (new-frontiers-14#2063) * Teardown resources on failing expedition gen * Map Cleanup --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#2063) * Retire the Dart-X pending a rework (new-frontiers-14#2096) * Automatic Changelog (new-frontiers-14#2096) * Restore ID card mail interactions (new-frontiers-14#2095) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2095) * Remove unnecessary clears (after init) * Revert most material value rework * LVHI Shuttles (Update) (new-frontiers-14#1805) * all but brigand * beacons, brigand * upd * finishing touches * grid metadata * new eva lockers * magboots to salv eva * brigand, some more lockers * kilderkin * TelecomServerFilledShuttle * arcadia eva * directional fans * adjusted pricing a bit * brigand guidebook link at shipyard * gasbender fixes * Upd and fixes --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1805) * Remove PowerMonitoringWindow comments * Vendor cleanup, comments * Remove noSpawn instances * YAML/Fluent touch-ups * Security PDA gets bounty app, adren/drowzy for mob * mail handcuffs to zipties, restore tracking implnt * Announcement Change * Update round_announcements.yml * Revert shield value change, label mail chems * Update round_announcements.yml * Restore worldgen.enabled to true by default * cleanup space cleaner, comments * Give admin ghosts bank * sentient crates, mat cleanup, computer jank, migr * Astroids remake * Asteroid comments/groups * Bluespace ore glows under mineral scanner * Mapping * Maintain old material reclaimer behaviour * Radar IFF range & coordinate hiding for ghosts * Revert welcome announcement (for now, sorry Darin) * Dock floors and correct doors for Frontier Outpost (new-frontiers-14#2113) * dock floors and correct doors * Techmaint under doors on Frontier Outpost --------- Co-authored-by: Arimah <arimah42@gmail.com> * Automatic Changelog (new-frontiers-14#2113) * Upstream september part 2 * Upstream sept part 3 * Upstream part 4 (Delete noSpawn tags) * Upstream september part 5 * Upstream part 6 * Upstream part... 7? * Upstream part 8.. (sad..) * Upstream part 8 * Upstream part 9.. * Upstream part 10 (надеюсь, заключительная) --------- Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: Saphire Lattice <lattice@saphi.re> Co-authored-by: PopGamer46 <yt1popgamer@gmail.com> Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com> Co-authored-by: spanky-spanky <scott@wearejacob.com> Co-authored-by: JIPDawg <51352440+JIPDawg@users.noreply.github.com> Co-authored-by: JIPDawg <JIPDawg93@gmail.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Ghost-Prince <155380366+Ghost-Prince@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> Co-authored-by: FrontierATC <zuuswa@gmail.com> Co-authored-by: Milon <plmilonpl@gmail.com> Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Co-authored-by: Ilya246 <57039557+Ilya246@users.noreply.github.com> Co-authored-by: eoineoineoin <github@eoinrul.es> Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> Co-authored-by: sativaleanne <49132913+sativaleanne@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: cohanna <160202097+cohanna@users.noreply.github.com> Co-authored-by: PECK <74548962+PeccNeck@users.noreply.github.com> Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> Co-authored-by: Golden Can <greentopcan@gmail.com> Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com> Co-authored-by: dustylens <54123313+dustylens@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: saga3152 <133799418+saga3152@users.noreply.github.com> Co-authored-by: Houtblokje <44312709+Houtblokje@users.noreply.github.com> Co-authored-by: goet <6637097+goet@users.noreply.github.com> Co-authored-by: TGRCDev <tgrc@tgrc.dev> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: voidnull000 <18663194+voidnull000@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Co-authored-by: Tych0 <151581207+Tych0theSynth@users.noreply.github.com> Co-authored-by: tonotom1 <tonotom@proton.me> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: AsnDen <75905158+AsnDen@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: Soydium <pazylojvalercik@gmail.com> Co-authored-by: Shroomerian <shroomerian@protonmail.com> Co-authored-by: PotentiallyTom <67602105+PotentiallyTom@users.noreply.github.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Co-authored-by: Eagle0600 <eagle0600@yahoo.com.au> Co-authored-by: spacedwarf14 <github-ss14@dev.kibon.eu> Co-authored-by: Arimah <arimah42@gmail.com>
Sh1ntra
added a commit
to Corvax-Frontier/Frontier
that referenced
this pull request
Oct 2, 2024
* Automatic changelog update * Allows you to buckle transfer person from bed to bed (#32089) * unbuckle if the target is buckled * better way to do it * Automatic changelog update * Fland change - Add glasslocks to the Contiguous Fland Hallway Volume (#32264) * Add glasslocks to the Contiguous Fland Hallway Volume * Fix up the firelocks, hopefully! * Automatic changelog update * Removes cockroach/mothroach melee damage (#32221) no more cockroach and mothroach damage * Automatic changelog update * Makes the rat king's cheeseEm order more convenient to use (#32181) more convenient cheeseem * Automatic changelog update * Cog update (Mail) (#32315) make mailing better * Modifications to bring Omega up to date. (#32317) * Make small clamp use 2% battery instead of recharging 2% battery. (#32320) Make small clamp user 2% battery instead of recharge 2% battery. Co-authored-by: JIPDawg <JIPDawg93@gmail.com> * Automatic changelog update * Add respirator to hostile humanoid mobs (new-frontiers-14#2032) * Add fancy chairs (new-frontiers-14#2031) * Add Fancy Chairs * Update chairs.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#2031) * Fireaxe Removes Plating (Delta-V#1700), Maintenance Jack (new-frontiers-14#2018) * the return of fireaxe prying (new-frontiers-14#1700) * bullshit * fixed the fucking typo!!! * Add a maintenance jack for prying up plating * maintenance jack swing angle * Maintenance jack: huge, not ginormous --------- Co-authored-by: Milon <plmilonpl@gmail.com> * Automatic Changelog (new-frontiers-14#2018) * Bounty hunter clothes sprites, inf BountyVend (new-frontiers-14#1987) * initial commit * boots * bountyvend POI * combat gloves as C1 * fffffix * mercenary colors --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1987) * fix issues with proximity beeper (#32322) implement * Disable resizing of lobby character editor (#32313) No resizing character editor Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> * Rolebanlist command UI (#30827) * rolebanlist command opens ui * removed commented out section * More unshaded bluespace bag sprites (new-frontiers-14#1960) * bag of holding consistency * Fix 1-frame bag of holding animation lengths * fix ore bag animation lengths * Learn to count. --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1960) * Fix disposal units flushing too soon after power-on (#32314) * Don't flush disposals immediately on power-on * Update Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs --------- Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Move tank harness to outer clothing (new-frontiers-14#2028) * Move tank harness to outer clothing * Valet outer clothing fixes * Fix valet outer clothing * outerclothing, not jumpsuit * Fix pirate outer clothing * tank: hideEffects, not effects * Fix mercenary loadouts: remove tank harness --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2028) * Emp Fixups (new-frontiers-14#2034) * Fixup * Update launchers.yml * Update launchers.yml * Automatic Changelog (new-frontiers-14#2034) * Psychologist's Stamp (#31881) * added sprite and began implementation * fixed sprite name, fixed meta files * silly whitespace * added paper-stamp file * figured out where to add the componet, added 'credits' * spelling is hard * hmm * GAHHHHH * how did i do this again * Automatic changelog update * BankSystem: cached balances (new-frontiers-14#1909) * BankSystem: cache bank accounts * BankSystem: fix cache lookup player * BankSystem rewrite * BankSystem: no-ent functions, spawn event sessions * fix delta-v/frontier comments * Additional frontier session comments * BankSystem: ComponentInit function * New event for preferences being loaded --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Vagabond Piping Fix (new-frontiers-14#1976) * fix old piping + directional fans * replaces exterior waste air vent with a passive vent * Update vagabond.yml * Update vagabond.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#1976) * Edison Power POI (new-frontiers-14#1890) * initial POI and dev test quick setup * finalize * Update edison.yml * Map Fixups * Cleanup * Last fixup + NoSpawn --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Security Clown Mask is now security restricted. (#32335) made security clown masks security contraband. * Crossbows update (new-frontiers-14#1971) * initial commit * bolts * hand crossbows, additional functionality for bolts * fixes * tweaks * shootable plunger and bread * mail capsule * attack options for crossbows, bread * wooden stake changes * tag bloat (fucking bs) * sponge * fixes * quiver fix * broadhead bolt * parenting and small fix * moving things around * Update belts_crossbow_quiver.yml * Fixup * Update weapons.yml * EMP * Update crossbow.yml --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#1971) * Remove the Crown from the shipyard (new-frontiers-14#2036) * Automatic Changelog (new-frontiers-14#2036) * Avocado and Cucumber plants, with foods (new-frontiers-14#2023) * Avocado and Cucumber plants, with foods This PR adds avocado and cucumber, in addition to several new foods and drinks to make use of them. * Remove pit * Olive oil rebranding and fixes. Updates seed sprites to more contemporary forms. Uh, Olive Oil is now... Vegetable oil. Worked with Whatstone on this one. It seemed preferable to adding "avocado oil" or other redundant vegetable based oils in addition to providing a renewable way of producing oil for frying and kitchen use. Addressed issues with bad nutritional values and iffy meat tag. * Revert "Olive oil rebranding and fixes." This reverts commit 6bbe4fd. * Reverts olive oil to vegetable oil changes. Retains "oil" reagent for avocado. * Cucumber slice color, longer cukes, recipe amounts * Cucumber water cucumber colour (cucumber) * Add vegetable oil * Add the forgotten cucumber sprite * fix avocado oil, description is small --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2023) * Soda water and Vodka recipes (#32252) * SodaWater and Vodka recipes * Changed crystals recipe in fun.yml * plasma is now a catalyst to create crystals * Revert "plasma is now a catalyst to create crystals" This reverts commit 1002d9927a3597f7a02611071ef3f706cd056a41. * Revert "Changed crystals recipe in fun.yml" This reverts commit 30b6b602228ec1b11a46e390c6a5868494e2b61f. * Stir to make Vodka * Shake to make soda water * fix * Automatic changelog update * PTech Changes: Infinite ID cards and Encryption keys (new-frontiers-14#2014) * Make ptech great again * Cleanup * Content * Update vending_machine_restock.yml * Remove pens from SR PTech, add sr/nfsd forms * Brown and green PAL folders with docs --------- Co-authored-by: Dvir <dvirf01@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> * Fix medical PDA/health analyzer long range intel bug (#31879) * hide spriteview from health analyzer while inactive * add out of range indicator if analyzer becomes inactive * hide out of range icon if there is no patient data * Automatic changelog update * Added a directory to station maps (#31156) * Added directory to station maps * Add null checks to map directory sorting/filtering * Reworked station map directory to be more readable and responsive * Automatic changelog update * Add skirt of life in contraband medidrobe (#32214) * Fix a spelling mistake in the DonutVend's advertisments (#32348) change that one line so i never think about this again * Allow some mobs to not despawn with events (new-frontiers-14#2039) * Allow some mobs to not despawn with events * Update BluespaceErrorRule.cs * Comments, field rename --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Flora anomaly seeds (#31987) * content * Update meta.json * Update mobspawn.yml * Update mobspawn.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml * Update Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml * Update Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml * Update Resources/Prototypes/Entities/Effects/mobspawn.yml --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Automatic changelog update * Bank Data (Take 2) (new-frontiers-14#1399) * BankLable Corvax * Update PlayerTabHeader.xaml * Fixup * Update PlayerTab.xaml.cs * Update PlayerTabEntry.xaml.cs * Cleanup * Update BankSystem.cs * Update PlayerTabHeader.xaml * Allow bank update of 0, group overlay fields * Update Content.Client/Administration/AdminNameOverlay.cs Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> * Update Content.Client/Administration/AdminNameOverlay.cs Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> * Update Content.Server/_NF/Bank/BankSystem.cs Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> * Update Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Long gun, long case (new-frontiers-14#2044) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2044) * fix cargo order scams, fix internals crate desc (#32350) fix description, fix scams * Better dock signage (new-frontiers-14#2040) * New bus and dock signs * Attribution * Stratos indentation fix * Small edit * Update migration.yml --------- Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#2040) * NT Fishbowl 2.0 (new-frontiers-14#1995) * updated fishbowl * CentCom --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#1995) * Akupara directional fan compliance patch (new-frontiers-14#1979) * fixed guidebook typo, reverted SMES feedback, deleted stray MV cable, added emergency air locker at entrance * refactored the lv cables for better access and coverage added intercoms in atmos: radioless ghostroles rejoice! * Update akupara.yml * Update akupara.yml --------- Co-authored-by: Dvir <dvirf01@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1979) * Rat kings can butcher things (#32232) * rat kings can butcher things * minor organization * fix * important comma * Automatic changelog update * Update Credits (#32362) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * AI now "can" use media console (#32334) * Make buckle mint (#32370) - Fix the unbuckle mispredicts. - Fix unbuckle offset existing. - Fix interaction range not aligning with interactionoutline system. * Automatic changelog update * Adding a holy watermelon helmet (#32272) * lolkekhatholy alalalla * animationcreate blelebleblbeleb * Automatic changelog update * added the ability for pigs to feed themselves (#32358) * pigs can eat * disable carcinisation * Smuggling posters are now random and NFSD gets rewarded for getting prints of posters and dead drops (new-frontiers-14#1667) * Changed the time between dead drops and distance * Removed deprecated GetMapEntityId for TryGetMap * Removed tags that match autogenereated ones and simplified new Color * Made the distance even smaller * Revert "Made the distance even smaller" This reverts commit a008ba6. * Added check to see how many dead drop components are nearby * Changed behaviour of dead drop posters and added all of the previous posters to the dead drop system * Posters are finally random, only one can be active per point of interest * Added a message of the drop pod location to the NSFD after 15 minutes and made the wait time faster for posters * Scanning activated dead drop posters gives 30k cash to NFSD and dead drop location is now said by NFSD Outpost * NFSD scanning objects on the dead drop will reward them with 60k spessos and functioned the code for giving rewards * Changed spessos rewards to FUC * The timer now resets for the current poster if it detects any other posters that are active nearby * Lowered the chance of posters appearing and thus being Dead Drops, made pirates have a 1/3 of knowing the smuggler's ship ID after 15 minutes and added a guidebook entry * Increased the MinimumCooldown to 15 minutes and NFSD now gets progressive hints at dead drop posters' locations * Syndicate Supply Ships are now limited to 5 and if more are spawned, the oldest one gets deleted. Also only detectives get rewards for scanning dead drops and their posters * Moved all of the radio strings to locale and additional comments * Forensic scanner system now tracks based on access level rather than role name, removed accidental file and added a 1/10 chance to spawn a syndicate mob in the dead drop. Also fixed some stuff from last commit * Removed the syndicate mob guy because he would step on mines and lose his gun after FTL * Changed the dead drop poster cooldown to 5-10 minutes but now only 2 can be active at a time * Random contraband generation, part one * Station dead drop config, generation * Forensics cartridge, nfsd uplink entry * forensic scanner, staton definitions * Missing/inconsistent localization strings * HardSuit->Hardsuit * A few more uplink fixes * Revise dead drop tracking, always payout, add $ * Prototype-based smuggling message passing * POI map fixes, revert health, remove MapInit * Logging, anchored items, no drops @ courthouse * Dead drop value fiddling, uplink rewrites * cleanup * CVARS! * Move prototype to Shared * Fix config, cleanup, random error in drop pod msgs * fix forensic printouts, dead drop spawn menu * separate speso/fuc reward prints * Min/Max delay to floats * DeadDropSystem: type fix * Fix pirate delay, NFSD delay: 14-16 mins * Random fax generator & event * Roundstart hint generation * Remove test dead drop hints * Bugfixes for dead drop hint gen * more paper! * Smuggling guidebook entry, remove unneeded sec pgs * More smoog crate value, c3 trade crates, debug * Better drop pod scanner rewards * DD writable VV field, fix crate parent * WindowedEvent fixes * event naming * Add time to dead drop notes * Freelancer->Freelance channel * PodLocation messages: fix precision for vectors * Disable shipyard sale component, tweak smoog param * Multiple faxes per event * fax and logic * security_uplink_catalog: forensic module 2->4 FUC --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1667) * Lemons, limes, and oranges can now be mutated into each other (#32306) * Automatic changelog update * Makes it possible to disable the vent pressure lockout temporarily with a screwdriver (#31050) * builds * doesn't crash * seems to work * distance cap was dumb * Requested changes * can't find any issues from making the changes * Check for anchor and minor optimisation * Removed unnecessary usings * Code less verbose and cleanup * Automatic changelog update * reach update :3 (#32387) * Add the Syndicate Instigator Shuttle (#32083) * Instigator * sustenance * Predict vending machine BUI (#32376) * Include container ents in examine (#32267) Mainly for closets but if it's like a mouse in a bag they can see what's in the bag type deal. * Automatic changelog update * L6 Fits in the Suit Storage Slot (#30525) * L6 Fits in the Suit Storage Slot * 5x4 item * Automatic changelog update * Entity menu lookup changes (#32395) * Automatic changelog update * Computer wirepanel (#32273) * Computer wirehacking * Power wire now shocks * deconstruction fix * updated tests * Better parenting * maintenance panel sprite * new sprite for maintenance panel open * Apothecary directional Fan update and housekeeping. (new-frontiers-14#1926) * Removes Apothecary Microwave and adds some housekeeping. Microwave out. Cosmetic adjustments to decals and some pipe and locker reworks in. Details in the PR. * Updates with directional fans Swapped out tiny fans with directional fans. Tested orientation and walked around in the ship. Seem to work a treat. * Updates with new FSB posters and fluff text. * Correct chemistry shelf and power/guidebook updates. Replaced chemistry shelf with unsecure version. Whoops. Added n2/o2 emergency closet. Added doctor emergency EVA suit. Replaced plasma generator with uranium (plasma couldn't practically keep up with medical power draw) Updated guidebook for uranium instructions. Added secure metal shelf to ward wall. --------- Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1926) * Stasis Directional Fan Update (new-frontiers-14#1967) * Stasis Directional Fan Update Adds directional fans to the Stasis, along with some housekeeping. * Updates with new SFB posters. * Noticed the guidebook update seemed to have been lost or overwritten in the shuffle. Updated. * Medical EVA locker and o2/n2 lockers. --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1967) * NSF Broadhead 2.0 (new-frontiers-14#2033) * updated broadhead * set generator power * Automatic Changelog (new-frontiers-14#2033) * SBB Lyrae 1.2 (new-frontiers-14#2016) * updated lyrae * updated price * Automatic Changelog (new-frontiers-14#2016) * Update Ceres with directional fans + other goodies (new-frontiers-14#2041) * Automatic Changelog (new-frontiers-14#2041) * Update Bookworm with directional fans, atmos mixer + more (new-frontiers-14#2043) * NC Piecrust: Update (new-frontiers-14#1992) * update piecrust.yml * added another sink * pricing * Replaced kitchen tinyfan, air mixer 79 / 21 --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#2043) * Automatic Changelog (new-frontiers-14#1992) * Prospector tiny fan update (new-frontiers-14#2050) * Prospector tiny fan update * SignShipDock->NFSignDock pending a better sign --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2050) * loader directional fan update (new-frontiers-14#2051) * Garden Directional Fan Update (new-frontiers-14#2052) * Garden Directional Fan Update * Updates garden main room air sensors * Garden: remove invalid configurators --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2051) * Update chisel.yml (new-frontiers-14#2053) * Automatic Changelog (new-frontiers-14#2052) * Automatic Changelog (new-frontiers-14#2053) * Updates Kestrel Directional Fans (new-frontiers-14#2054) Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2054) * Comet Directional Fan Update (new-frontiers-14#2055) * Comet Directional Fan Update * Minor cleanup: AME, pump, paper * Replace waste pump with max version (consistency) * add floor tile to dock --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2055) * Bulker Directional Fan Update (new-frontiers-14#2057) * Automatic Changelog (new-frontiers-14#2057) * Bocadillo Directional Fan Update (new-frontiers-14#2058) * Bocadillo Directional Fan Update * Fix invalid entity references --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2058) * Spirit Directional Fan Update (new-frontiers-14#2059) * Spirit Directional Fan Update * Rotate NanoMed, remove invalid ents, attrib --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2059) * Pathfinder directional fans update (new-frontiers-14#2060) * Pathfinder directional fans update Replaced all tiny fans with directional fans Also added coloured decals for the O2 and N2 connector ports and gave them names. * Removed custom connector port names Also changed gas mix to 79/21 from 78/22 per request. * Remove whitespace --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Sprinter shuttle update (new-frontiers-14#2062) * Sprinter directional fans update Replaced tiny fans with directional fans. Named O2 and N2 ports and added decals. Replaced medical doctor's locker with wallmount. Added dirt where the locker used to be. * Fixed uid conflict Fixed conflicting uids that prevented the map from loading. Fixed rotation on two directional fans. * Removed redundant whitespace * Replaced AME fuel rack with wall locker. Moved gyroscope into engineering, using the space vacated by the fuel rack. * Revert gyroscope change I missed the matching gyroscope on the other side, and the fact that the LV cables were required for the thrusters, not just the gyroscope. * Requested changes Removed custom named from connector ports. Removed mapped coat. * NT Bottleneck 2.0 (new-frontiers-14#1996) * updated bottleneck * adjust generator again * Add security button to cond. illegal matches --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2060) * Automatic Changelog (new-frontiers-14#1996) * Resolve most C# conflicts except vending machine * First building version * changelog script, yaml fixes * Contraband edits * YAML linter fixes * Fix changelog * remove AI from preferences, change borg time to 3h * Make shuttles dead drop hint exempt, parenting (new-frontiers-14#2061) * Capfruit contraband (new-frontiers-14#2073) * Automatic Changelog (new-frontiers-14#2073) * Bahama Mama's: (New) Alternative POI to Tinnia's Rest (new-frontiers-14#1932) * Adds new POI * Adds Yip Yip to Bahama Mama's (thanks, PolterTzi) * Yip Yip palettes for consistent appearance * bar firelocks, yipyip, temp fax fix, other tweaks * adjusts yip yip descriptions somewhat * Update warp_point.yml * Hide the Yip Yip palettes, touch up yip/pun * noSpawn cleanup * hide yip yip's palettes * give yip yip non-antag rules * kitchen signs * Contraband dead drop posters, freezer dir fans * Bahama Mama's: remove invalid configurators * rework hydro and anchor stuff * anchor the smokes for consistency --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1932) * Add a signal receiver to thrusters (and gyros) for remote power control (new-frontiers-14#2027) * Add a signal receiver to thrusters (and gyros) for remote power control * frontier labels * ThrusterSystem: set power when enabled is changes * Remove Frontier comment * More Frontier comments removed --------- Co-authored-by: spacedwarf14 <> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2027) * Bazaar Directional Fan Update (new-frontiers-14#2056) * Bazaar Directional Fan Update * Airtight plastic flap consistency --------- Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2056) * Shuttle nav console, Frontier changelog title * Update GameTicker.Spawning.cs (new-frontiers-14#1966) * Automatic Changelog (new-frontiers-14#1966) * No in-hand draw into the same hand (new-frontiers-14#2038) * Automatic Changelog (new-frontiers-14#2038) * Pirate contraband turn-in (new-frontiers-14#2078) * Automatic Changelog (new-frontiers-14#2078) * condense apothecary changelog * Update toys.yml * Cave (Event) (new-frontiers-14#2042) * Cave * Update cave.yml * Update pets.yml * Update cave.yml * Update cave.yml * Minor cleanup --------- Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2042) * Adds four new pear based meal recipes. (new-frontiers-14#2047) * Adds four new pear based meal recipes. This PR adds four new pear meal recipes. A "tart", a savory and dessert poached recipe and a simple muffin. Finally the noble pear has a home. * Recipe tweak and nutritional adjustments. * Pear fixes, pear flavor, pear ID consistency --------- Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> * Automatic Changelog (new-frontiers-14#2047) * debug map fix * brass knuckles should not be creatable, its metal weapon * Move Frontier Changelog to a separate file. (new-frontiers-14#2092) * Frontier changelog to separate file, scripts * Frontier.yml to 500 logs (manual_changelog.py) * Automatic Changelog (new-frontiers-14#2092) * Weaponry Works Cleanup * Replicated bank account, Vendor access, department * Grav generator APC moved to PowerChargeSystem * Update gourd.yml (new-frontiers-14#2088) * Automatic Changelog (new-frontiers-14#2088) * Update investigator.yml (new-frontiers-14#2090) * Automatic Changelog (new-frontiers-14#2090) * Weapon racks (Update) (new-frontiers-14#2070) * new racks * removed old racks * fixes * Revert "fixes" This reverts commit 27fe078. * Revert "removed old racks" This reverts commit 806e4f4. * ftl, filled version of salv rack * removed old racks * fixes * more fixes * tiny fix * migrations * tiny edits * Automatic Changelog (new-frontiers-14#2070) * Hauler Directional Fan Update (new-frontiers-14#2067) * Automatic Changelog (new-frontiers-14#2067) * Update placebo.yml (new-frontiers-14#2068) * Automatic Changelog (new-frontiers-14#2068) * Update phoenix.yml (new-frontiers-14#2091) * Automatic Changelog (new-frontiers-14#2091) * Update disciple.yml (new-frontiers-14#2079) * Automatic Changelog (new-frontiers-14#2079) * Spent BBs are no longer reloadable, add RGBB gun. (new-frontiers-14#2046) * Spent BBs, RGBBs, RGBB mail * Fix empty bb gun * Add eye damage * Update ProjectileSystem.cs * Add screaming --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#2046) * Update Bison tiny fans with directional fans. (new-frontiers-14#2080) * Update bison.yml * Update bison.yml * Automatic Changelog (new-frontiers-14#2080) * Update nugget.yml (new-frontiers-14#2081) * Automatic Changelog (new-frontiers-14#2081) * Update orange.yml (new-frontiers-14#2082) * Automatic Changelog (new-frontiers-14#2082) * Update point.yml (new-frontiers-14#2083) * Automatic Changelog (new-frontiers-14#2083) * Update canister.yml (new-frontiers-14#2084) * Automatic Changelog (new-frontiers-14#2084) * Update decadedove.yml (new-frontiers-14#2085) * Automatic Changelog (new-frontiers-14#2085) * Update dragonfly.yml (new-frontiers-14#2086) * Automatic Changelog (new-frontiers-14#2086) * flavour (new-frontiers-14#2026) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2026) * Fix atmos blocker indices * Expeditions: teardown resources on failures to generate. (new-frontiers-14#2063) * Teardown resources on failing expedition gen * Map Cleanup --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> * Automatic Changelog (new-frontiers-14#2063) * Retire the Dart-X pending a rework (new-frontiers-14#2096) * Automatic Changelog (new-frontiers-14#2096) * Restore ID card mail interactions (new-frontiers-14#2095) Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#2095) * Remove unnecessary clears (after init) * Revert most material value rework * LVHI Shuttles (Update) (new-frontiers-14#1805) * all but brigand * beacons, brigand * upd * finishing touches * grid metadata * new eva lockers * magboots to salv eva * brigand, some more lockers * kilderkin * TelecomServerFilledShuttle * arcadia eva * directional fans * adjusted pricing a bit * brigand guidebook link at shipyard * gasbender fixes * Upd and fixes --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> * Automatic Changelog (new-frontiers-14#1805) * Remove PowerMonitoringWindow comments * Vendor cleanup, comments * Remove noSpawn instances * YAML/Fluent touch-ups * Security PDA gets bounty app, adren/drowzy for mob * mail handcuffs to zipties, restore tracking implnt * Announcement Change * Update round_announcements.yml * Revert shield value change, label mail chems * Update round_announcements.yml * Restore worldgen.enabled to true by default * cleanup space cleaner, comments * Give admin ghosts bank * sentient crates, mat cleanup, computer jank, migr * Astroids remake * Asteroid comments/groups * Bluespace ore glows under mineral scanner * Mapping * Maintain old material reclaimer behaviour * Radar IFF range & coordinate hiding for ghosts * Revert welcome announcement (for now, sorry Darin) * Dock floors and correct doors for Frontier Outpost (new-frontiers-14#2113) * dock floors and correct doors * Techmaint under doors on Frontier Outpost --------- Co-authored-by: Arimah <arimah42@gmail.com> * Automatic Changelog (new-frontiers-14#2113) * Upstream september part 2 * Upstream sept part 3 * Upstream part 4 (Delete noSpawn tags) * Upstream september part 5 * Upstream part 6 * Upstream part... 7? * Upstream part 8.. (sad..) * Upstream part 8 * Upstream part 9.. * Upstream part 10 (надеюсь, заключительная) * Временно сменим игровую карту на старый фронтир --------- Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: Saphire Lattice <lattice@saphi.re> Co-authored-by: PopGamer46 <yt1popgamer@gmail.com> Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com> Co-authored-by: spanky-spanky <scott@wearejacob.com> Co-authored-by: JIPDawg <51352440+JIPDawg@users.noreply.github.com> Co-authored-by: JIPDawg <JIPDawg93@gmail.com> Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Ghost-Prince <155380366+Ghost-Prince@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir <dvirf01@gmail.com> Co-authored-by: FrontierATC <zuuswa@gmail.com> Co-authored-by: Milon <plmilonpl@gmail.com> Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Co-authored-by: Ilya246 <57039557+Ilya246@users.noreply.github.com> Co-authored-by: eoineoineoin <github@eoinrul.es> Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> Co-authored-by: sativaleanne <49132913+sativaleanne@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: cohanna <160202097+cohanna@users.noreply.github.com> Co-authored-by: PECK <74548962+PeccNeck@users.noreply.github.com> Co-authored-by: Checkraze <71046427+Cheackraze@users.noreply.github.com> Co-authored-by: Golden Can <greentopcan@gmail.com> Co-authored-by: Alice "Arimah" Heurlin <30327355+arimah@users.noreply.github.com> Co-authored-by: dustylens <54123313+dustylens@users.noreply.github.com> Co-authored-by: Whatstone <whatston3@gmail.com> Co-authored-by: saga3152 <133799418+saga3152@users.noreply.github.com> Co-authored-by: Houtblokje <44312709+Houtblokje@users.noreply.github.com> Co-authored-by: goet <6637097+goet@users.noreply.github.com> Co-authored-by: TGRCDev <tgrc@tgrc.dev> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: voidnull000 <18663194+voidnull000@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Co-authored-by: Tych0 <151581207+Tych0theSynth@users.noreply.github.com> Co-authored-by: tonotom1 <tonotom@proton.me> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: AsnDen <75905158+AsnDen@users.noreply.github.com> Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com> Co-authored-by: Soydium <pazylojvalercik@gmail.com> Co-authored-by: Shroomerian <shroomerian@protonmail.com> Co-authored-by: PotentiallyTom <67602105+PotentiallyTom@users.noreply.github.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Co-authored-by: Eagle0600 <eagle0600@yahoo.com.au> Co-authored-by: spacedwarf14 <github-ss14@dev.kibon.eu> Co-authored-by: Arimah <arimah42@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
This PR adds four new pear meal recipes. A "tart", a savory and dessert poached recipe and a simple muffin.
Finally the noble pear has a home.
Why / Balance
There were 0 recipes for the pear. Seemed like the thing to do.
How to test
Prepare each of the meals. Should work a treat.
I would appreciate, as always, a critical eye on my sprites and the final recipes/values. This is an emerging skill for me and I recognize that there is certainly room for improvement.
Media
Requirements
Breaking changes
None.
Changelog
🆑