Fix build #26258
Merged
Fix build #26258
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
Contributor
metalgearsloth
commented
Mar 19, 2024
metalgearsloth
commented
- Fixes a couple paint things that were broken.
Yuoko
pushed a commit
to ss14-ganimed/ENT14-Master
that referenced
this pull request
Mar 30, 2024
* Fix store refunds (space-wizards#26173) * Fix anomaly decay logs (space-wizards#26180) Fix anomaly decay logs (space-wizards#26122) * Small species melee weapon change (space-wizards#26183) * inital * Update animals.yml * Update engine to v214.2.0 (space-wizards#26190) * Recolor paper-stamp detective (space-wizards#26194) the old seal of the detective on paper has been changed to a new one * Change collision mask of canisters to allow passing through cargo flaps (space-wizards#26193) Co-authored-by: Jeff <velcroboy333@hotmail.com> * Fix presetidcard extended access throwing (space-wizards#26195) * Update Credits (space-wizards#26196) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Add explosion-proof backpack to uplink (space-wizards#26187) * Backpacks * move to wearables * Update Resources/Prototypes/Catalog/uplink_catalog.yml * Update Resources/Prototypes/Entities/Clothing/Back/backpacks.yml --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Gives glue tag to crazy glue (space-wizards#26154) * SlowContactsSystem to SpeedModifierContactsSystem mini rework (space-wizards#26110) * rework * update logic * Add decoy syndicate bomb to uplink (space-wizards#26034) bombening * Obsolete `Logger` cleanup for `EntitySystem`s part 2 (space-wizards#26159) * Kill the static InRangeUnOccluded * Adjusted 4 more EntitySystems that were missed. * Update blood related tips! (space-wizards#25809) * Added 18 new bounties to cargo (space-wizards#26160) * Added 18 new bounties + tags, couple of balance tweaks * Oops, 2 corn tags. * Fixed another duplicate from merge conflict * Fixed all arbitrage issues * Removed metamorphic glass/manly dorf bounty * Removed manly dorf bounty * Removed manly dorf bounty * Removed manly dorf bounty * Changed hiviz tag, removed commented out bounty * Removed extra line * Change HiViz tag * Removed unused tag * Removed LaceupShoes, changed HiViz * Changed flavor text for fruit bounty * Removed live mouse bounty * Unify `Content`'s `EntitySystem` logging (space-wizards#26216) Use Log with generated sawmill name rather than explicitly named one for all non rule-based Content EntitySystems. * New wooden furniture (space-wizards#26182) * ю * Fences * bench, stairs and fence shadow * small gate desc * empty * empty * destructible * price fix * Fix barotrauma calculations The math for our pressure damage (barotrauma) system is directly taken from TG. The constants are the same and the math is almost the same. However there are two errors. 1. Pressure damage started being applied within the WARNING bounds, rather than the HAZARD bounds. This means you started taking low pressure damage at 50 kPa instead of the intended 20 kPa, and also the HUD icon didn't show "danger" like it should even if you were already taking damage. 2. The calculations for high pressure damage were wrong. These are supposed to be linearly scaled, but the function was wrong so the scaling didn't actually work properly (especially when considering the fixed bounds above). This appears to be the case because the function was taken from an incorrect comment in the original source, rather than the real math. Both of these issues are now fixed to match the TG behavior. Note that this somewhat nerfs pressure damage in non-extreme circumstances. e.g. a room at 40 kPa now gives NO pressure damage, whereas previously it would do full space damage. The description of the pressure alerts is wrong for "low" severity, but I can't be arsed to fix that right now. Alerts don't have a way to change the description depending on severity... * Increase air alarm low pressure thresholds. If a room's pressure drops it can become unbreathable long before people start taking pressure damage, and so also long before the air alarm starts reporting a danger state. I've increased the values so that the air alarm should show danger if the pressure becomes so low as to be unbreathable. * Make puddle smoothing better (space-wizards#26171) puddles * Change Syndie Monkey Price 8-6 TC (space-wizards#26214) Price 8-6 TC * Criminal Record Icons below Job Icons (space-wizards#26203) SS13 Criminal Record Icon Location REAL Adds a new Offset DataField to the StatusIcon Prototype. It effects status icon location on a per-pixel level. Not sure what else it could be used for, but hey, nothing wrong with generalizing. Also moves the mindshield icon priority to one, to fix an unreported bug with them covering non-job icons. * Fixed safe filling with WT550 (space-wizards#26208) * Suit slot weapon consistency + visuals (space-wizards#26152) suit slot my beloved Co-authored-by: vanx <#vanxxxx> * make romerol work on the dead (space-wizards#26222) * a * review * g * reach update (space-wizards#26224) * reach update * fixgridatmos * invalid link error * move arrivals to the side * who are we if we just get squashmerged anyway * chocolate machine * Move faction exception and everything it needs to shared (space-wizards#25154) * move faction prototype to shared * move faction exception and member stuff to shared * fix breaking changes for random stuff * move pettable friend stuff to shared * mostly fix * final fixy * dragonops * final fixy II * use querys and fix warpspeed fish (probably) * fixer * Rrrr! --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Add reckless replay load button (space-wizards#26212) * Add reckless replay load button * A * More descriptive button * Fix borg charger error (space-wizards#26230) Fix borg chargers not working * Improves Medical Hud interface and functionality (space-wizards#26027) * Improvements to the medical hud interface * Adds an icon for SSD players * Indentation fix * Update sprites, changes direction and adds new status icon. * Adds decomposing icon * Code cleaning * Changes Crit Icon sprite * Simplifies the decision structure * Changes copyright line * Changes Critical Icon sprite * Makes the Critical Icon border darker * Changes sprites to /tg/ station * Updates copyright * Makes Dead Icon animation slight faster * Code cleaning * Remove some unused imports * Code cleaning and rename icon * Minor code cleaning * fix decoy bomb uplink category (space-wizards#26205) move * Increase lone ops TC from 40 to 60 (space-wizards#26130) * Create lone ops outfit and 60 TC radio * Changed lone op entity to use the new loneop outfit prototype * Fix shop --------- Co-authored-by: Plykiya <plykiya@protonmail.com> * Fix barotrauma pressure protection (space-wizards#26236) Oops In space-wizards#26217 I re-organized the logic for the calculation. Part of that was moving the logic for GetFeltLowPressure and GetFeltHighPressure to be done before we actually check the hazard thresholds. What I didn't realize is that, with how our pressure protection is set up, these functions can return values so extreme they rebound into the other category. For example, according to the math, when you're wearing a hardsuit in a low-pressure environment you have "felt" pressure of 1000 kPa. Yeah that's not right. Now these functions clamp their result to OneAtmosphere, in the appropriate direction (101.3 kPa). Fixes space-wizards#26234 * makes closets/lockers better (space-wizards#24942) * hmngm * fix * Manual changelog update * Spray Paint (Review Ready) (space-wizards#23003) * Spray Paint (Draft) * paint colors, paints in maints loot, cargo crate of paints. * fix * remove paint (sort of) * moved paintcleaner into own system * Moved paint to server (had to unfortunately) * doafter now breaks when moving away. * cant paint mobstatecomp * loads of fixes * fixes * fixes * nopaintshadercomp * fixes * fix * use locale for paint remove string * remove nopaintshadercomponent and use blacklist * remove enabled.true from visualizer * paint doafter event. * add verbs for paint and remove paint and icon for paint verb. * fixes * no longer replaces shader when shader exists. * replace forloop with foreach, check shader before adding and removing. * paint doafter now separate so no copy paste code * Entities in sprayed targets item slots are also now correctly sprayed. * fix * fix * fix airlock psray painter now removes painted before painting door. * spray paints now use openablecomponent. * fix * fix damn accesstypes. * fix * fix * Automatic changelog update * Include bans in adminremarks command (space-wizards#26240) Fixes space-wizards#20645 * Automatic changelog update * Updated the TEG page (space-wizards#26170) * Ported from guidebook-cleanup branch on my fork * Missed a skill issue, thanks Tayrtahn * Fixed misinformation * Automatic changelog update * Adds craftable ducky slippers (space-wizards#26138) * Craftable ducky slippers * fix node --------- Co-authored-by: Plykiya <plykiya@protonmail.com> * saltern paramedic slot (space-wizards#26038) add paramedic to prototype Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Bumps LoneOps minimum required players to 20 (space-wizards#26244) done * Automatic changelog update * Zombies can very slowly regen heat and shock damage (space-wizards#25925) Update ZombieComponent.cs * Automatic changelog update * Initial Infected can see each other (space-wizards#25934) initial infected icon * Automatic changelog update * Fix SCRAM implant not working while cuffed. Incidentally fix freedom implant working while dead/crit (space-wizards#25978) * Fix SCRAM implant not being usable while in cuffs. Also fix freedom implant from working while dead/crit as a side effect * Move check up to apply to all actions and do thing I forgor to do before * Change check into an ActionBlocker check that also checks whether the user is sleeping. * Make checking for Consciousness the default for actions Went through and chose what I believe to be sensible defaults for actions that had CheckCanInteract. * Fix typos my beloved I had an unbelievable skill issue * Fix major skill issue * Automatic changelog update * Fix recycled containers deleting items inside them (space-wizards#26045) * Removes items from containers in reclaimers * Made it into an event instead * Sloth review comment * Fix indentation and rename field * Automatic changelog update * Fix artifact report info (space-wizards#26252) * Update ArtifactReports.xml Fix conflicting info * Small tweak to wording * Automatic changelog update * Pulling rework v2 (space-wizards#24936) * Pulling rework Fixing up the FOUR systems managing pulling, all the shitcode, and also making it nicer ingame. * More pulling cleanup * stats * More cleanup * First draft * More pulling * weh * Fix puller * Pulling working * Fix merge * Dunked * Self-merge time * Fix hotkey * Fix container changes * oop * Fix multi-pulling * Move alerts cleanup. * pulling fixes * Store Refund Fix (space-wizards#26251) Removes else that accidentally enables refunds * Automatic changelog update * Changed current value to unextracted value in artifact report guidebook (space-wizards#26253) * Fix name Forgot the name was also different * Fix Name, wording happened so fast I messed up * Simplify DoAfterArgs behavior for movement and distance checks (space-wizards#25226) * Merge BreakOnWeightlessMove and BreakOnMove. Provide different theshold for weightless movement. * Adjust WeightlessMovementThresholds. Put a thing I forgot to put in the doafterargs. * Make DoAfterArgs only use OnMove to determine whether to check for movement and MoveThreshold to determine the threshold regardless of weightlessness. Gave DistanceThreshold a default value which will always be checked now. * Fix issue introduced by merge. * Use interaction system for determining whether a distance is within range * Fix incorrect doafter args introduced by previous merge. Forgor to commit these. * Exorcise ghost. The execution system should have been deleted when I merged previously. For a reason I cannot comprehend it came back, but only the execution system. * Exorcise ghost Pt. 2 * Allow for movement check to be overriden in zero g and adjust doafter args where needed. You can now override checking for movement in zero g with the BreakOnWeightlessMove bool. By default it will check. The following doafters were made to ignore the movement check in zero g: - Healing yourself with healing items, - Removing embedded projectiles, - Using tools like welders and crowbars * Adjust distance for cuffing/uncuffing to work. Make injections not break on weightless movement. * Fix evil incorrect and uneeded comments * Fix build (space-wizards#26258) * Fix build - Fixes a couple paint things that were broken. * wat * Fix Fland's Cargo Shuttle Atmos (space-wizards#26273) * Adds logging for refunds (space-wizards#26274) LGTM * spawn panel rock crab suffix (space-wizards#26264) crab crab crab crab crab its all crabs. * Code cleanup: Dirty(Comp) (space-wizards#26238) * Replaced uses of Dirty(Component) with Dirty(Uid, Component) Modified some systems (notably pulling-related) to use uids. * Missed a few * Revert changes to pulling * No * new book - Tales of a Tired Janitor (space-wizards#24441) * book * Update book-authorbooks.ftl * make traitor syndicate reinforcements get the traitor role (space-wizards#25400) inital * Thrown soap/banana/(etc?) will fail to slip until it lands (space-wizards#24494) * throw miss * event * whoops Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * fix popup duplication * Separate cancellable event * no popup, no problem * remove leftover stuff --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Automatic changelog update * Monkey and gorilla melee weapon fix (space-wizards#26288) Update animals.yml * Fix blunt melee weapon hitsound (space-wizards#26286) * ok * Update welders.yml * Fix EFCore obsoletion warnings in Content.Server.Database (space-wizards#26285) * Fix wire layout inheritance. (space-wizards#26289) Wire layouts manually navigate the inheritance hierarchy, but the data fields on the prototypes were also automatically inherited already. This meant that inheriting a wire layout prototype and changing nothing would cause the wires to be duplicated unless they were manually modified on top. Fix is easy: just disable inheritance on the data fields. Also, integration test for it. * Per-department wire layouts (space-wizards#26247) * add per-department wire layouts * fix science/research inconsistency * fix wireLayout inheritance * science is no longer security * Security doors back to normal wire count * implement proper wire inheritance * revert WiresSystem.cs fix * Automatic changelog update * Pizza is not a fruit (space-wizards#26293) * Pizza is not a fruit * Also the slice * Let the lizards still eat pizza * Automatic changelog update * fix legally distinct visor man plush name. (space-wizards#26299) am in vr. approved by real spaniard. * Fix some invalid damage types (space-wizards#26295) Fixed some invalid damage types * Code cleanup: Purge calls to obsolete EntityCoordinates methods (space-wizards#26292) * Purge calls to obsolete EntityCoordinates methods * Pizza defruited; rerun those tests! * Rats eyes glow in dark + reorganize rat textures (space-wizards#26300) * Split mice from rats and made rats eye glow + added red eyes to regal rats (Both king and buff) + normal rats - removed mouse-3 sprites from mice and moved it into a dedicated rat rsi +fixed admin smite wording (you turn players into mice, not rats) * minor formatting fix * removed version numbers float. * Typo fix + removed unneeded layer name * Automatic changelog update * Improve admin message seen/dismiss state. (space-wizards#26223) Fixes space-wizards#26211 Admin messages now have separate "seen" and "dismissed" fields. The idea is that an admin should be able to tell whether a user pressed the "dismiss for now" button. Instead of using "seen" as "show this message to players when they join", "dismissed" is now used for this. Existing notes in the database will automatically be marked as dismissed on migration. A note cannot be dismissed without being seen (enforced via constraint in the database too, aren't I fancy). As part of this, it has become impossible for a player to play without dismissing the message in some form. Instead of a shitty popup window, the popup is now a fullscreen overlay that blocks clicks behind it, making the game unplayable. Also, if a user somehow has multiple messages they will be combined into one popup. Also I had enough respect for the codebase to make it look better and clean up the code somewhat. Yippee. * Automatic changelog update * Fix scram! implant keeping you pulled to someone when teleporting you (space-wizards#26309) * Fix scram! implant keeping you pulled to someone when teleporting you * Exorcise sleep deprivation speak * Automatic changelog update * Door Remote now shows Mode in UI (space-wizards#26162) * Prep for DoorRemote Status * Door Remote Mode Messages * plural opens and closes * never trust webedits --------- Co-authored-by: Plykiya <plykiya@protonmail.com> * remove rped (space-wizards#26316) * remove rped * trol --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * FTL UIScale fixes (space-wizards#26305) - Fix text drawing being offset. - Fix beacon snapping and distance check. - Fix DrawData being offset. - Fix bounds check for map objects not using PixelSize. * Automatic changelog update * Fix puller being improperly unset when pulling stops. (space-wizards#26312) Fix puller not being improperly unset on PullableComponent while being unpulled. When unpulled, the pullableComp has its puller field set to null after the message signifying the pulling has stopped has been sent. Since the component has a field to determine whether its owner is being pulled which is determined by the puller field, systems listening on the event would think that the owner of the component was still being pulled. * Automatic changelog update * bagel update (space-wizards#26326) * Sanitize "ig" (space-wizards#26328) replace ig * Snore is a trait now (space-wizards#26322) * Automatic changelog update * Code Cleanup: Purge obsolete MapManager methods (space-wizards#26279) * GetGrid * GridExists * TryGetGrid * Nerf budget insulated gloves (space-wizards#26318) Insul Chance * Automatic changelog update * Irish Coffee Recipe Tweak (space-wizards#26327) Update drinks.yml Why would this need to be 2+2=4 when 1+1=2 is the more logical reaction? * Automatic changelog update * Added verb action to Glue/Lube system (space-wizards#26002) * Added verb action to Glue/Lube system * Changes based on feedback * Fix TryGlue/Lube to use Entity<> rather than EntityUid, Component * Automatic changelog update * Fix missing semicolon after migration. (space-wizards#26337) Are you kidding me EFCore doesn't sanitize this itself? * The return of the 'long bedhead' haircut as an alternative (space-wizards#26336) * Automatic changelog update * Fix cross-grid spreader behavior (space-wizards#26346) * NPC steering tweaks (space-wizards#26351) - Fix the free node check considering the whole tile and not the poly. - Clear maps on direction resets. - More robust arrival checks for pathfinding nodes. * Automatic changelog update * Make air tanks appear on the back in suitstorage (space-wizards#26353) * g * a * jetpak * Fix crash on load when no slot key assigned (space-wizards#26354) Co-authored-by: wrexbe <wrexbe@protonmail.com> * Throwing Knives: Syndicate Kit (space-wizards#26026) * add * rename * change damage type and lower price * 6 tc * fix? * missed listing * Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json * Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json * Update Resources/Textures/Objects/Storage/boxes.rsi/meta.json --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Automatic changelog update * Changed black carpet texture to correctly align itself. (space-wizards#26358) * Partial atmos refactor (space-wizards#22521) * Reduce atmos component queries * Remove method events * Cache airtight data * Make MolesArchived nullable * Fix airtight cache * only get tile def once * Immutable mixtures * firelock queries * misc * misc cleanup * Trim disconnected tiles * Fix merge issues and bugs * Why does the PR keep increasing in scope * debug overlay * Fix bugs * Fix test, remove unused events * Add setmapatmos command * Fix overlays * Add map check * A * Resolve conflicts with space-wizards#26102 * Remove some obsolete methods * Automatic changelog update * 1x2 cable coils (space-wizards#26361) * 1x2 cable coils * sprite edits * Revert "sprite edits" This reverts commit 3c76c55. * coil rotate * Automatic changelog update * Fix bypassing vaulting clumsy check with verb action. (space-wizards#24977) * Fix bypassing bonking with verb * Revert "Fix bypassing bonking with verb" This reverts commit efa0f0f. * Properly refactored BonkSystem. * Oh hey, this is redundant now * Better solution * Reduced default bonk chance from 75% to 50% * Also do a little grammar fix * Moved BonkChance from BonkableComponent to ClumsyComponent. * Revert "Moved BonkChance from BonkableComponent to ClumsyComponent." This reverts commit 0acbd92. * Another little grammar fix * Matched default bonk doAfter length to default climb doAfter length * Fixed duplicate popups * Check CanVault with verb use too. Add granularity to ClimbingComponent and remove Leg/Foot requirement. * Don't show verb if you can't climb * Removed CanForceClimb * byref record struct * Automatic changelog update * Restrict door remotes to only being able to manipulate doors relevant to their type (space-wizards#26371) Restrict door remotes to only being able to manipulate doors relevant to their type. * Automatic changelog update * Update Credits (space-wizards#26373) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Configuration argument for content packaging (space-wizards#25569) * Configuration argument for content packaging Needed this for something so here we are. I think someone mentioned they wanted this? Welp its here now * Add client, tiny fixes * Update submodule to 215.0.0 (space-wizards#26375) * Admin New Player Notification Sound (space-wizards#24327) play a sound to active admins when a new player joins * Fix playglobalsound autocompletion (space-wizards#26167) * Update submodule to 215.1.0 (space-wizards#26376) pitch * Haunted dungeon template (space-wizards#23768) * haunted dungeon * Initial work Still needs prefab gen work to make it interesting. * ime a worm * weh * Work * Slight tweaks --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Maybe fix rsi truncheon error (space-wizards#26374) Co-authored-by: wrexbe <wrexbe@protonmail.com> * Add Prometheus stats for admin count (space-wizards#26284) * Add Prometheus stats for admin count Fixes space-wizards#20828 Reports time series for admin count. Counts are separated by state (active, AFK, or deadminned) and admin rank. * Use static constructor instead of static readonly for the metric Docs recommend this due to inconsistent execution of C# static constructors. * Remove static usage, use IoC IMeterFactory. --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Hide empty marking categories in the markings picker (space-wizards#26377) Hide empty marking categories * Automatic changelog update * Give cap door remote his access (space-wizards#26378) Give cap doorremote his access * Automatic changelog update * Landmine stepoff (space-wizards#22962) * make landmine work on stepping off * update methods naming * made both step modes possible * updated stepoff event raise to not interfere with game physics internals * added comments * figuring out how audiosystem works * added beep sound effect, updated how stepoff trigger works to make it more consistent * updated source in attributions.yml * made stepoff working every time * introduced suggested changes * updated janitor's WetSignMine to have audio * made cleaner events and bashing my head at OnEndCollide event raise * inverted conditional where applicable * review --------- Co-authored-by: Yurii Kis <yurii.kis@smartteksas.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Update submodule to 215.2.0 (space-wizards#26388) * Add stealthmins (space-wizards#26263) * Add stealthmin command. * Update Content.Server/Administration/Commands/AdminWhoCommand.cs As suggested by CE. Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> * Add admin notifications for admins toggling stealthmin. * Localize stealthmin command --------- Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> * Automatic changelog update * Run `fixgridatmos` for cargo & emergency shuttle (space-wizards#26382) Fix cargo & emergency shuttle * Automatic changelog update * Fix Medical Hud death icon animation and Changes critical icon (space-wizards#26391) Fix Dead Icon animation and changes Critical Icon * Automatic changelog update * Adds "untriaged" labeler workflow (space-wizards#26392) All new opened issues automatically get marked as "untriaged", so a maintainer can go through them properly. * Fixes store purchase events and adds support to raise a directed event (space-wizards#26389) * fixes store event check * raise directed product event * Store keybind priority (space-wizards#26356) * Fix saving keybind priority * Change movestoreditem keybind priority to prevent bug --------- Co-authored-by: wrexbe <wrexbe@protonmail.com> * Origin Station Update 12.03.2024 (space-wizards#26055) * Origin Station Update 12.03.2024 * implement PJB requested changes * changed ap magnum rounds for magnum rounds. * added west side maints door per pjb request. * removed laser glass box from captain quarters. * Make fland's mail into wheel-and-spoke distribution. (space-wizards#26404) * Remove CRLF, enforce with workflow (space-wizards#26401) * Check for CRLF in actions workflow Make emisse weep * Copy paste bottom text * I would like to thank StackOverflow for this spite PR. * Mention file name in message because the workflow tab doesn't display it. * dos2unix everything * Removed Cannabis from thief objectives (space-wizards#26412) * Removed Cannabis from thief objectives * Removed the steal group and from cannabis prototypes * Automatic changelog update * Gives borg industrial welder (space-wizards#26332) Update borg_modules.yml Changes basic welder in borg tool module to industrial welder * Automatic changelog update * Immovable Rod visual variations (space-wizards#25932) * Adds variations to immovable rod * slash oopsie * Changed prototypes from being hardcoded to being defined in the rules component * Changed from 10% chance to 5% * Changes based on feedback * Fix nullable error * Moved randomized logic to .yaml. Probabilities of alternate rods add up to 5%. * Fixed some icon rsi warnings (space-wizards#26414) Fixed some icon warnings Co-authored-by: wrexbe <wrexbe@protonmail.com> * Update close-master-pr.yml (space-wizards#26416) Fix name of "Close PRs on master" workflow * Accept cloth and ingots in the ammofab (space-wizards#26413) * Automatic changelog update * Fix admin verb to set unspawned ballisic ammo count (space-wizards#26411) Don't crash if an invalid value is given. * Use entity queries in ambient sound & power receiver systems (space-wizards#26410) * Unswap small and tall wodden fence gates (space-wizards#26409) * Holoprojectors crafted at lathes no longer come with a cell (space-wizards#26405) Adds versions of the holoprojectors (janitoral, fan, and field) that start without a battery and changes the lathe recipe to use these instead. This is consistant with flashlights, which when made do not start with a cell. Also it's a bit silly to have cargo printing a bunch of these to sell. * Automatic changelog update * Fix tags on antique laser gun (space-wizards#26398) It's missing the tag that's needed for it to go back in the glass storage box. * Automatic changelog update * Add astro-jungle/mowed grass and astro-snow (space-wizards#26381) * Automatic changelog update * Make parrots talk like parrots (space-wizards#26340) * Automatic changelog update * Create DeviceNetworkJammerComponent & System as a general way for entities to act as jammers (space-wizards#26342) * Add DeviceNetworkJammerComponent & System Allows for entities to "jam" DeviceNetwork packets. Whenever a device attempts to send a packet, the DeviceNetworkJammerSystem listens for the BeforePacketSentEvent. From there if any entity with the jammer component is within range of either the sender or receiver of the packet the event will be cancelled. Additionally jammers can only block packets in certain networks. If a packet is not being transmitted in one of the networks it can block then even if the jammer is in range the event will not be cancelled. The range is stored in the jammer component along with the networks it can jam. Jammable network ids are stored as strings which seems to be how custom networks are stored (E.g. network ids for suit sensors). To allow for all of this, the BeforePacketSentEvent was modified to provide the NetworkId. * Make JammerSystem for the radio jammer use the DeviceNetworkJammer. Remove redundant event. * Replace calls to TryDistance with InRange * nerf rad artifacts (space-wizards#26422) * Code cleanup: Purge obsoleted SharedPhysicsSystem methods (space-wizards#26287) Updated calls to SharedPhysicsSystem methods * Cleaner Grenade (space-wizards#25444) * Cleaner Grenade Added Cleaner Grenade * Sprite update Draw issue moment * Removed from jani closet | added box of cleanades * Automatic changelog update * Wearable Harmonicas (space-wizards#26261) * Wearable Instrument Base + Changed harmonica base Created the BaseWornInstrument base and updated the Harmonica to use it, being equipable in the neck slot. * Update instruments_wind.yml * compositions are cool and awesome * Automatic changelog update * Fix mailing units turning into disposal units while recharging. (space-wizards#26383) * Fix mailing units turning into disposal units while recharging. The states were hardcoded. * Fix error handling * Make default states constants * Automatic changelog update * Church Bells (space-wizards#26030) * Adds Church Bells * I'm dumb. * The bell is no longer haunted. * forgot attributions * change sounds so scary law no hunt * One day I'll stop needing to make an immediate micro-commit. One day. * God damn it. * Re-resprites labcoats (space-wizards#26425) * resprites labcoats again * fix tests * SS14-17313 Chatfactor: Chat Censorship Systems (space-wizards#25908) * SS14-17313 Chat Censorship Systems Adds some systems to manage chat censorship: 1. No-op: does nothing 2. SimpleCensor: a regex-free censor with a variety of rules to use 3. RegexCensor: a censor that uses regex. This exposes a singleton backed by a builder pattern (ChatCensor) that is set up, probably during the code init phase, and then globally available for your censorship needs. * Migrate to Shared * Add a reset function to the builder. * Resolve PJB's feedback; add unit tests * Make all implants unable to be implanted more than once (space-wizards#26250) * Make mind shield implants unable to be implanted more than once * Default AllowMultipleImplants to false and update implanters.yml * Use TryComp instead of TryGetComponent * Deny multiple implants for fun implants too. * Make comment more precise * Automatic changelog update * Nerf ninja research stealing (space-wizards#26421) * nerf ninja steal objective * fubar * Automatic changelog update * Reduces size of smaller cartons and fix size discrepancies with empty containers (space-wizards#26430) * Reduces size of smaller cartons * Fix trash bottles/cartons --------- Co-authored-by: Velcroboy <velcroboy333@hotmail.com> * Make chest rig purchasable in uplink (space-wizards#26427) a * Automatic changelog update * Fix atmos NaN error (space-wizards#26441) * Fix atmos NAN error * Remove redundant yaml entries * Automatic changelog update * Curtains fix (space-wizards#26447) * Update furniture.yml * Update curtains.yml * Update Resources/Prototypes/Entities/Structures/Decoration/curtains.yml Co-authored-by: Tayrtahn <tayrtahn@gmail.com> --------- Co-authored-by: Futuristic-OK <141568243+FuturisticRUS@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> * Update submodule (space-wizards#26451) * Update submodule (space-wizards#26454) * Minor cleanup of cuffablesystem (space-wizards#26434) * Fix cuffs breaking after they stop being pulled * Do proper interaction check for UncuffAttempt * Minor cleanup Take as much out as possible from _net.IsServer() if blocks. Misc cleanup * Automatic changelog update * Objects such as lighters/welders are now able to be dropped in disposal units. (space-wizards#26463) Don't always mark after interact event as handled for welder tools. Done with a view towards allowing disposal interaction post tool system handling. Co-authored-by: MQuatermain <misterquatermain@pm.me> * Update submodule to 216.0.0 (space-wizards#26467) * Revert "Give cap door remote his access" (space-wizards#26465) Revert "Give cap door remote his access (space-wizards#26378)" This reverts commit ea818ea. * Fix GhostRoleComponent performing randomization on ComponentInit (space-wizards#26466) * Fix ghostrole ComponentInit * A * a * Revert "Re-resprites labcoats (space-wizards#26425)" This reverts commit bd58954. * Remove Rubber Rounds, Give Security Disablers (space-wizards#26470) Remove Rubbers, give sec Disablers * Automatic changelog update * Removed Box of Hugs and Donk Pockets from Bounties (space-wizards#26481) As far as I know, the Box of Hugs only spawns on the clown and is used in the construction of a honkbot such that if the clown decided earlier to craft a honkbot or if the low price of some 3000 spesos is insufficient this bounty is impossible. Similarly, Donk Pockets are not a renewable resource and it has happened that a station has eaten too many for the bounty to be completed only to get it in rotation and esssentially lose a bounty slot forever. I would like it if each bounty was at least theoretically possible on any station it's likely to occur in, and there are too many where there aren't enough of these obtainable to complete the bounty, which is no fun. * Automatic changelog update * Artifact node IDs are now only 3 digits long (space-wizards#26482) * 2-digit nodes * 3-digits instead * Fix exclusive bounds * Automatic changelog update * Body code cleanup (space-wizards#24946) * Fix test * Kill float accumulators * Use entity proxy methods * DataField auto name generation where possible * Kill comp properties * Clean up server comps * Make events record structs * Clean up shared body code * Clean up server body code * Rename organ events to be same names as in med refactor * Add stacktrace to action error logs (space-wizards#26486) Add trace to action error logs * Late Join Menu Properly Retains Position On New Player Joins (space-wizards#26483) * When another player late joins it will correctly update the UI locally * Resolve passengers not displaying the correct message in late join * Improve final boolean comparison of button disabled state to be a bit neater * Automatic changelog update * Remove atmos method events (space-wizards#26402) * Remove HasAtmosphereMethodEvent * Remove GetTileMixturesMethodEvent * Remove GetTileMixtureMethodEvent * Remove GetAdjacentTilesMethodEvent * Add TileMixtureEnumerator * Remove GetAdjacentTileMixturesMethodEvent * Remove IsTileSpaceMethodEvent * Remove HotspotExposeMethodEvent * Remove pipe net method events * Remove device method events * Use Entity<T> * Misc fixes * A * Theres probably a few more of these * Fix other resolve errors * Misc ItemToggleSystem changes (space-wizards#26489) * Minor ItemToggleSystem tweaks * Update visuals on startup * Remove SetIgnited * Misc toggle fixes * Update ItemToggleHotComponent.cs * Allow cargo bounties to be sold off-station (space-wizards#26469) * Ported over code for delta-v to fix bounties * Added requested changes * Removed the station arg from "IsBountyComplete". It is unneeded and all calls just use a null value for it anyways * Automatic changelog update * Remove broadcast cooldown (space-wizards#26492) * Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal. * Revert "Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal." This reverts commit c730d64. * Reapply "Removed inconsistent broadcast cooldown whenever the "Announce" button is pressed on the communications terminal." This reverts commit 3c2d66a. * -Removed cooldown entirely * Add DoorBumpOpener to space dragon (space-wizards#26490) Add DoorBumpOpener to space dragon.yml * Automatic changelog update * Use nav beacon locations for announcements (space-wizards#26437) * use nav beacon locations for announcements * :thumbs_up: * Automatic changelog update * Arcade machine improvements (space-wizards#24200) * Give 'em something to talk about * Wire panel visuals * Wire graphics tweak * More ads and thanks * More ads for a noisy arcade * New screen for space villain machines * Implement EmitSoundIntervalComponent and a bunch of arcade noises * Require power for sounds * Allow earlier startup intervals * Orange glow * Audio attributions * Include the PR link * Replace EmitSoundInterval with expanded SpamEmitSound * Remove pacman-themed arcade sounds * Documentation good. * Updated methods to use Entity<T> * Refactored SpamEmitSound to get rid of accumulator and chance. * Fixed prewarm logic * Moved stuff to Shared * Fix outdated YAML * Better prediction, auto pause handling * Make enable/disable reset the timer instead of trying to save it. * Automatic changelog update * biggest gridinv update OF ALL TIME (space-wizards#25834) * add SaveItemLocation keybind * make item direction public to avoid having to change between Angle for no reason * add item location saving * show * Added a better save keybind, made it draw saved positions, and trying to save in a position it has already been saved in removes that position. * w * code style * Make taken spots appear blue * style * ! --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: notquitehadouken <tripwiregamer@gmail.com> Co-authored-by: I.K <45953835+notquitehadouken@users.noreply.github.com> * dynamic alert sprites (space-wizards#25452) * dynamic alert sprite * fix fat cooldowns * Automatic changelog update * voicemask can select speech verb (space-wizards#25768) * add Name field to SpeechVerbPrototype * extra locale for voice mask ui * SpeechVerb ui and handling * raaaaaaaaa * reeeeeeeeal Co-authored-by: Tayrtahn <tayrtahn@gmail.com> * fix sort * did you hear john syndicate died of ligma * Update Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Automatic changelog update * Separate "thank you" messages from general ads (space-wizards#25867) * Separated "thank you" messages from general ads * Moved MessagePackPrototype to shared, cleaned up AdvertiseComponent, and actually killed AdvertisementsPackPrototype. +More suggests changes. * Rename PackPrototypeID to Pack in both components. * Фиксы * Fix master (space-wizards#26501) * Fix master * this * messages * Fix missing verb name parrot * Fix messagePack for blockgame and spacevillain --------- Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * Фикс * Фикс * Фикс лобби * очередной фикс апстрима * Фиксы юмлок * Фикс запуска сервера * Фикс клиента * фикс * Фикс подключения клиента к серверу * Фикс лобби * Некоторые переводы * Переводы и фикс РНД * Пул карт --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: LordCarve <27449516+LordCarve@users.noreply.github.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Awlod <159960340+Awlod@users.noreply.github.com> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Co-authored-by: Jeff <velcroboy333@hotmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: 21Melkuu <79728504+21Melkuu@users.noreply.github.com> Co-authored-by: Adrian16199 <144424013+Adrian16199@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: Ilya246 <57039557+Ilya246@users.noreply.github.com> Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com> Co-authored-by: wafehling <wafehling@users.noreply.github.com> Co-authored-by: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: Golinth <amh2023@gmail.com> Co-authored-by: Kevin Zheng <kevinz5000@gmail.com> Co-authored-by: HappyRoach <117393350+HappyRoach@users.noreply.github.com> Co-authored-by: vanx <61917534+Vaaankas@users.noreply.github.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: DoutorWhite <68350815+DoutorWhite@users.noreply.github.com> Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: Plykiya <plykiya@protonmail.com> Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com> Co-authored-by: Terraspark4941 <terraspark4941@gmail.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: shamp <140359015+shampunj@users.noreply.github.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: Nairod <110078045+Nairodian@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: James Simonson <jamessimo89@gmail.com> Co-authored-by: Doctor-Cpu <77215380+Doctor-Cpu@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: liltenhead <104418166+liltenhead@users.noreply.github.com> Co-authored-by: BlitzTheSquishy <73762869+BlitzTheSquishy@users.noreply.github.com> Co-authored-by: RenQ <164364533+ImRenQ@users.noreply.github.com> Co-authored-by: Wrexbe (Josh) <81056464+wrexbe@users.noreply.github.com> Co-authored-by: wrexbe <wrexbe@protonmail.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Baptr0b0t <152836416+Baptr0b0t@users.noreply.github.com> Co-authored-by: KISS <59531932+YuriyKiss@users.noreply.github.com> Co-authored-by: Yurii Kis <yurii.kis@smartteksas.com> Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Co-authored-by: ChaseFlorom <57235581+ChaseFlorom@users.noreply.github.com> Co-authored-by: SoulFN <164462467+SoulFN@users.noreply.github.com> Co-authored-by: Luminight <balazscsabai98@gmail.com> Co-authored-by: Callmore <22885888+Callmore@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DenisShvalov <115770678+DenisShvalov@users.noreply.github.com> Co-authored-by: Weax <59857479+ImWeax@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Futuristic-OK <141568243+Futuristic-OK@users.noreply.github.com> Co-authored-by: Futuristic-OK <141568243+FuturisticRUS@users.noreply.github.com> Co-authored-by: Jake Huxell <JakeHuxell@pm.me> Co-authored-by: MQuatermain <misterquatermain@pm.me> Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: blueDev2 <89804215+blueDev2@users.noreply.github.com> Co-authored-by: superjj18 <gagnonjake@gmail.com> Co-authored-by: notquitehadouken <tripwiregamer@gmail.com> Co-authored-by: I.K <45953835+notquitehadouken@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
4 tasks
metalgearsloth
added a commit
to metalgearsloth/space-station-14
that referenced
this pull request
Mar 31, 2024
This reverts commit 6de5fbf.
metalgearsloth
added a commit
that referenced
this pull request
Mar 31, 2024
TheShuEd
referenced
this pull request
in crystallpunk-14/crystall-punk-14
Apr 3, 2024
* Make BaseMedicalPDA abstract (#26567) * Fix GasMixers/Filters not working (#26568) * Fix GasMixers/Filters not working * OKAY GAS FILTERS TOO --------- Co-authored-by: Plykiya <plykiya@protonmail.com> * Industrial Reagent Grinder Hotfix (#26571) fixed * Give stores the ability to check for owner only (#26573) adds a check if the store belongs to the user * Fix round start crash (causing instant restart) (#26579) * Fix round start crash * Make `TryCreateObjective` more error tolerant * Update engine to v217.1.0 (#26588) * Fix initial infected icon hiding (#26585) * Fix Meta evac shuttle name (#26587) * Make timer ignore client predict setting (#26554) * Make timer ignore client predict setting * making tests run --------- Co-authored-by: wrexbe <wrexbe@protonmail.com> * Make advertise system survive no map inits (#26553) * Make advertise system survive no map inits * Add comment to try prevent future bugs * Update Credits (#26589) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Fix fox spawn on reach (#26584) Co-authored-by: wrexbe <wrexbe@protonmail.com> * Removes SCAF armor (#26566) * removes scaf armor * replace maint loot spawner spot with basic helmet * Update Patrons.yml (#26578) * Automatic changelog update * Make aghost command work on other players using optional argument (#26546) * Translations * Make aghost command work on other players using optional argument * Reviews * Automatic changelog update * Add new component to Make sound on interact (#26523) * Adds new Component: EmitSoundOnInteractUsing * Missed an import * File-scoping * Replace ID check with Prototype check * Moved component and system to shared. Set prediction to true. * Removed impoper imports and changed namespace of component to reflect changed folder. * Following function naming theme * All this code is basically deltanedas's, but it was a learning experience for me * Update Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs * Update Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Increase syndi duffelbag storage (#26565) * Increase syndi duffelbag storage * weh * Automatic changelog update * Adds construction/decon graphs for plastic flaps (#26341) * Adds construction/decon graphs for plastic flaps * Dang arbitrage * undo conflict --------- Co-authored-by: Velcroboy <velcroboy333@hotmail.com> * Automatic changelog update * Makes secglasses roundstart (#26487) * makes secglasses roundstart * fix epic fail * fix tests questionmark? * Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Automatic changelog update * Toilet Upgrade (needs review) (#22133) * Toilet Draft * fixes * toilets now have secret stash to place items in cistern. * fixes * plungers now unblock toilets. * fix sprite * new sprites and fix * fixes * improve seat sprites. * fix * removed visualisersystem changed to genericvisualizers * flush sound for toilets and copyright for toilet sprites. * fix atrributions * fixes * fix datafield flushtime * sprite improvements * fixes * multiple changes * fix * fix * fixes remove vv * moved stash related functions to secret stash system from toilet. * fix * fix * changes for recent review. * fix * fix * Automatic changelog update * Uplink store interface searchable with a searchbar. (#24287) * Can now search the uplink store interface with a searchbar. * Search text updates no longer send server messages. Persists listings locally. * Formatting fixes and tidying. * Added helper method to get localised name and description (or otherwise, entity name and description) of store listing items. * Update Content.Client/Store/Ui/StoreMenu.xaml * Review change; moved localisation helper functions to their own class. * Prevent thread-unsafe behaviour as-per review. * Remove dummy boxcontainer --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Improved RCDs (#22799) * Initial radial menu prototyping for the RCD * Radial UI buttons can send messages to the server * Beginning to update RCDSystem * RCD building system in progress * Further updates * Added extra effects, RCDSystem now reads RCD prototype data * Replacing tiles is instant, multiple constructions are allowed, deconstruction is broken * Added extra functionality to RadialContainers plus documentation * Fixed localization of RCD UI strings * Menu opens near cursor, added basic RCD * Avoiding merge conflict * Implemented atomized construction / deconstruction rules * Increased RCD ammo base charges * Moved input context definition to content * Removed obsoleted code * Updates to system * Switch machine and computer frames for electrical cabling * Added construction ghosts * Fixed issue with keybind detection code * Fixed RCD construction ghost mispredications * Code clean up * Updated deconstruction effects * RCDs effects don't rotate * Code clean up * Balancing for ammo counts * Code clean up * Added missing localized strings * More clean up * Made directional window handling more robust * Added documentation to radial menus and made them no longer dependent on Content * Made radial containers more robust * Further robustness to the radial menu * The RCD submenu buttons are only shown when the destination layer has at least one children * Expanded upon deconstructing plus construction balance * Fixed line endings * Updated list of RCD deconstructable entities. Now needs a component to deconstruct instead of a tag * Bug fixes * Revert unnecessary change * Updated RCD strings * Fixed bug * More fixes * Deconstructed tiles/subflooring convert to lattice instead * Fixed failed tests (Linux doesn't like invalid spritespecifer paths) * Fixing merge conflict * Updated airlock assembly * Fixing merge conflict * Fixing merge conflict * More fixing... * Removed erroneous project file change * Fixed string handling issue * Trying to fix merge conflict * Still fixing merge conflicts * Balancing * Hidden RCD construction ghosts when in 'build' mode * Fixing merge conflict * Implemented requested changes (Part 1) * Added more requested changes * Fix for failed test. Removed sussy null suppression * Made requested changes - custom construction ghost system was replaced * Fixing merge conflict * Fixed merge conflict * Fixed bug in RCD construction ghost validation * Fixing merge conflict * Merge conflict fixed * Made required update * Removed lingering RCD deconstruct tag * Fixing merge conflict * Merge conflict fixed * Made requested changes * Bug fixes and balancing * Made string names more consistent * Can no longer stack catwalks * Automatic changelog update * Update submodule to 217.2.0 (#26592) * Southern accent (#26543) * created the AccentComponent and the AccentSystem * word replacement schtuhff * made it a trait fr ongg!!1 * Update Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Prevent storing liquids in equipped buckets (#24412) * Block access to solutions in equipped spillables. * Stop Drink verb appearing if the solution can't be accessed. * Automatic changelog update * Fix 'Hypopen shouldn't display solution examine text' (#26453) * stealthy hypo * ExaminableSolution hand check when in covert implement. ExaminableSolution now has 'hidden' datafield to enable chemical inspection only in hand. * cleaning code * more cleaning * Hidden datafield renamed to HeldOnly * review --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Revert Paint (#26593) * Revert "Fix build (#26258)" This reverts commit 6de5fbf. * Revert "Spray Paint (Review Ready) (#23003)" This reverts commit e4d5e7f. # Conflicts: # Resources/Prototypes/Entities/Structures/Holographic/projections.yml * Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595) Prevent single-use hyposprays from getting the toggle draw verb Co-authored-by: Plykiya <plykiya@protonmail.com> * MeleeHitSoundSystem (#25005) * Began work to unscrew melee noises * finished * cleanup * cleanup * Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> * _Style * Fix merge --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Remove physics comp from VendingMachineWallmount (#25632) * Remove physics comp from VendingMachineWallmount * Fixtures removal --------- Co-authored-by: Jeff <velcroboy333@hotmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Remake hairflowers (#25475) * Add more lily usage (orange hairflower and flowercrown) * comit 2 * ee * more fixes * w * im stupid * bring poppy in authodrobe * weh --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Automatic changelog update * Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596) * Injector UI shows TransferAmount change, spill changes mode * Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs * Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs --------- Co-authored-by: Plykiya <plykiya@protonmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Update submodule to 217.2.1 (#26599) * disallow unanchoring or opening panels on locked emitters/APEs (#26600) * disallow unanchoring or opening panels on locked emitters/APEs * no locking open panels * oops * needback feedback * Update Content.Shared/Lock/LockSystem.cs * Update Content.Shared/Lock/LockSystem.cs * Update Content.Shared/Lock/LockSystem.cs * sanity --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Fix grave digging sound indefinitely playing if dug by aghost. (#26420) Admins bypass doafters. As such, the code that runs on doafter completion is ran before the sound is actually created. This then leads to the sound never being stopped, and as such it would infinitely play. This commit gets around the issue by manually stopping the sound should the doafter fail to start. If we could be sure that the doafter would never fail, then we could just move the call to StartDigging above starting the doafter but this is currently not possible. Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Make the buttons on the map ui not squished (#26604) Make the map ui work Co-authored-by: wrexbe <wrexbe@protonmail.com> * Combine flower crown and wreath (#26605) * Combine flower crown and wreath * huh * huuh* Automatic changelog update * Add AP damage to throwing knives (#26380) * add * ap * no more stam dmg * Automatic changelog update * cancelable brig timers (#26557) brig timers now cancelable. also some screensystem yakshave * Fix orientation of roller skate sprites (#26627) Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> * Automatic changelog update * Fix GastTileOverlay sending redundant data (#26623) Fix GastTileOverlay not updating properly * Auto DeAdmin sooner (#26551) Co-authored-by: wrexbe <wrexbe@protonmail.com> * Add briefcase to curadrobe and lawdrobe, and some briefcases cleanup (#26527) * Add briefcase to curadrobe and some briefcases cleanup * also add to lawdrobe * Automatic changelog update * Fix some text overflow bugs in HUD (#26615) * Don't clip text in item status * Fix overflow in examine tooltip --------- Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> * Adds two milk cartons to the BoozeOMat (#26635) * Automatic changelog update * made the hover text less vague (sorry) (#26630) * blacklisted throwing knifes from pneumatic cannon (#26628) * Fix radio jammer not blocking suit sensors. (#26632) As it turns out, they are not in fact on their own netid. They are actually just on wireless. The way I had tested my previous pr led to this mistake being made. I originally had the radio jammer block wireless as well, but decided to take out under the flase assumption that it suit sensors were actually on their own netid and did not require the ability to block all wireless packets at the last moment. * Fix dirt decals in reach not being cleanable (#26636) made all dirt decals cleanable Co-authored-by: hamurlik <renoDeath@protonmail.com> * Automatic changelog update * Replace drill_hit.ogg and drill_use.ogg with better sounds (#26622) * Replace drill_hit.ogg and drill_use.ogg with better sounds * Fix attribution source for drill_hit.ogg * Update Resources/Audio/Items/attributions.yml Co-authored-by: Kara <lunarautomaton6@gmail.com> * Update Resources/Audio/Items/attributions.yml Co-authored-by: Kara <lunarautomaton6@gmail.com> --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Kara <lunarautomaton6@gmail.com> * Gave Blast door access permissions (#26606) Added access reader to all blast doors. Added pre configured blast doors for engineering and science. * Gives all wheeled objects low friction (#26601) * gives all wheeled objects friction * adjustments to sum stuff * Automatic changelog update * Combine solution injection systems; Fix embeddable injectors (#26268) * Combine injection systems * Update Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Automatic changelog update * Add ValueList import (#26640) * Change assault borg modules texture (#26502) * Update borg_modules.yml * Fix borg_modules.yml? * Uh --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Add Cyborg Emote Sounds (#26594) * Hal 9000's first emote * Add Chime emote & Change variation to 0.05 * Modify Buzz emote * Add Buzz-two emote * modified Horn * add ping emote * add slowclap emote * Convert slowclap.ogg to mono, reflect change in attribution.yml * fix capitalization for all chatMessages && change all catagory to category * remove all traces of slowclap.ogg * forgor one file smh * collating copywrite * spelling mistakes will be the death of me * more spelling mistakes * change yml string to list * Automatic changelog update * Coordinates Disks & Shuttle FTL Travel (#23240) * Adds the CentComm Disk and configures it to work with direct-use shuttles * Added functionality for drone shuttles (i.e. cargo shuttle) * Adds support for pods, and a disk console object for disks to be inserted into. Also sprites. * Added the disk to HoP's locker * Removed leftover logs & comments * Fix for integration test * Apply suggestions from code review (formatting & proper DataField) Co-authored-by: 0x6273 <0x40@keemail.me> * Fix integration test & changes based on code review * Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks * Check pods & non-evac shuttles for CentCom travel, even in FTL * Import * Remove CentCom travel restrictions & pod disk consoles * Major changes that changes the coordinates disk system to work with salvage expeditions * Missed CC diskcase removal * Fix build * Review suggestions and changes * Major additional changes after merge * Minor tag miss * Integration test fix * review --------- Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Add door electronics access configuration menu (#17778) * Add door electronics configuration menu * Use file-scoped namespaces Signed-off-by: c4llv07e <kseandi@gmail.com> * Open door electronics configuration menu only with network configurator Signed-off-by: c4llv07e <kseandi@gmail.com> * Doors will now try to move their AccessReaderComponent to their door electronics when the map is initialized Signed-off-by: c4llv07e <kseandi@gmail.com> * Make the access list in the id card computer a separate control Signed-off-by: c4llv07e <kseandi@gmail.com> * Fix merge conflict Signed-off-by: c4llv07e <kseandi@gmail.com> * Remove DoorElectronics tag Signed-off-by: c4llv07e <kseandi@gmail.com> * Integrate doors with #17927 Signed-off-by: c4llv07e <kseandi@gmail.com> * Move door electornics ui stuff to the right place Signed-off-by: c4llv07e <kseandi@gmail.com> * Some review fixes Signed-off-by: c4llv07e <kseandi@gmail.com> * More fixes Signed-off-by: c4llv07e <kseandi@gmail.com> * review fix Signed-off-by: c4llv07e <kseandi@gmail.com> * move all accesses from airlock prototypes to door electronics Signed-off-by: c4llv07e <kseandi@gmail.com> * rework door electronics config access list Signed-off-by: c4llv07e <kseandi@gmail.com> * Remove Linq from the door electronics user interface * [WIP] Add EntityWhitelist to the activatable ui component Signed-off-by: c4llv07e <kseandi@gmail.com> * Better interaction system Signed-off-by: c4llv07e <kseandi@gmail.com> * Refactor Signed-off-by: c4llv07e <kseandi@gmail.com> * Fix some door electronics not working without AccessReaderComponent Signed-off-by: c4llv07e <kseandi@gmail.com> * Move AccessReaderComponent update code to the AccessReaderSystem Signed-off-by: c4llv07e <kseandi@gmail.com> * Remove unnecesary newlines in the door access prototypes Signed-off-by: c4llv07e <kseandi@gmail.com> * Remove unused variables in access level control Signed-off-by: c4llv07e <kseandi@gmail.com> * Remove unnecessary method from the door electronics configuration menu Signed-off-by: c4llv07e <kseandi@gmail.com> * [WIP] change access type from string to ProtoId<AccessLevelPrototype> Signed-off-by: c4llv07e <kseandi@gmail.com> * Remove unused methods Signed-off-by: c4llv07e <kseandi@gmail.com> * Newline fix Signed-off-by: c4llv07e <kseandi@gmail.com> * Restored to a functional state Signed-off-by: c4llv07e <kseandi@gmail.com> * Fix access configurator not working with door electronics AccessReaderComponent Signed-off-by: c4llv07e <kseandi@gmail.com> * Replace all string access fields with ProtoId Signed-off-by: c4llv07e <kseandi@gmail.com> * move access level control initialization into Populate method Signed-off-by: c4llv07e <kseandi@gmail.com> * Review --------- Signed-off-by: c4llv07e <kseandi@gmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * scoopable ash and foam, solution transfer prediction (#25832) * move SolutionTransfer to shared and predict as much as possible * fully move OpenableSystem to shared now that SolutionTransfer is * fix imports for everything * doc for solution transfer system * trolling * add scoopable system * make ash and foam scoopable * untroll * untroll real * make clickable it work * troll * the scooping room --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Replace the teleportation logic on the SCRAM implant! (#26429) * Replace the teleportation logic on the SCRAM implant! Now instead of just trying to pick a random tile in range 20 times, the scram teleportation logic now: - Gets a list of grids in range - Until a suitable tile is picked it picks a random grid - From that grid it picks a random tile. - If the tile is suitable, then it is set as the target and the user will be teleported there. - Grids and tiles are randomly picked as outlined above until a valid tile is found, or all valid grids and tiles are exhausted. - Should no suitable tile be found then they get teleported to the same position they are at. Effectively not teleporting them. * Actually make the defaults sane which I forgor in the last commit * Extract tile section to its own function. Bias selection for current grid. Use proper coords for box. * Address reviews as much as possible * Address reviews * Refactored AdvertiseComponent (#26598) * Made it better * ok * alright --------- Co-authored-by: wrexbe <wrexbe@protonmail.com> * Bartender "Essentials" (#25367) * drinks round 1 saving my progress before my hard drive explodes * test 2 please work * name fixes whoops * Update drinks.yml * various fixes am dumb * add sol dry to vends more fixes and changes, yippee! * more fixes & ingame testing shrimple tests * last fixes
TheShuEd
referenced
this pull request
in crystallpunk-14/crystall-punk-14
Apr 6, 2024
* Make BaseMedicalPDA abstract (#26567) * Fix GasMixers/Filters not working (#26568) * Fix GasMixers/Filters not working * OKAY GAS FILTERS TOO --------- Co-authored-by: Plykiya <plykiya@protonmail.com> * Industrial Reagent Grinder Hotfix (#26571) fixed * Give stores the ability to check for owner only (#26573) adds a check if the store belongs to the user * Fix round start crash (causing instant restart) (#26579) * Fix round start crash * Make `TryCreateObjective` more error tolerant * Update engine to v217.1.0 (#26588) * Fix initial infected icon hiding (#26585) * Fix Meta evac shuttle name (#26587) * Make timer ignore client predict setting (#26554) * Make timer ignore client predict setting * making tests run --------- Co-authored-by: wrexbe <wrexbe@protonmail.com> * Make advertise system survive no map inits (#26553) * Make advertise system survive no map inits * Add comment to try prevent future bugs * Update Credits (#26589) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Fix fox spawn on reach (#26584) Co-authored-by: wrexbe <wrexbe@protonmail.com> * Removes SCAF armor (#26566) * removes scaf armor * replace maint loot spawner spot with basic helmet * Update Patrons.yml (#26578) * Automatic changelog update * Make aghost command work on other players using optional argument (#26546) * Translations * Make aghost command work on other players using optional argument * Reviews * Automatic changelog update * Add new component to Make sound on interact (#26523) * Adds new Component: EmitSoundOnInteractUsing * Missed an import * File-scoping * Replace ID check with Prototype check * Moved component and system to shared. Set prediction to true. * Removed impoper imports and changed namespace of component to reflect changed folder. * Following function naming theme * All this code is basically deltanedas's, but it was a learning experience for me * Update Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs * Update Content.Shared/Sound/Components/EmitSoundOnInteractUsingComponent.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Increase syndi duffelbag storage (#26565) * Increase syndi duffelbag storage * weh * Automatic changelog update * Adds construction/decon graphs for plastic flaps (#26341) * Adds construction/decon graphs for plastic flaps * Dang arbitrage * undo conflict --------- Co-authored-by: Velcroboy <velcroboy333@hotmail.com> * Automatic changelog update * Makes secglasses roundstart (#26487) * makes secglasses roundstart * fix epic fail * fix tests questionmark? * Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Automatic changelog update * Toilet Upgrade (needs review) (#22133) * Toilet Draft * fixes * toilets now have secret stash to place items in cistern. * fixes * plungers now unblock toilets. * fix sprite * new sprites and fix * fixes * improve seat sprites. * fix * removed visualisersystem changed to genericvisualizers * flush sound for toilets and copyright for toilet sprites. * fix atrributions * fixes * fix datafield flushtime * sprite improvements * fixes * multiple changes * fix * fix * fixes remove vv * moved stash related functions to secret stash system from toilet. * fix * fix * changes for recent review. * fix * fix * Automatic changelog update * Uplink store interface searchable with a searchbar. (#24287) * Can now search the uplink store interface with a searchbar. * Search text updates no longer send server messages. Persists listings locally. * Formatting fixes and tidying. * Added helper method to get localised name and description (or otherwise, entity name and description) of store listing items. * Update Content.Client/Store/Ui/StoreMenu.xaml * Review change; moved localisation helper functions to their own class. * Prevent thread-unsafe behaviour as-per review. * Remove dummy boxcontainer --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Improved RCDs (#22799) * Initial radial menu prototyping for the RCD * Radial UI buttons can send messages to the server * Beginning to update RCDSystem * RCD building system in progress * Further updates * Added extra effects, RCDSystem now reads RCD prototype data * Replacing tiles is instant, multiple constructions are allowed, deconstruction is broken * Added extra functionality to RadialContainers plus documentation * Fixed localization of RCD UI strings * Menu opens near cursor, added basic RCD * Avoiding merge conflict * Implemented atomized construction / deconstruction rules * Increased RCD ammo base charges * Moved input context definition to content * Removed obsoleted code * Updates to system * Switch machine and computer frames for electrical cabling * Added construction ghosts * Fixed issue with keybind detection code * Fixed RCD construction ghost mispredications * Code clean up * Updated deconstruction effects * RCDs effects don't rotate * Code clean up * Balancing for ammo counts * Code clean up * Added missing localized strings * More clean up * Made directional window handling more robust * Added documentation to radial menus and made them no longer dependent on Content * Made radial containers more robust * Further robustness to the radial menu * The RCD submenu buttons are only shown when the destination layer has at least one children * Expanded upon deconstructing plus construction balance * Fixed line endings * Updated list of RCD deconstructable entities. Now needs a component to deconstruct instead of a tag * Bug fixes * Revert unnecessary change * Updated RCD strings * Fixed bug * More fixes * Deconstructed tiles/subflooring convert to lattice instead * Fixed failed tests (Linux doesn't like invalid spritespecifer paths) * Fixing merge conflict * Updated airlock assembly * Fixing merge conflict * Fixing merge conflict * More fixing... * Removed erroneous project file change * Fixed string handling issue * Trying to fix merge conflict * Still fixing merge conflicts * Balancing * Hidden RCD construction ghosts when in 'build' mode * Fixing merge conflict * Implemented requested changes (Part 1) * Added more requested changes * Fix for failed test. Removed sussy null suppression * Made requested changes - custom construction ghost system was replaced * Fixing merge conflict * Fixed merge conflict * Fixed bug in RCD construction ghost validation * Fixing merge conflict * Merge conflict fixed * Made required update * Removed lingering RCD deconstruct tag * Fixing merge conflict * Merge conflict fixed * Made requested changes * Bug fixes and balancing * Made string names more consistent * Can no longer stack catwalks * Automatic changelog update * Update submodule to 217.2.0 (#26592) * Southern accent (#26543) * created the AccentComponent and the AccentSystem * word replacement schtuhff * made it a trait fr ongg!!1 * Update Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Prevent storing liquids in equipped buckets (#24412) * Block access to solutions in equipped spillables. * Stop Drink verb appearing if the solution can't be accessed. * Automatic changelog update * Fix 'Hypopen shouldn't display solution examine text' (#26453) * stealthy hypo * ExaminableSolution hand check when in covert implement. ExaminableSolution now has 'hidden' datafield to enable chemical inspection only in hand. * cleaning code * more cleaning * Hidden datafield renamed to HeldOnly * review --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Revert Paint (#26593) * Revert "Fix build (#26258)" This reverts commit 6de5fbf. * Revert "Spray Paint (Review Ready) (#23003)" This reverts commit e4d5e7f. # Conflicts: # Resources/Prototypes/Entities/Structures/Holographic/projections.yml * Fix: Prevent single-use hyposprays from getting the toggle draw verb (#26595) Prevent single-use hyposprays from getting the toggle draw verb Co-authored-by: Plykiya <plykiya@protonmail.com> * MeleeHitSoundSystem (#25005) * Began work to unscrew melee noises * finished * cleanup * cleanup * Update Content.Server/Weapons/Melee/MeleeWeaponSystem.cs Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> * _Style * Fix merge --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Remove physics comp from VendingMachineWallmount (#25632) * Remove physics comp from VendingMachineWallmount * Fixtures removal --------- Co-authored-by: Jeff <velcroboy333@hotmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Remake hairflowers (#25475) * Add more lily usage (orange hairflower and flowercrown) * comit 2 * ee * more fixes * w * im stupid * bring poppy in authodrobe * weh --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Automatic changelog update * Injector UI shows TransferAmount change, Spilling liquid changes Injector mode (#26596) * Injector UI shows TransferAmount change, spill changes mode * Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs * Update Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs --------- Co-authored-by: Plykiya <plykiya@protonmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Update submodule to 217.2.1 (#26599) * disallow unanchoring or opening panels on locked emitters/APEs (#26600) * disallow unanchoring or opening panels on locked emitters/APEs * no locking open panels * oops * needback feedback * Update Content.Shared/Lock/LockSystem.cs * Update Content.Shared/Lock/LockSystem.cs * Update Content.Shared/Lock/LockSystem.cs * sanity --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Fix grave digging sound indefinitely playing if dug by aghost. (#26420) Admins bypass doafters. As such, the code that runs on doafter completion is ran before the sound is actually created. This then leads to the sound never being stopped, and as such it would infinitely play. This commit gets around the issue by manually stopping the sound should the doafter fail to start. If we could be sure that the doafter would never fail, then we could just move the call to StartDigging above starting the doafter but this is currently not possible. Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Make the buttons on the map ui not squished (#26604) Make the map ui work Co-authored-by: wrexbe <wrexbe@protonmail.com> * Combine flower crown and wreath (#26605) * Combine flower crown and wreath * huh * huuh
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.