Separates the meat crate into Premium crate and Budget crate. #33617
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
|
I'd say just order more crates. Discount Dan doesn't like competition... |
|
Instead why don't you create 2 different crates? Premium & Choice Meats - bear, mimic, crab, nymph, leafy/diona, xeno, carp, chicken, pork (add), meat (generic) |
That's an idea. I'd remove the spider eggs though. It ain't meat, can't be picked up with the plant bag (which holds meat), and only 2 very specific sushi recipes use it. |
|
Spider eggs are already in the meat crate so you will be r-wording it |
I know, that's just a complaint I have. |
Kurfursten
reviewed
Oct 31, 2022
Eneocho
changed the title
|
This version of the PR is vastly superior to the straight buff to the number of meats. Now the Chef can get either "normal" meat or actually good meat! |
|
since when was nymph meat considered primo cuts? |
Eneocho
changed the title
GeneralVeers25
added a commit
to GeneralVeers25/vgstation13
that referenced
this pull request
Dec 13, 2022
* [ci skip] Automatic changelog update. * tom and jerry male catbeast screams (vgstation-coders#33502) * tom and jerry catbeast screams * tajaran screaming file list * make catbeasts scream different * Planes and Darkness (vgstation-coders#33052) * darkness * darkness * Update login.dm * looks better * vision fixes * vamp vision fix * Update grue.dm * I don't know what I'm doing * Update glasses.dm * Update vampire.dm * remove backdrop * toggle darkness * adjust human sight * Update eyes.dm * fixed shifty's mistakes * grue drainlight is shit * spider vision * move to carbon level * [ci skip] Automatic changelog update. * Add Lights to Gold Hardsuit Helmet (vgstation-coders#33496) ## What this does Adds lights and appropriate sprites to the gold atmos hardsuit helmet ## Why it's good Someone might actually use the golden hardsuit instead of leaving it sitting on the table every round. ## Changelog * tweak: The gold hardsuit's helmet now puts out light just like all the others. * imageadd: Added new sprites for gold hardsuit helmet with light * SaMMI switch for ghost polling (vgstation-coders#33498) * SaMMI switch for ghost polling * SaMMI switch for ghost polling * SaMMI switch for ghost polling * fix for this * no longer needed Co-authored-by: SECBATON GRIFFON <sage> * Nerfs fire (vgstation-coders#33513) * [ci skip] Automatic changelog update. * [ci skip] Automatic changelog update. * Frankenline Station Bug Fixes + Changes (vgstation-coders#33530) * Moved Suit Storages and Added Reinforced Walls * Replaces Sec Suits in Eva with Atmos Suits and Reinforces walls * Fixes CE RCD and Airlock Beside Bridge * Fixes Firedoors, Deletes windows / backdoor to teleporter * Moved Atmos Tech Equipment Area * Adds Airlock to Shard Chamber, Fixes Engineering exteneral airlocks * Added Wallmounted O2 Locker to Shard Airlock * Fixed Area for SM Airlock, Also Fixes EVA Windoor Name/Types * [ci skip] Automatic changelog update. * Clover Cream Pies, now with actual cream! (vgstation-coders#33515) * clover cream pie * clover cream pie also changed the name of the previous clover cream pie to just clover pie * clover cream pie icon * clover cream pie left inhand * clover cream pie right inhand * Update snacks.dm * whipped clover pies transfer luck to the mob * tweak * [ci skip] Automatic changelog update. * Better Engineering Priority Rewards (vgstation-coders#33475) * Changes Engineering Priority Rewards to Include Atmospheric Analysis Scope & OmniTool * Added Engineering Drink * Updated Name and Srite * Adds Mechanic Rewards * Changed Hyro Amount in Energizer * Added Shard Variant For Engineering Coffee * Fixes object path * Added Sprites * Added the Valuable Asteroid Item * [ci skip] Automatic changelog update. * Zinc Saucier Crate (vgstation-coders#33520) * progress * Complete * linters * reaper bag icon * [ci skip] Automatic changelog update. * Fixes some erroneous string macros (vgstation-coders#33543) * Update une_cards.dm * Update une_cards.dm * Update cluwne.dm * Update faguette.dm * Remove an invalid string macro (vgstation-coders#33542) * dead icon fix * [ci skip] Automatic changelog update. * a (vgstation-coders#33548) * [ci skip] Automatic changelog update. * Tone down threat generation hopefully. * Forgot this bit * Update cosmetics.dm (vgstation-coders#33494) * [ci skip] Automatic changelog update. * Clown Language Tweaks (vgstation-coders#33509) * tweaks clownlanguage * Update language.dm * Xenoarch digsite scanner tweaks (vgstation-coders#33528) * Clearer digsites in scanner * better line * description update * only for subsequents Co-authored-by: SECBATON GRIFFON <sage> * [ci skip] Automatic changelog update. * Adds a karmotrine drink reaction MK II: Conflict fix (vgstation-coders#33560) * define * reagents * reaction * sprites * You will eat the bugs. 5 roach/cricket based dishes. (vgstation-coders#33555) * gunk burgers and gunk kabob * . * gunkburger and gunk kabob * icons * better * super gunk burger and hoppers * hoppers and super gunk burger * better hoppers * Update snacks.dm * hoppers and super burgers why not * hoppers trash * hoppers trash icon * fix * fix missing pixel * mooncheese supergunk * . * . * skittering burgers * hoppers * I think this works? Unoptimal for sure though * tweak and fix? * fix for sure now * Update recipes_microwave.dm * . * burger inhands * right hand inhands * IMLSHNS? * they twitch now * [ci skip] Automatic changelog update. * Wizard's Arcane Tamper (vgstation-coders#33409) * beginning work on it * the spell * invocations and capitalization fix * defibs n vendors * case... * machine frames * compooters too * T * removes on death of mob * removes on death of mob * removes on death of mob * Canisters and hacking * Canisters and hacking * inverted key behavior * potted plants * potted plants * couches * improves glass, visuals and method of saying things * actual sprites and spellbook downside * making it work * food tampering * new spell method * kicking * kicking * the hungry bag * the hungry bag * the hungry bag * the hungry bag * the hungry bag * movables * more fun with welding tanks * comms consoles * request ones too * markov paper * better like this * better like this * randomised artifact * starts on by default * rand not random * slot machines too * removing this because if recursive casting is on it's just unfair * spell cost adjust, microwaves, hydroponics * door now properly stuck * envelopes * attempt at fixing vehicle stuff * attempt at fixing vehicle stuff * mirrors * cash * ID access random spam sanity * Better system * Better system * doors like this * doors like this * better pen stuff * more stuff * more stuff * spoons and forks * conveyors * cables * grenades * grenades * grenades now work * sharts * singulo * fix * mops and janicarts * mops and janicarts * dna * switchtool * lotto vend * inherit you git * i said INHERIT * arcade * removing this * only once please * ways to do this * better * more table fun Co-authored-by: SECBATON GRIFFON <sage> * [ci skip] Automatic changelog update. * Relativewall code cleanup (vgstation-coders#33539) * Relativewall code cleanup * some other PR maybe * was testing something, again for another PR * not used * Revert "not used" This reverts commit e70a197. * standardised border object stuff Co-authored-by: SECBATON GRIFFON <sage> * Halligan Improvements (vgstation-coders#33503) * uses default crowbar behavior for unpowered airlocks * shutter cutting * halligan sound * a * sprites * fix * fix * CE buffs * adjustment * fixes * REEEE * finally * Review update * ok * stalled scrubbers turn red (vgstation-coders#33531) * stalled scrubber sprites * stalled scrubber code(semi functional) * fixes stalled scrubber sprites * [ci skip] Automatic changelog update. * Increases quality of the other filk song too (vgstation-coders#33549) Co-authored-by: SECBATON GRIFFON <sage> * Heads Count for Priority when Subordinate are Prioritized. (vgstation-coders#33550) * Added Skeleton of Job Priority System * Removed Department Prioritization from Civilian Department * Final Bugfixes * Added Xenoarchaeologist * Fix double assign from last bugfix! * Fixed Line being default station. * Fix map in DME * Fire alarm sound fixes (vgstation-coders#33556) * [ci skip] Automatic changelog update. * Fixes a dumb little mistake where to_chats slipped through (vgstation-coders#33561) * Fixes gunk burger issues. (vgstation-coders#33564) * fix hopcorn issue * fix burger north inhand * fixes burger north sprite * [ci skip] Automatic changelog update. * adjust exponential threat generation * Uhhhh that did not work well for threat * Undo dynamic changes returning us to lorentz while toning down the threat generation of lorentz by 15% to start and 40% less for midround threat. * Emags and Glue bundle tweak. (vgstation-coders#33573) * emags and glue bundle tweak * welp * Smoothed windows (vgstation-coders#33574) * first do some window code cleanup * icons * icon preparation * actual smoothing * do it in here instead * do it in here instead * fixes * wont be needing this * icon fixes * fix * fix * neighbours on turf too Co-authored-by: SECBATON GRIFFON <sage> * Cricket Behind Fridge (vgstation-coders#33567) * Even more bug food. You will eat the bugs II: Electric Boogaloo. (vgstation-coders#33568) * relocates gunk snacks and adds a few more * relocates gunk food and adds some more * bugs on the getmore contraband * icons * . * fix * . * gunks define * rework * forgot * better icon for getmore * . * . * . * . * Cookable PCP (vgstation-coders#33572) * Arcane tamper speed update (vgstation-coders#33580) * Arcane tamper speed update * Arcane tamper speed update * Arcane tamper speed update Co-authored-by: SECBATON GRIFFON <sage> * Reticulated Vest (vgstation-coders#33464) * Fixes picking up and dragging items from z-levels below (vgstation-coders#33583) * Fixes picking up and dragging items from z-levels below * wrong map * helps anyways * helps anyways Co-authored-by: SECBATON GRIFFON <sage> * Wage payouts to virtual wallets (vgstation-coders#33537) * Wage payouts to virtual wallets * Wage payouts to virtual wallets * ATMs too * decimal patch Co-authored-by: SECBATON GRIFFON <sage> * Makes lamps, but not flashlights, consume power from the APC. (vgstation-coders#33471) * Update flashlight.dm Powered lamps. * Update flashlight.dm Optimize * Update flashlight.dm Fix scaling. * Update flashlight.dm Remove duplicate proc. * Update flashlight.dm Handle edge case of lamps being mapped in or spawned in "on". * Update flashlight.dm * Update flashlight.dm Fix lamps not being on in occupied departments. * Update flashlight.dm * Update flashlight.dm * Update lightswitch.dm Start off * Update gameticker.dm * Update flashlight.dm * Update gameticker.dm * Update gameticker.dm * Update flashlight.dm * Update lightswitch.dm * Update flashlight.dm * Update gameticker.dm * Update lightswitch.dm * Update flashlight.dm * [ci skip] Automatic changelog update. * [ci skip] Automatic changelog update. * Trophy Meats crate buff. (vgstation-coders#33562) * more meats * namechange * more missing meats * [ci skip] Automatic changelog update. * Snow turf climate and prints refactoring (vgstation-coders#33590) * testing this out * testing this out * testing this out * final version * final version * final version * final version * final version * now with math * clearer comments * now the overlay works right, everything tested * changes map back * cutdown * safety parantheses * no reason to process these tiles * no reason to make these if no snowprints exist * and map back again Co-authored-by: SECBATON GRIFFON <sage> * a (vgstation-coders#33592) * skin grafts and surgical sutures (from CM) (vgstation-coders#33461) * add sutures to cargo crate * add suture items * suturing surgery code * synthgraft and surgical line sprites * add sutures to the compile list * makes it compile, hopefully * makes it compile for real * removes a gotcha from hypothetical future suture code i'm not really sure how all the inheritance works * make the string only span one line of code * capitalisation fix * removes highlander (vgstation-coders#33589) * [ci skip] Automatic changelog update. * Cricket Fix (vgstation-coders#33604) * [ci skip] Automatic changelog update. * Adjusted quick equip (vgstation-coders#33579) * Adjusted quick equip * adds support for these slots * moves these down due to it * allow checking others * keep the belts high * putting stuff in things you hold * static list since it never gets changed anyways Co-authored-by: SECBATON GRIFFON <sage> * Removes splashing vending machines (vgstation-coders#33585) * Flips requirement list (vgstation-coders#33586) * Blob and Blobstorm Stricter Requirements (vgstation-coders#33587) * Blob nerfs * additional scaling * and this one too * Cancel threat nerf * hits the blob_storm too * remember to test your code * space cleaner no longer requires limb targeting to clean held items / clothing (vgstation-coders#33591) * space cleaner no longer requires limb targeting to clean held items * missing tab * remove limb target requirements for worn clothes too * Direct Sound (vgstation-coders#33595) * Mule Sprite (vgstation-coders#33596) * [ci skip] Automatic changelog update. * the changes (vgstation-coders#33598) engineering window, shop bugged grille, trader outpost dupe firelocks * [ci skip] Automatic changelog update. * Graffiti poisitoning and text size (vgstation-coders#33599) * clipping stuff needs serious work but mostly done * behold, a way for admins to varedit graffiti appearance * Much closer to working now * sorting this here * step in right direction anyways * walls fixed * code cutdown * normal non-text stuff now works perfectly * proper text trimming * this will have to do * this will have to do * makes min font bigger for legibility, factors it into drawing time * better use of defines * corner fix * moves into here * moves into here * moves into here * moves into here * moves into here * moves into here * moves into here * moves into here * moves into here * moves into here * moves into here * moves into here * moves into here * new font * new font * actual use * make adjustments right in preview too * better preview Co-authored-by: SECBATON GRIFFON <sage> * [ci skip] Automatic changelog update. * A few extra costumes for the halloween crate (vgstation-coders#33610) * Vampire costume * Reaper costume, and extra skeleton costumes * Slasher costume + fixes * Devil costume * [ci skip] Automatic changelog update. * Spooky Mommi for Halloween (vgstation-coders#33621) * Update mommi_modules.dm skull mommi sprite selection * adds spooky mommi boo * Update mommi_modules.dm * Update mommi_modules.dm Co-authored-by: Kurfursten <scouttac@gmail.com> * [ci skip] Automatic changelog update. * Moves in-hand quick equip priority to bottom (vgstation-coders#33637) Co-authored-by: SECBATON GRIFFON <sage> * [ci skip] Automatic changelog update. * Fixes broken baguloosing (vgstation-coders#33638) * Fixes broken baguloosing * too cumbersome, keep as is and do some other day * get em all * get em all * get em all * get em all Co-authored-by: SECBATON GRIFFON <sage> * Fixes windows not smoothing when anchored (vgstation-coders#33634) Co-authored-by: SECBATON GRIFFON <sage> * Pajamas Fit Vox (vgstation-coders#33632) * Pajamas Fit Vox * Update uniform.dmi * veers... (vgstation-coders#33629) * Attacking simplemobs plays your weapon hitsound. (vgstation-coders#33626) * Update simple_animal.dm * Update corpse.dm * Update corpse.dm * Update corpse.dm * mutated cockroach meat name (vgstation-coders#33619) * [ci skip] Automatic changelog update. * bomberman arenas can now be called even after the round has ended (vgstation-coders#33614) * Fixes some gunk food issues and minor "Roaches on a stick" tweak. (vgstation-coders#33616) * fixes some gunkfood issues * fixes roachesonastick issue and removes egg * Separates the meat crate into Premium crate and Budget crate. (vgstation-coders#33617) * assorted meats crate buff * separates the meat crate into premium and assorted * Update supplypacks.dm * pork too * [ci skip] Automatic changelog update. * Cooking with frying pans (vgstation-coders#33569) * Beginnings of frying pan. * Sprite stuff and make cooking use process(). * Some progress towards being able to put a frying pan on a grill. * More progress. * More progress towards campfires and barrels. Recipe flags. * Progress on the various cooktops and standardize var names. * Wearing frying pans. * Get bunsen burners working. Hopefully get jecties working as well. * Fixes and neatenings. * Add frying pans to maps. * Update item_attack.dm remove debug * Make some recipes only valid in microwave. Co-authored-by: threshold862543 <gitgudemailaddress@proton.me> * [ci skip] Automatic changelog update. * fix false alarm debug message for mushroom people (vgstation-coders#33666) * swaps some chems around (vgstation-coders#33639) * Vox Winter Coat Sprites (vgstation-coders#33652) * Pajamas Fit Vox * Update uniform.dmi * Vox Coat Sprites * [ci skip] Automatic changelog update. * hyperzine heartdamage nerf (vgstation-coders#33609) Co-authored-by: unknown <bathosbathtime@github.com> * Allows syndicate chems to convert their normal equivalents (vgstation-coders#33664) * Allows syndicate chems to convert their normal equivalents * updates descriptions Co-authored-by: SECBATON GRIFFON <sage> * [ci skip] Automatic changelog update. * Buddha mode + Hell (vgstation-coders#33328) * Buddha mode * devilish * HELLISH * tidy * fixes * find a way to do this that doesnt make server be kill * turn it off for now so we can test better * lag-free method * oh this too * basis of this part * fixes * fixes * fixes * fixes * cap on this to stop possible lag * fix * Allows admins to ghost if buddha'd * New way of getting things * More basic stuff * More stuff * actual way to do it * in practice * hell freezes over * cursed dice edition * tweaking this so it can be turned off if it breaks * disabilities, removing rendundant thing with floor * Limbs and final proc sorting * better like this * better like this * better like this * in setup cause it lags during game * better logging * restructured code, buddhas cannot be gibbed * this too * this too * this too * this too * finally right bantype * removed limit * hell is now a dungeon for performance * hell is now a dungeon for performance * hell is now a dungeon for performance * removes unused zlevel now * area * new sneding * new sending * fixes proc name * uses this db call instead for ease of testing, confirms pref copying works anyways, revert to old one if necessary * testing one for now * better scope Co-authored-by: SECBATON GRIFFON <sage> * [ci skip] Automatic changelog update. * Roid scrubbers, pipenet, status displays, other minor fixes (vgstation-coders#33686) * fix roid scrubbers, lights, bar * fix status displays * [ci skip] Automatic changelog update. * Hobo shack piping fixes (vgstation-coders#33682) Co-authored-by: SECBATON GRIFFON <sage> * Should fix most issues with bots. (vgstation-coders#33647) * Hurray! * oops * debug shit * [ci skip] Automatic changelog update. * Hot oil in deep fryers (vgstation-coders#33678) * Update Chemistry-Reagents.dm * Update cooking_machines.dm Heated oil in deep fryers * Update cooking_machines.dm * Update cooking_machines.dm * Update cooking_machines.dm * Update cooking_machines.dm * Makes diagonal shuttle walls show up on mesons (vgstation-coders#33677) * Makes diagonal shuttle walls show up on mesons * Makes diagonal shuttle walls show up on mesons * NOW WORKS Co-authored-by: SECBATON GRIFFON <sage> * reduce false positive spam from account cookies (vgstation-coders#33654) * Bump loader-utils from 1.4.0 to 1.4.1 in /tgui (vgstation-coders#33665) Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.1/CHANGELOG.md) - [Commits](webpack/loader-utils@v1.4.0...v1.4.1) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [ci skip] Automatic changelog update. * Fixes rune drawing offset (vgstation-coders#33672) Co-authored-by: SECBATON GRIFFON <sage> * [ci skip] Automatic changelog update. * Wall rot event improvements (vgstation-coders#33673) * Wall rot event improvements * Wall rot event improvements * Wall rot event improvements * Wall rot event improvements * Wall rot event improvements * Wall rot event improvements * more used checks, logging * proper can_start proc usage Co-authored-by: SECBATON GRIFFON <sage> * Alternate dimension vendor large artifact find (vgstation-coders#33651) * Alternate dimension candy vendor large artifact find * Alternate dimension candy vendor large artifact find * a * a * more stuff works now * more stuff works now * more stuff works now * more stuff works now * more stuff works now * more stuff works now * more stuff works now * stuff in food * stuff in food * stuff in food * stuff in food * more chems * more chems * more chems * more chems * more chems * test pass * one function * adds proper weighting to this * more name and description generation * more name and description generation * these not needed for names * mroe chems * hi developers swearing bot known as @gitlost, how the fuck are ya? * now being powered and unpowered makes a difference for stuff vended Co-authored-by: SECBATON GRIFFON <sage> * [ci skip] Automatic changelog update. * Dice Additions: Dice Cups, Fudge Dice, Bags of d6 (vgstation-coders#33605) * fudge dice and dice cups * message changed * Tallies dice cup rolls * dice icons, e20 testing, bag of d6 * Frying pan tweaks (vgstation-coders#33649) * Update pan.dm Fix splash on self message. * Update pan.dm . * Update pan.dm * Update recipes_microwave.dm Make grey greens a salad. * Update pan.dm Fix bug. * Update pan.dm * Update pan.dm * Update pan.dm avoid bug * Update pan.dm * Update pan.dm * [ci skip] Automatic changelog update. * HydroHUDs can scan fruits / seeds. (vgstation-coders#33635) * fruit/seed scanning * global proc * Update zincsaucier.dm * Update hydro_tray.dm * Update zincsaucier.dm * GOD * [ci skip] Automatic changelog update. * Adds status alert you can click to automatically use the "exit active cryo tube" function (vgstation-coders#33594) * add status alert for being inside a cryo pod * remove deprecated variable * fixes a line * add exception to cryo alert for when the tubes are off * sorting framework * ensure cryo alerts are always on top * [ci skip] Automatic changelog update. * Bump loader-utils from 1.4.1 to 1.4.2 in /tgui (vgstation-coders#33699) Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](webpack/loader-utils@v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump minimatch from 3.0.4 to 3.1.2 in /tgui (vgstation-coders#33702) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. - [Release notes](https://github.com/isaacs/minimatch/releases) - [Commits](isaacs/minimatch@v3.0.4...v3.1.2) --- updated-dependencies: - dependency-name: minimatch dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Space Hogs (vgstation-coders#32761) * Space Hogs * fixes * progress * Update * [ci skip] Automatic changelog update. * Scale miner output with power (vgstation-coders#33153) * Update gas_mine.dm * Update gas_mine.dm * Update gas_mine.dm * Update gas_mine.dm * fix runtimes * Update gas_mine.dm * Update gas_mine.dm * Update gas_mine.dm * Update gas_mine.dm * Update gas_mine.dm * Update gas_mine.dm * [ci skip] Automatic changelog update. * Auto-clothing items (vgstation-coders#33688) * Auto-clothing items * better system Co-authored-by: SECBATON GRIFFON <sage> * [ci skip] Automatic changelog update. * Gas Miner Hotfix (vgstation-coders#33710) * Update gas_mine.dm * Update gas_mine.dm * [ci skip] Automatic changelog update. * Revert "Gas Miner Hotfix (vgstation-coders#33710)" This reverts commit 67bf4a9. * Revert "Scale miner output with power (vgstation-coders#33153)" This reverts commit 3ed86e5. * Creates new type of asteroid boss (vgstation-coders#33674) * Creates new type of asteroid boss * name suggested * frost oil perfectly revives hivelord hearts * frost oil perfectly revives hivelord hearts * frost oil perfectly revives hivelord hearts * frost oil perfectly revives hivelord hearts * frost oil perfectly revives hivelord hearts * wrong way round * makes the boss less actually impossible Co-authored-by: SECBATON GRIFFON <sage> * Remove unused temperature_resistance var (vgstation-coders#33681) * Update larva.dm * Update humanoid.dm * Update monkey.dm * Update slime.dm * Update human.dm * Gunk Soup Embassy and Gunk Soup sprite update. (vgstation-coders#33687) * gunk soup embassy * gunk soup embassy recipes * gunk soup embassy icons and spawn * turkish roach * fix * gunk soup sprite update and gunk soup embassy icon * sprite fix * spritework * - * brainfart * fix * . * does this work * . * - * icon tweak * Makes R&D stock parts crate contain correct amount of assembly parts (vgstation-coders#33694) Co-authored-by: SECBATON GRIFFON <sage> * In-hand Jumpsuit Adjustments (vgstation-coders#33697) * In-Hand clothing sprite corrections Adds a set of hand sprites for the CE's jumpsuit, and corrects the hand spites for the Anomaly, Biomech, Botany, Electrician, Engine Technician, Maintenance Technician, Mechatron, and Pharmacist jumpsuits which were previously using sprites for the opposite hand. * CE Jumpsuit Sprite Adjustment Slight change to make it more ambiguously forward facing. * Bump terser from 5.7.1 to 5.15.1 in /tgui (vgstation-coders#33703) Bumps [terser](https://github.com/terser/terser) from 5.7.1 to 5.15.1. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](terser/terser@v5.7.1...v5.15.1) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [ci skip] Automatic changelog update. * Fix network_expansion() for pressure valves (vgstation-coders#33708) * Fix network_expansion() for pressure valves * move network_expand() somewhere sensible * Windoor opening time method change (vgstation-coders#33715) Co-authored-by: SECBATON GRIFFON <sage> * Heating up reagents in food when cooking (vgstation-coders#33679) * Heating up reagents in food when cooking. * . * Cooktop-specific thermal transfer to cooking vessel reagents. * . * Heating non-reagent pan content's reagents if there are no reagents directly in the pan itself. * Don't make stuff scalding hot when cooked in a pan. * Allow arcane tampered cooking machines to bring food to scalding temperatures. * . * Avoid redundant thermal calculations. * Update recipes_microwave.dm * Update setup.dm * Update setup.dm * Minor hologram projector changes/bugfixes (vgstation-coders#33704) * Update hologram_projector.dm * Update hologram_projector.dm * Update hologram.dm * Update hologram.dm * Update hologram_projector.dm * Update hologram_projector.dm * [ci skip] Automatic changelog update. * Add logging for ion storm laws. * autocall revert (vgstation-coders#33693) Co-authored-by: unknown <bathosbathtime@github.com> * [ci skip] Automatic changelog update. * Fix snacks artifact and update a unit test (vgstation-coders#33751) * Update artifact_vendor.dm * snacks * Update artifact_vendor.dm * Update artifact_vendor.dm * Update sound.dm * Update icons.dm * Update icons.dm * Slightly changes Runechat system for more robust global performance. (vgstation-coders#33646) * Frying pans are craftable. (vgstation-coders#33662) * frying pan * recycle * Attempt at fixing arcane door nerve gas (vgstation-coders#33669) * Attempt at fixing arcane door nerve gas * Attempt at fixing arcane door nerve gas * amazingly fixes the sound spam problem Co-authored-by: SECBATON GRIFFON <sage> * Bump nanoid from 3.1.25 to 3.3.4 in /tgui (vgstation-coders#33701) Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.25 to 3.3.4. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](ai/nanoid@3.1.25...3.3.4) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [ci skip] Automatic changelog update. * Update fish_items.dm (vgstation-coders#33722) * gas miners scale with power MK2 (vgstation-coders#33723) * add gauges to gasminers * sneed readd mixed miners let you change output temperature unspaghettify set_rate * connect to the powergrid directly * sneed sanity on the "set power consumption" verb scale pressure limit with power some powerdraw fixes * draw from the APC all the power_connection stuff is still there, if there are any fans of multitool and cablecoil torture * stop funny business when setting large powerdraws * Bump fastify from 3.20.2 to 3.29.4 in /tgui (vgstation-coders#33724) Bumps [fastify](https://github.com/fastify/fastify) from 3.20.2 to 3.29.4. - [Release notes](https://github.com/fastify/fastify/releases) - [Commits](fastify/fastify@v3.20.2...v3.29.4) --- updated-dependencies: - dependency-name: fastify dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fixes some missing food names (vgstation-coders#33726) * fixes some missing names * fixing that bug? copied from Hinaichigo's PR * Update gravitywell.dm (vgstation-coders#33731) * Sliders use Multispawners instead of boxes. (vgstation-coders#33732) * Sliders use multispawners, standardizes sliders * slider recipes call for multispawner * comments out the slider boxes * ? * honky * fixes * porting the same fix from hinaichigo's PR * fixes a null variable runtime (vgstation-coders#33733) * Power monitor demand fixes (vgstation-coders#33735) * dumb mattersynth mistake ah yes, "set up the monitor data template then discard it entirely by creating a new template", damn it * shieldgens, another dumb one given this, the broadcaster and the artifact trigger, I'm starting to realize I must have somehow deluded myself into believing I tested these instead of actually testing them * AAAAAA (fix broadcasters) broadcasters don't call the power component's add_load(), they just allow the component's auto_use_power() to do it's thing. I should probably rethink how monitor demand is set in general, but for now a quick fix to have the power component update demand according to use_power will do the trick for any future broadcaster-likes. * Fixed monitor on/off animations playing on things that shouldn't have them. (vgstation-coders#33736) * no anims * Update arcade.dm * slots too * pda terminal * priority locked (vgstation-coders#33738) * Update Fishtank from feedback (vgstation-coders#33740) * Update fish_tank.dm * Update fish_tank.dm * Update fish_tank.dm * Vampire deadchat (vgstation-coders#33741) * Update say.dm * Update say.dm * Update say.dm * Update vampire_role.dm * Update say.dm * Update say.dm * Update say.dm * Update say.dm * Update say.dm * Update say.dm * Fixes magic door air and other minor changes (vgstation-coders#33742) * Updates a bunch of actions (vgstation-coders#33753) * [ci skip] Automatic changelog update. * Necrovision (vgstation-coders#33757) * Update necro.dm * Update necro.dm * ttv (vgstation-coders#33754) * fix tertiary languages not working, fix alt-click spawned mobs not having correct tertiary language (vgstation-coders#33765) * [ci skip] Automatic changelog update. * Adds Portable Crew Monitoring Console for Paramedics (vgstation-coders#33470) * fixes the big booboo * fixes inhands conflicts ONCE AND FOR ALL AAA * z-level checking * uses DEFINES for life_status Co-authored-by: ShiftyRail <31417754+ShiftyRail@users.noreply.github.com> * [ci skip] Automatic changelog update. * Sound replies are now cancellable (vgstation-coders#33777) * Remove the open port subsystem * is banned logging steps for connectivity diagnostics. * Revert "is banned logging steps for connectivity diagnostics." This reverts commit 824b057. * i doubt the return value is the issue but let's see * pulse demon tweaks (vgstation-coders#33690) * remove the stupid maxcharge tweak * sneed * comment unused stuff * revert everything * prevent you from killing yourself stupidly * suck SMES faster, gain maxcharge when sucking APC's * remove the capacity upgrade * tweak the ability costs and upgrades * [ci skip] Automatic changelog update. * Reagents added to a mob can heat up or cool down the mob (vgstation-coders#33698) * Some basic stuff. * Heating stuff. * Room temperature pills. * Attempt to fix unit test. * Fix order. * Fix fat calculation. * Plasmamen specific heat. * Comment change. * Slight, mostly comment changes. * Remove unnecessary check. * Feeling if reagents are hot or cold. Add electronic thermometer to chemistry locker. * Still feeling warm or cool but with painkillers. * More inheritance + defines for body thermal mass calculation. * Attempt to fix mouse runtime and possibly unit test. * Move into new file. * Change scaling, and reagent dispensers dispensing reagents at the ambient temperature. * [ci skip] Automatic changelog update. * Turk roaches from Gunk Soup Embassy now lay turk eggs. (vgstation-coders#33763) * turkish eggs * proper * turk eggs * Update roach.dm * turk eggs sprite * oops * Update roach.dm * [ci skip] Automatic changelog update. * Bump minimist from 1.2.5 to 1.2.7 in /tgui (vgstation-coders#33774) Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.7. - [Release notes](https://github.com/minimistjs/minimist/releases) - [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md) - [Commits](minimistjs/minimist@v1.2.5...v1.2.7) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Reduces suicide damage. (vgstation-coders#33771) * [ci skip] Automatic changelog update. * Update handle_shock.dm (vgstation-coders#33767) * Jabroni outfit sprites (vgstation-coders#33772) * FUCKING SLAAAAAAAAAAAVES adds new darkholme sprites to the fattys, greys, and vox * couple extra pixels adds some missing pixels to the grey darkholme sprites * le typo (vgstation-coders#33773) * Update necro.dm (vgstation-coders#33779) * Killer Tomato and Giant Mushroom Cuts for cooking (vgstation-coders#33781) * killer tomato meat can be cooked with Lists the Killer Tomato's slices as meat, and allows them to be used as a meat substitute * giant mushroom meat can be cooked with Allows meat from mushmen and walking mushrooms to be used as a meat substitute * medarmorforbrigmedics (vgstation-coders#33790) * fix spacehog headbutts (vgstation-coders#33794) * make hog headbutts less stupid * fix the sound not playing * [ci skip] Automatic changelog update. * suicide logging (vgstation-coders#33782) * suicide prompt only if the other checks succeed * log *dabs and biblefarts * move the prompt back to where it was * fixes vox skipjak/nukeops shuttle computer being unfixable and unwrenchable (vgstation-coders#33803) * lol * nukeops too * [ci skip] Automatic changelog update. * [Revival] Adds two new recipes for whitebeets (vgstation-coders#33811) * rosoli and pickled beets * ditto * icons * [ci skip] Automatic changelog update. * Revert "i doubt the return value is the issue but let's see" This reverts commit 59704a7. * Revert "Reagents added to a mob can heat up or cool down the mob (vgstation-coders#33698)" (vgstation-coders#33817) This reverts commit d245492. * unsanitized input * blob overmind message sanitize * comms console status monitor sanitize * another blob message sanitization * better safe than sorry * sanitize salvage rcs note * sanitize decoy toy stock phrase * sanitize scp294 reagent input * sanitize malf ai fake messages and announcements * sanitize atm debit card authorized user names * sanitize the rest of the mulebot inputs * sanitize comms monitor console inputs * records console sanitization * navbeacon sanitization * even more telecomms sanitization * better vending machine name and slogan sanitization * sanitize custom shuttle names * sanitize crayon inputs * sanitize beacon designator area name input * document sanitization for fake announcement device * sanitize robot pen input * escape characters for vocal implant input. maybe might break the regex functionality * escape characters for vocal implant input. maybe might break the regex functionality * possibly makes instrument code safer * sanitize clowncart drawing mode input * sanitize custom secway name * sanitize suicide bomb message * sanitize RUST engine stage id * sanitize borer chem input * fix sanitization for malf messages and announcements Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: samo priimek <samo.debeljak@gmail.com> Co-authored-by: adacovsk <94659603+adacovsk@users.noreply.github.com> Co-authored-by: falcon2346 <111808553+falcon2346@users.noreply.github.com> Co-authored-by: SECBATON GRIFFON <87321915+SECBATON-GRIFFON@users.noreply.github.com> Co-authored-by: west3436 <66280799+west3436@users.noreply.github.com> Co-authored-by: DorainGrey <102815299+DorainGrey@users.noreply.github.com> Co-authored-by: Eneocho <67024428+Eneocho@users.noreply.github.com> Co-authored-by: Kurfursten <scouttac@gmail.com> Co-authored-by: Hinaichigo <hina.unyuu@gmail.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: d3athrow <pomf@ss13.moe> Co-authored-by: gurfan <51427771+gurfan@users.noreply.github.com> Co-authored-by: D3athrow <somepersonsomeplace@yahoo.com> Co-authored-by: jwhitak <69739118+jwhitak@users.noreply.github.com> Co-authored-by: nervere <26285377+nervere@users.noreply.github.com> Co-authored-by: kernikov <ouchisacolor@hotmail.com> Co-authored-by: jellyveggie2 <78439377+jellyveggie2@users.noreply.github.com> Co-authored-by: BurntDevil <31553523+BurntDevil@users.noreply.github.com> Co-authored-by: ValkyrieSkies <valkyrianskies@gmail.com> Co-authored-by: threshold862543 <gitgudemailaddress@proton.me> Co-authored-by: Bathos Bathtime <36062920+bathosbathtime@users.noreply.github.com> Co-authored-by: unknown <bathosbathtime@github.com> Co-authored-by: ShiftyRail <31417754+ShiftyRail@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: d3athrow <cnfarris91@gmail.com> Co-authored-by: Exxion <exxion191@gmail.com> Co-authored-by: boy2mantwicethefam <41342767+boy2mantwicethefam@users.noreply.github.com> Co-authored-by: Manopolis Jones <89323872+ManopolisJones@users.noreply.github.com> Co-authored-by: tinysaturn <78547984+tinysaturn@users.noreply.github.com> Co-authored-by: nervere <eotini1234@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.
Separates the meat crate into the Premium meats crate and Budget meats crate.
🆑