Plushie update #886
Merged
Plushie update #886
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
|
RSI Diff Bot; head commit 7be4f6f merging into 382e24d Resources/Textures/Objects/Fun/toys.rsi
Resources/Textures/_NF/Clothing/Masks/facehuggerplushie.rsi
Resources/Textures/_NF/Objects/Fun/catplushie.rsi
Resources/Textures/_NF/Objects/Fun/corgiplushie.rsi
Resources/Textures/_NF/Objects/Fun/foxplushie.rsi
Resources/Textures/_NF/Objects/Fun/petrock.rsi
Resources/Textures/_NF/Objects/Fun/prizeticket.rsi
Resources/Textures/_NF/Objects/Fun/toys.rsi
Resources/Textures/_NF/Structures/Machines/prizecounter.rsi
|
|
3 rocks feels like beating the joke out of funny - i would just do one also this needs to have the same components as mr chips and mr dips |
|
The pet rock needs to be a ghost role like Mr Chips the dummy, and also need to do some damage when thrown at someone making the rock go into crit. :) |
|
ITS JUST A ROCK! |
|
Its not just a rock it's a real pet |
|
i want the rock to know what love is. And also pain. I want the rock to feel what I feel. |
|
Was curious how you were planning to implement the counter, lathe is a clever solution. |
Cheackraze
approved these changes
Jan 18, 2024
FrontierATC
added a commit
that referenced
this pull request
Jan 18, 2024
4 tasks
DangerRevolution
pushed a commit
to Simple-Station/Einstein-Engines
that referenced
this pull request
Aug 13, 2024
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!!
tmcqueen
pushed a commit
to tmcqueen/Syndicate-Station
that referenced
this pull request
Aug 24, 2024
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!!
PuroSlavKing
pushed a commit
to AtaraxiaSpaceFoundation/ataraxia-station-14
that referenced
this pull request
Sep 1, 2024
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!!
PuroSlavKing
added a commit
to AtaraxiaSpaceFoundation/ataraxia-station-14
that referenced
this pull request
Sep 1, 2024
* Plushie Update! (#654) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!! * prize counter to spawner * Arachne Plushie (#531) Added everyone's favorite Arachne as an adorable soft toy --- - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- :cl: - add: Plushie * ooopsie --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: CodedCrow <[email protected]>
PuroSlavKing
added a commit
to Rxup/space-station-14
that referenced
this pull request
Sep 16, 2024
* Plushie Update! (#654) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!! * prize counter to spawner * Arachne Plushie (#531) Added everyone's favorite Arachne as an adorable soft toy --- - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- :cl: - add: Plushie * ooopsie --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: CodedCrow <[email protected]>
PuroSlavKing
added a commit
to Rxup/space-station-14
that referenced
this pull request
Sep 16, 2024
* [Port] Xenowears (#12) * Xenowears (#519) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Add a bit of clothing specie related and some tiny misc changes. Normally i wanted to add the spooders changes here but with the other spider specie coming in il hold myself for now. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Add clothings - [x] Loadouts/Vending machines --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Xenowears! new non-human related clothings. --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * ooopsie --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * [Port] Plushie (#11) * Plushie Update! (#654) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!! * prize counter to spawner * Arachne Plushie (#531) Added everyone's favorite Arachne as an adorable soft toy --- - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- :cl: - add: Plushie * ooopsie --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: CodedCrow <[email protected]> * [Fix] EE Migration (#14) * [Tweak] Add Einstein Engines Folders (#17) * [Tweak] EE Prototypes Folder * [Tweak] EE RU FTL * fix dublicate * yaml fixes --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: CodedCrow <[email protected]>
freeze2222
added a commit
to Cybersun-Industries/Radium-Build
that referenced
this pull request
Sep 22, 2024
* corvax * Upd Maps (#738) * Revert "Disable contraband examine (#2540)" This reverts commit d1f6444. * upd aspid + supermatter * Reapply "Disable contraband examine (#2540)" This reverts commit 83c2ad488a3e71baa7315077cd4a040bab6df598. * Rook upd * Revert "Rook upd" This reverts commit de951bb36ce154440afb0a498c62fdfbabdb0c7f. * Add meteor protection to Rook * Extend shuttle dock time if the shuttle doesn't dock at evac. (#31496) * Extend shuttle dock time if the shuttle doesn't dock at evac. If the shuttle can't dock at evac for *some reason*, it will instead try to dock at another port on the station. And if that fails it goes somewhere random on the station. Because of the chaos and confusion caused by this, many people will frequently not get to the shuttle in time under these circumstances. This sucks for everybody. To alleviate this, the shuttle launch timer will now be extended if the station doesn't dock at its ideal spot. The default values (controlled via CVar) are 1.667x and 2x respectively for "wrong dock" and "no dock at all" scenarios. The code around here was a mess, so I fixed that too. "CallEmergencyShuttle" has been renamed to "DockEmergencyShuttle", the overload that did the actual docking has been renamed to DockSingleEmergencyShuttle. Code has been split into separate dock -> announce methods so we can calculate shuttle delay in between the case of multiple stations. Also made the "shuttle couldn't find a dock" text announce the time until it launches and fix the shuttle timers not triggering for it. * Minor review --------- * Automatic changelog update * make laid power cables more visible v2 (#32008) * Revert "make cables more visible" This reverts commit b2defdfd06652138c4f9be3f6b35f20fe3e8c596. * offset cable sprite * :-) * one more pixel for mv * pacifists can use grappling guns (#32014) pacifist can use * Automatic changelog update * Allow all bots to be used for chameleon projector (#32006) Allow all bots to use for chameleon projector * Automatic changelog update * Trooper Uniform and Hat (#31997) * Adds entities, sprites, and loadout accessibility * Fixing Uniform file issues * Automatic changelog update * fix dragon spawn location and round end summary (#31890) * spawn dragon rule at station edge * 2 * stuff * fix round end summary not showing * no invalid euid * Automatic changelog update * Surveillance camera's red light fixes (#31831) several surv camera related fixes Co-authored-by: YourUsername <[email protected]> * Automatic changelog update * Add easy window upgrading, fix some other window issues. (#31978) * uhhh a lot of window stuff, mainly easy upgrades * buff plasma/uranium rwindows so you actually want them * fix uranium number, correct construction descriptions * fix tinted window price * frosted windo * Automatic changelog update * Nuke Now Requires the Disk to be Inserted to Toggle Anchor (#29565) * Nuke Now Requires the Disk to be Inserted to Toggle Anchor * message stating you need the disk to toggle floor bolts * Properly credit contributors who were truncated by GitHub API (#31739) * Properly credit contributors who were truncated by GitHub's 500 email limit * update list oops forgot my origin was so out of date * another * Automatic changelog update * Display agents' jobs in the Round End Summary window (#31652) * Automatic changelog update * clean up electronics lathe recipes (#31524) * clean up electronics lathe recipes * result * make door and firelock cheap * engin --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Completes secure wiring across all airlocks and windoors (#30794) Co-authored-by: Velcroboy <[email protected]> * Fix some contraband issues (#31606) * Fix some contraband issues * Flaming fire axe to Syndie contraband * Add Central Command department and contraband group * Restricted encryption keys * ERT gas mask * Thieving beacon * Bladed flatcaps * Advanced circular saw and thief toolbox * Acolyte armor * Magazines and cartridges * SMG magazines * Grenades * Mercenary clothing and combat gloves * ERT, Deathsquad and Central Command Official items * Update * Who the fuck putted ERT into fun?! * Fix * Yeah * I forgot * Automatic changelog update * Save unpublished news articles (#31491) * Add draft saving to news consoles * fix after bui changes * comments + rename vars * no * Fix spawnpref (#31892) * Automatic changelog update * Special latejoin message for captain (#31991) * Special latejoin message for captain * fix gender in locale * remove this for now * shame * not really shame * change * do that * Automatic changelog update * Silly teal gloves for realsies this time :3 (#31865) * gosh please workies now i beg you qvq * Revert "gosh please workies now i beg you qvq" This reverts commit 96d03d07036eafa676972652a617f2774fa8811b. * please workies qvq qvq * Update Resources/Prototypes/Entities/Clothing/Hands/colored.yml Co-authored-by: 0x6273 <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]> Co-authored-by: 0x6273 <[email protected]> * Automatic changelog update * Revert "Fix spawnpref" (#32018) * New Space Ninja intro song (#31055) replaced ninja intro song with new one * Automatic changelog update * Adds Trooper Uniform to Loadouts (#32019) * Automatic changelog update * Cog update (#32022) update * Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098) * Add Protagonists * Give visitors the right PDA at least, we need that RP value. * tidy up * spell check my beloved * Everything about jobs have the same id names ahhhh! * s * rarity scarity. * Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl Co-authored-by: Tayrtahn <[email protected]> * cargo event now no has cargo access doors. * break everything. * still WIP, please excuse. * finish all role loadouts * extra roles, fix up grids, special pdas. * Ghost role descriptions and mime powers * rest of the fucking owl * I tripped. * I also fell. * Fix the broken entity storage? * hide mess under rug * Stuff the rest of the mess into a closet. * I forgor a spinny majig. * a small lighting tweak. * 1984 shuttles to new pr. * 1984 shuttles to new pr 2 electric boogaloo * poke the tests * Revert "1984 shuttles to new pr 2 electric boogaloo" This reverts commit b2ea7053b73cb17b59f8a80b23978a04a6a45a56. * cowboy boot cleanup * tableify * antagimmunities * Should be functional. * vox safing * un1984 clowns I guess * oops forgor one * misplaced file * misplaced file v2 * weird test fail but okay * Shuttles rarer * Shuttle testing, fans, and power sanity. Also return of the syndie evac. * le balance * no write over fancy paper * rerun tests --------- Co-authored-by: Tayrtahn <[email protected]> * Automatic changelog update * Renamed circuit boards to law boards (#31914) init * Automatic changelog update * FoodSequence fix (#32034) Update FoodSequenceSystem.cs * LRP rules for main (#2574) * New lobby art AI MIA (#2570) * Fix sponsor cat eyers (#2564) * Arrivals timer fix (#32037) yippee * Fix justice helm crafting (#32042) * Automatic changelog update * meta update (#32045) * [MAPS] Pearl Fix Arrivals (#2578) * Removal of Maxcaps via cvar (#31437) * Comment out gastank explosion trigger * CVAR creation * Blank line between method + toml update * I fucking hate VistualStudio * change bool logic into float * cat dancing.gif * Adjust some minor nits * Update Content.Server/Atmos/EntitySystems/GasTankSystem.cs Co-authored-by: Partmedia <[email protected]> * Un-hardcode unused initial cached CVar value * Update Resources/ConfigPresets/WizardsDen/wizardsDen.toml --------- Co-authored-by: Kevin Zheng <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * makes advanced atmospherics require the basic atmospherics tech (#32048) hmm freemzer * Automatic changelog update * fix: Check revenant ability costs correctly (#32050) * fix: Check revenant ability costs correctly * refactor: Idiomatically get negative value * Automatic changelog update * Fixes some common iconsmoothing oddities (#32051) fixes smoothing stuff * Adds salvage magnet board to the circuit imprinter (#31996) * Adds salvage magnet board to lathe as default recipe, changes board sprite to supply sprite * Adds the salvage magnet board to the QM's locker, science cannot be trusted and never should be * my body is a machine that turns commits pushed to the wrong branch into machinations on git --------- Co-authored-by: PJBot <[email protected]> * Automatic changelog update * Revert Unknown Shuttle Antagonists (#32052) * Delete antagonist shuttles. * Remove neutral shuttles. * Automatic changelog update * Fixes Borgs and Syndicats getting hurt by glass shards and other things + honkbot slipping 2 (#31011) * Lets do this again * I noticed this way to late * Automatic changelog update * Mining Asteroid Treasure Vaults (#31638) add interior rooms to the vgroid * Automatic changelog update * Remove ERP from RD Figurine voiceline (#32057) removed ERP * Reapply "Fix spawnpref" (#32018) (#32058) This reverts commit 119dd61. * Add "X.A.N.A." as an AI name (#31976) Add "X.A.N.A." as an AI Anyways I don't think we're gonna get sued for trademark infringement of an old dead French TV show yeah? * CTP (#740) * CTP * fix * fix * Update meta.json * upd * Update control_points.yml --------- Co-authored-by: Kirillcas <[email protected]> * Fix yaml * Update locale * [Maps] Maus update (#2581) * Fix Station AI being affected by Bureaucratic Event (#32021) * init commit * I forgot components exist * delta told me to make it a list * Automatic changelog update * Reduced atmos canister sell price (#31965) * reduce sell cost * rounding buying prices * Revert "rounding buying prices" This reverts commit 68cf26e935f8d1387bb8d740802ac73998981637. * Automatic changelog update * Hivelord mob (#31322) * Hivelord * make it longah * Automatic changelog update * TechAnomaly fixes (#32067) Update TechAnomalySystem.cs * Ore Processors can now produce Reinforced Glass (#32069) fix reinforced glass in ore processors * Automatic changelog update * Fixes swords not being able to be used to make bats (#32075) Give BaseSword slicing quality * Reduce vertical margin on vending machine UI (#32074) Smaller vending machine UI * Automatic changelog update * Banners are no longer indestructible (#32077) * Banners are no longer indestructible * uninflate * Automatic changelog update * Fix cauterization spam from space damage (#32080) * dont log missing ArtifactComponent for artifexium (#32073) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * add material composition to some salv treasure (#31970) * add material composition to some salv treasure * fake --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Fix LRP ruleset in config (#2584) * Add alternative warden suit in LockerWardenFilledHardsuit (#2577) * Fix misspeled genders in locale (#2575) * Make the pr link more visible in the changelog bot (#32047) * Change forensic pad to use label isntead of name changing (#31842) change name change to label * Automatic changelog update * fixes a ton of contraband issues (#32078) * fixes a ton of contraband issues * pen * give the armor suit storage * pulse carbines go brrr * clean up robotics lathe recipes (#31522) * clean up robotics lathe recipes * add result --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * clean up security lathe recipes (#31523) * clean up security lathe recipes * add result --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Make context menu uses spritetree (#31792) Rather than doing goofy hacks we just use what sprites are near the mouse. * Fix latejoins (#32093) For realsies :) * Update submodule to 234.0.0 (#32095) * Reapply "FTL + AI fixes (#31952)" (#31968) (#32094) * Reapply "FTL + AI fixes (#31952)" (#31968) This reverts commit c46a4ab. * Update * Update submodule to 234.1.0 (#32098) * Update locale * Add ReagentWhitelist to Injector component and system (#28262) * Add reagent whitelist to Injector component and system * Apply suggested Changes * Remove LINQ function for performance * Update Content.Server/Chemistry/EntitySystems/InjectorSystem.cs Co-authored-by: Ed <[email protected]> --------- Co-authored-by: Ed <[email protected]> * Add guidebook protodata tag: embed prototype values in guidebook text (#27570) * First clumsy implementation of guidebook protodata * Support for Properties, format strings * Better null * Rename file * Documentation and some cleanup * Handle errors better * Added note about client-side components * A couple of examples * DataFields * Use attributes like a sane person * Outdated doc * string.Empty * No IComponent? * No casting * Use EntityManager.ComponentFactory * Use FrozenDictionary * Cache tagged component fields * Iterate components and check if they're tagged * don't apply traits for borg and ai (#31990) * doesn't apply traits for borg or ai * add some comment and summaries * weh weh * well ok Co-authored-by: Ed <[email protected]> --------- Co-authored-by: Ed <[email protected]> * Automatic changelog update * Smart tomato pet (#31932) * SmartTomato * Fix * RemovingExtraLines * Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Accents/full_replacements.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: Ed <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Update JobPrototype.cs * Gave AI a comms console (#31852) * Updated sprites for AI HUD * Epic test fail * Merged AGhost actions and AI actions together again. * Seperate comms and bugfix. Fixed broadcast. * Stuffs * Update station_ai.yml * Update station_ai.yml * :| * Update silicon.yml * oopsie daisy * stuff * further stuff * oh my god * Appeasing the gods * Automatic changelog update * movercontroller namespace (#31749) * Update publish-publish.yml * Turn off peaceful end on main (#2585) * upd * fix missing circuitboard recipes (#32092) * fix missing circuitboard recipes * and another one * fix plastitanium window Убрано наше пластитановое окно и добавлено в миграцию * fix * Fix replay load error screens (#32115) If an error occurs while loading a replay, it's *supposed* to show a popup "hey do you wanna continue with error tolerance", and it does do this. But because of spaghetti in the replay state code, it also immediately tries to reload the replay without input, as a consequence of trying to reset to the game's default state. Now the replay load system has a proper game state for "replay load failed", with nice presentation and explicit formatting and 10% less italian cuisine. * Fix medical PDA toggling light when scanning (#32091) * Automatic changelog update * Eject mech pilot alert (#31649) * Bruh * well * yes * Automatic changelog update * Add extradimensional orange, holymelon, meatwheat, worldpeas mutations (#27624) * new mutations * translation string fix * add haloperidol to plant * fix * add FoodSequence * food sequence fixes * Automatic changelog update * Set default PDA uplink and music visibility to false (#28373) * Set PDA uplink and music default visibility to false #27376 seems to be the PDA receiving state before first PDA UI open * Log error on PDA state received before first open * Fix logging * Fix error message --------- Co-authored-by: metalgearsloth <[email protected]> * Automatic changelog update * Added void cloak hood (#31061) * void hood * reshade * reshade x2 * Update hoods.yml * Automatic changelog update * fix * [Maps] Tushkan hotfix #2 (#2590) * Fix setmapatmos temperature argument Co-authored-by: pa.pecherskij <[email protected]> * Automatic changelog update * Fix powered machines working unpowered if the panel is open. (#32135) * Automatic changelog update * network airlock AutoClose (#32124) * network airlock AutoClose * least stupid language * great language --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * fix rcd blacklist (#32102) * fix rcd whitelist * terminal under shutters too * fix aller at once desc (#32129) * Automatic changelog update * [Tweak] Head-Coder issue (#742) * Fix that space (#32149) Fixed the GODDAMN SPACE Co-authored-by: Alpha-Two <[email protected]> * add gateway beacon for mapping (#32121) Co-authored-by: deltanedas <@deltanedas:kde.org> * Add briefcase damage (#32063) Initial commit * Automatic changelog update * New gauze customization (#30852) * Sprite&Meta * Marking_Prototype * Locale * Meta_copyright_change * Sprite_Change * New_Sprite * And_another_new_sprite * Change_Locale * Automatic changelog update * fix helmet parent (#32152) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Dev mouse acorgillation (#32040) * Update dev_map.yml * real mouse returned * add test for lathe recipes having results (#32100) * add test for lathe recipes having results * id --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Allow ghosts to read books (#32151) Co-authored-by: Eoin Mcloughlin <[email protected]> * Fix some issues with pulling system (#32145) Joints were created with pivots at object origin, causing unintuitive behaviour when an object was not centered on the origin. Now puts the pivots at the COM. Joint limits were set based on fractions of the union of the AABB of objects, which did not make geometric sense. Now uses the pivot length with an additional [arbitrary] length. Joints were created with a very low spring stiffness, which had a negligible effect most of the time but caused very unintuitive behaviour when the pulled object had a low mass (#28028) - disable the spring limit, and just use the hard min/max limits. Co-authored-by: Eoin Mcloughlin <[email protected]> * Automatic changelog update * Vox LoneOp loadout fix (#31641) oh shit here we go again * Automatic changelog update * Add snakes to vent spawn event (#32070) Add snakes to vents * Automatic changelog update * Moved hardcoded string "PEOPLE" to Loc.GetString() (#32164) * reinforce command intercom (#32169) * secure command intercom * Update intercom.yml * Automatic changelog update * clean up clothing lathe recipes (#31520) * clean up clothing lathe recipes * add result *--------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Use Transform instead of TryComp<TransformComponent> (#32170) Use Transform instead of TryComp * [Art] Human parts resprite (#2591) * Update Credits (#32178) Co-authored-by: PJBot <[email protected]> * Fix animals sprites in critical state (#32175) Initial commit * fix infinite banana bug (#32167) * Rename fix (#31654) * Localize RenameCommand and delegate most of the process to MetaDataSystem.SetEntityName() * Make renaming rely on the EntityRenamedEvent. Fix issue where renaming would keep old Examine text Requires engine change * Fix localisation strings * Make PDA search be based on a renamed entity's Uid instead of its old name To do this the pda component now has an PdaOwner field which gets assigned when it is given as a loadout to a player * Fix bad merge??? huh * Use AllEntityQuery * Automatic changelog update * Automatic changelog update * Make pressure and volume pumps require power (#28995) * Automatic changelog update * Update SharedBuckleSystem to use PopupClient (#31498) * Botany Rework Part 1: Mutations (#31163) Instead of each mutation being a flag that gets checked at some unique point in BotanySystem somewhere, they're now EntityEffects that get applied when the mutation occurs and when produce is harvested. One new list was added to SeedData so that multiple other fields could be removed. All the non-stat-change mutations that have been rolled are added to the Mutations list, and get applied to the plant when the mutation occurs or when a seed with the mutation is planted. Produce get mutations applied at harvest if they apply to the produce, and carry all of the plant's mutations over as a seed. This gets rid of the one-off checks for things like Slippery, Bioluminescent, Sentient, etc. The base odds of a mutation applying should be equal to the odds of the original mutation check. It pretended to have 1 bit flip (on averge) per mutation power, and odds of each mutation was the odds of one of its bit being flipped (1 /275 * bits). The 'thermometer code' applied for numbers will be replaced with simple random rolls, as both average out to the middle value. The new checks are much easier to understand and don't obfuscate the actual changes of something happening behind 3 layers of math. The biggest player-facing change is that Potency will be able to get over 65 significantly more often than it did in the previous system, but it will be just as common to get low values as high ones. Mutation definitions have been moved to a .yml file. These include the odds per tick per mutagen strength of that mutation applying that tick, the effect applied, if it applies to the plant and/or its produce. This makes mutations simpler to add and edit. This PR is limited specifically to the mutation logic. Improving other aspects of the system will be done in other PRs per the design document. Mutations was chosen first because its got the largest amount of one-off checks scattered all over that could be consolidated. Once this is merged, mutations could be contributed to the codebase with minimal extra work for later botany refactor PRs. * Fix build and lint (#32180) * [Tweak] GitHub Workflow (#744) * [Tweak] Github Workflow * huh? * whoa * RespectRaw * license link fix * blyat * [Feature] Respawn Button (#743) * aaa * Update GhostSystem.cs * Update GhostSystem.cs * Feature: Back in Round Button * Update CCVars.cs * rework * new functions * fix --------- Co-authored-by: Zack Backmen <[email protected]> * fix EvilTwin ExclusiveAntagonist * fix cleanup * prevent using holo inside containers (#32068) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * localize skeleton accent (#32166) * localize skeleton accent * commit number 2 * remove that from this * this * babushka * French and Spanish traits (#30966) * Traits languages * Update traits.ftl Silly thing * No russian --------- Co-authored-by: Ed <[email protected]> * Automatic changelog update * Nerfs meteor penetration force (#32109) nerf meteor penetration force * Automatic changelog update * [Maps] Glacier Concern (#2579) * Fix plushie cutlass swing animation (#32157) Fix plushie cutlass animation * Rubber chicken toy (#29637) * -added rubber chicken toy * -Removed faulty SolutionContainerManager type -Replaced default toy squeak sound with rubber chicken sound for on-trigger and on-collide. * fixed raw material cost * adjusted material composition * - Added rubber chicken to CrateFunToyBox - Added rubber chicken to MaintFluffTable under "uncommon group" so that it will spawn in maintenance * Update Resources/Prototypes/Entities/Objects/Fun/toys.yml --------- Co-authored-by: gambesun <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Fix sentient produce (#32192) sentient does not apply to produce Co-authored-by: PraxisMapper <[email protected]> * Automatic changelog update * Add glass morgue airlock (#32163) * [MAPS] Paper AI (#2594) * [Maps] Maus tweak (#2595) * Fix examine flickering until you examine something around you (#32205) * Automatic changelog update * Adds the syndicate Booze-O-Mat (Bruise-O-Mat) to nukie planet (#32107) * Automatic changelog update * Change the binary translator key's contraband designation to syndicate contraband + minor sprite change for consistency (#32193) * adds new icon, changes binary key icon and frame, changes contraband designation * added back the regular key as admeme because it makes sense (why am I not thinking about these things) * hehe I cannot read! * Automatic changelog update * Immovable Rod Spawn Addition: Lizard Plushie (#32113) * a deadly weh * Updated meteorswarms.yml Updated probabilities to match exactly 1 * Updated immovable_rod.yml Removed rotation --------- Co-authored-by: august-sun <[email protected]> * Lizards now metabolize chocolate (#32147) * Eat the chocolate * Update toxins.yml * fully delete threshold lines * Update snacks.yml * Fix tags Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Localization of steal targets (#30153) * Localization of steal targets * Correction of localization of theft objects * The second correction of the localization of theft targets * Update steal-target-groups.ftl Co-authored-by: Ed <[email protected]> * Revision of the localization method * Choosing a simple option for localization * Fix TechnologyDisk name * Corrections based on feedback received * correction of declension --------- Co-authored-by: Ed <[email protected]> * [Tweak] Better Lizards (#749) * [Fix] Sponsor Typo (#748) * [Port] Telescope System (#746) * [Port] Telescope System remove old * [Port] Telescope System / Система Прицеливания (#8) * add: TelescopeSystem * fix * add: RU loc * oppsie --------- Co-authored-by: Spatison <[email protected]> * [Port] EE Plushie & Xenowears (#751) * [Port] Xenowears (#12) * Xenowears (#519) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Add a bit of clothing specie related and some tiny misc changes. Normally i wanted to add the spooders changes here but with the other spider specie coming in il hold myself for now. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Add clothings - [x] Loadouts/Vending machines --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: Xenowears! new non-human related clothings. --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * ooopsie --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> * [Port] Plushie (#11) * Plushie Update! (#654) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> By multiple requests i bring my PR from Frontier The [PLUSHIE UPDATE!](new-frontiers-14/frontier-station-14#886) This PR add a prize vendor machine where you can trade prize ticket for a toy/plushie, to get ticket you win those in arcade machines. This PR will give a chance for everyone to get the toys they need in a special machine and will make plushies in general more random and fun, in term of random spawns. WARNING THIS PR DOES NOT MAP THE PRIZE VENDOR AND WILL MOSTLY NEED TO BE MAPPED. --- <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Prize Vendor - [x] Prize Tickets - [x] New Toys/Plushies - [x] Prizes --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: - add: A ton of new plushies has arrived - add: Prize counter are here, get your prizes by winning games and getting prize tickets! and find prize balls!! * prize counter to spawner * Arachne Plushie (#531) Added everyone's favorite Arachne as an adorable soft toy --- - [x] Place plushie in spawn location(s) --- <details><summary><h1>Media</h1></summary> <p>  </p> </details> --- :cl: - add: Plushie * ooopsie --------- Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: CodedCrow <[email protected]> * [Fix] EE Migration (#14) * [Tweak] Add Einstein Engines Folders (#17) * [Tweak] EE Prototypes Folder * [Tweak] EE RU FTL * fix dublicate * yaml fixes --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: CodedCrow <[email protected]> * [Maps] Glacier hotfix (#2598) * Crayons buffed to 45 uses (#32061) * Buffs crayons to 45 uses * Update Resources/Prototypes/Entities/Objects/Fun/crayons.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * [Port] Laying System (#745) * aaa * Update GhostSystem.cs * Update GhostSystem.cs * Feature: Back in Round Button * Update CCVars.cs * up1 * up2 * upd * update test --------- Co-authored-by: Zack Backmen <[email protected]> * cleanup * Anomalous infections (#31876) * inner anomaly * anomaly pulse action * test anom mine * Update anomalies.yml * fix action cooldown * pyro_eyes * clientsystem * experiments * blya * some telegraphy * shock eyes! * shadow eyes * separate files * frosty eyes * fix * flora eyes * bluespace eyes * flesh eyes * redoing injction * auto add layers * пипяу * new injector component * stupid me * nice marker injectors * anomaly spawn on shutdown * gravity anom * dead anomaly spawning * add VOX states * sprite specific layers support * technology anom infection * auto detach anomalies that have moved away * Update anomaly_injections.yml * anomalyspawner integration * rock anomaly! * Update anomaly_injections.yml * fix crash bug * tag filter * fix anom dublication spawns * Update anomaly.yml * Update InnerBodyAnomalyComponent.cs * Update anomaly_injections.yml * dont spawn anomalies after decay * fix morb sprite, add end message * gravity resprite * admin logging, double injection fix * make flesh and living light mobs friendly to anomaly hosts * popups * severity feedback * sloth review * A * keep organs after gib * punpun host * sloth synchronization * Update arachnid.yml * increase infections spawnrate * Automatic changelog update * Fix objectives * remove and fix telescope (#755) * [Tweak] Edit Key Binds (#752) * [Tweak] Translates (#757) * [Tweak] Translates * update guidbook * [Translate] Censoreds (#756) * censoring the text * BookPaperworkP4 remove * remove book * remove * [Port] Explosion Shock Wave (#759) * [Port] Exlosion Shock Wave RMC14 * ss13 dont exist * [Port] Showers (#762) * Added Showers (#661) <!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Added in showers. A pure RP furniture item. --- # TODO <!-- A list of everything you have to do before this PR is "complete" You probably won't have to complete everything before merging but it's good to leave future references --> - [x] Sound effects - [x] Wallmount - [x] Add in Showers ---  --- # Changelog <!-- You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> :cl: Tilkku - add: Added showers * move to EE folder * fixik --------- Co-authored-by: SleepyScarecrow <[email protected]> * [Port] RND Research Rework (#750) * [Port] RND Research Rework * up1 * backmen research ftl * up2 * fuck * zaebal cannot be unlocked on any lathes * [Port] Advanced Prying (#18) (#760) * [Port] Advanced Prying (#31) * balance: Less rcds, more axe functions (#132) * Revert "Adds RCD and RCD ammo to all engineer lockers. (#22688)" This reverts commit 4e94a27. * add: Axe can pry platings. Again. * fix: RCD in CE locker * Make Axe great again --------- * [Tweak] Prying / Вскрытие (#43) * tweak: neglecting time when using scrap * fix * fix * fix * fixik --------- Co-authored-by: RedBurningPhoenix <[email protected]> Co-authored-by: Nair Sark <[email protected]> Co-authored-by: Spatison <[email protected]> * [Feature] Immersive Life (#747) * [Feature] Immersive Life * up1 * refactor * rework --------- Co-authored-by: Zack Backmen <[email protected]> Co-authored-by: Kayzel <[email protected]> * [Tweak] Move Config From Server (#766) * Create main.toml * Update main.toml * [Port] Combat Mode Indicator (#758) * [Port] Combat Mode Indicator * build fix * Update CombatModeSystem.cs * mark code --------- Co-authored-by: Kayzel <[email protected]> * [Tweak] Breathe (#769) * breathe * edit guidebook --------- Co-authored-by: PuroSlavKing <[email protected]> * Fix upstream * Fix upstream --------- Signed-off-by: FoxxoTrystan <[email protected]> Co-authored-by: Roudenn <[email protected]> Co-authored-by: Rxup <[email protected]> Co-authored-by: Rouden <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: PJBot <[email protected]> Co-authored-by: qwerltaz <[email protected]> Co-authored-by: Boaz1111 <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: DieselMohawk <[email protected]> Co-authored-by: godisdeadLOL <[email protected]> Co-authored-by: YourUsername <[email protected]> Co-authored-by: Alzore <[email protected]> Co-authored-by: Cojoke <[email protected]> Co-authored-by: Kara <[email protected]> Co-authored-by: Hreno <[email protected]> Co-authored-by: deltanedas <[email protected]> Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Velcroboy <[email protected]> Co-authored-by: Winkarst <[email protected]> Co-authored-by: themias <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: Thinbug0 <[email protected]> Co-authored-by: slarticodefast <[email protected]> Co-authored-by: 0x6273 <[email protected]> Co-authored-by: Emisse <[email protected]> Co-authored-by: chillyconmor <[email protected]> Co-authored-by: Spessmann <[email protected]> Co-authored-by: IProduceWidgets <[email protected]> Co-authored-by: Tayrtahn <[email protected]> Co-authored-by: ScarKy0 <[email protected]> Co-authored-by: Ed <[email protected]> Co-authored-by: Ko4ergaPunk <[email protected]> Co-authored-by: TiFeRi <[email protected]> Co-authored-by: TurboTracker <[email protected]> Co-authored-by: Kevin Zheng <[email protected]> Co-authored-by: DisposableCrewmember42 <[email protected]> Co-authored-by: Flareguy <[email protected]> Co-authored-by: ArtisticRoomba <[email protected]> Co-authored-by: LankLTE <[email protected]> Co-authored-by: Verm <[email protected]> Co-authored-by: Nemanja <[email protected]> Co-authored-by: Plykiya <[email protected]> Co-authored-by: Morb0 <[email protected]> Co-authored-by: Kirillcas <[email protected]> Co-authored-by: Meguneri <[email protected]> Co-authored-by: SlamBamActionman <[email protected]> Co-authored-by: K-Dynamic <[email protected]> Co-authored-by: PECK <[email protected]> Co-authored-by: Myra <[email protected]> Co-authored-by: blueDev2 <[email protected]> Co-authored-by: RobDemo <[email protected]> Co-authored-by: Errant <[email protected]> Co-authored-by: Gorox221 <[email protected]> Co-authored-by: ShadowCommander <[email protected]> Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: NotSoDamn <[email protected]> Co-authored-by: Fildrance <[email protected]> Co-authored-by: pa.pecherskij <[email protected]> Co-authored-by: PuroSlavKing <[email protected]> Co-authored-by: Alpha-Two <[email protected]> Co-authored-by: Alpha-Two <[email protected]> Co-authored-by: Арт <[email protected]> Co-authored-by: eoineoineoin <[email protected]> Co-authored-by: Eoin Mcloughlin <[email protected]> Co-authored-by: BIGZi0348 <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: de0rix <[email protected]> Co-authored-by: nikthechampiongr <[email protected]> Co-authored-by: drakewill-CRL <[email protected]> Co-authored-by: Trest <[email protected]> Co-authored-by: TakoDragon <[email protected]> Co-authored-by: xprospero <[email protected]> Co-authored-by: gambesun <[email protected]> Co-authored-by: PraxisMapper <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: august-sun <[email protected]> Co-authored-by: august-sun <[email protected]> Co-authored-by: MissKay1994 <[email protected]> Co-authored-by: chavonadelal <[email protected]> Co-authored-by: Spatison <[email protected]> Co-authored-by: FoxxoTrystan <[email protected]> Co-authored-by: DEATHB4DEFEAT <[email protected]> Co-authored-by: VMSolidus <[email protected]> Co-authored-by: CodedCrow <[email protected]> Co-authored-by: Kanashi-Panda <[email protected]> Co-authored-by: CrimeMoot <[email protected]> Co-authored-by: SleepyScarecrow <[email protected]> Co-authored-by: RedBurningPhoenix <[email protected]> Co-authored-by: Nair Sark <[email protected]> Co-authored-by: Kayzel <[email protected]> Co-authored-by: PuroSlavKing <[email protected]>
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
Adds a TON OF PLUSHIES and new ways to get plushies with PrizeBall/Prize Tickets! Aka making playing arcades games and plushies selection more intresting!
Note: @Cheackraze please review and gives opinion for those 2 plushies: "Janitor Plushie and Office Vulp Plushie"
Minor: Fixes Nuke Toy sprite to our current nuke sprite.
Why / Balance
We need MORE PLUSHIES AND TOYS!
And more fun way to get them!
So i have delivered!
MORE PLUSHIES AND TOYS ARE NEEDED!
NOTE: Prize Counter is not mapped on Frontier for the current reason that i want this PR to be simple and only have yml and sprite changes, Prize Counter should be mapped on Frontier when possible.
Technical details
Mostly .yml files and changes, only add new things and only change the arcade machine reward pool and cuddlycritter inv, this PR also avoid any C# changes.
Media
Breaking changes
Changelog
🆑 FoxxoTrystan