Upstream Sync #53

* Allow IdentityBlocker partial coverage * rename to TotalCoverage (cherry picked from commit d75f6c3db4f638e9a479fe40c8d50f0e6c137556)

(cherry picked from commit 79fa3c7db1517b21379e62db735e1139a5c8540e)

(cherry picked from commit e82964bbf44ce2e6b10c585090eec2dd0cd27237)

(cherry picked from commit 1029142740f53d1a6e8701b410f2ab63b13df4f6)

* Raise `StationPostInitEvent` broadcast * Basic variation pass handling * standardize names + rule entities * why does it work like that? * add to defaults * light break variation pass * ent spawn entry * move some stationevent utility functions to gamerule + add one for finding random tile on specified station * forgot how statistics works * powered light variation pass is good now * station tile count function * public method to ensure all solutions (for procedural use before mapinit) * move gamerulesystem utility funcs to partial * ensure all solutions before spilling in puddlesystem. for use when spilling before mapinit * trash & puddle variation passes! * oh yeah * ehh lets live a little * std * utility for game rule check based on comp * entprotoid the trash spawner oops * generalize trash variation * use added instead of started for secret rule * random cleanup * generic replacement variation system * Wall rusting variation rule * account for modifying while enumerating * use localaabb * fix test * minor tweaks * reinforced wall replacer + puddletweaker (cherry picked from commit cc24ba6a317c4bee84ffa1eda8397c255ca92be9)

(cherry picked from commit 9556c2bc04b912ff98dc42a5b53f3aea3c4df942)

Removing the embedding function (cherry picked from commit ae7c57a9a072a02f885ef5de7d8244b57555942b)

* Update game_presets.yml Added Secret Extended and Secret Greenshift. * Update game_presets.yml (cherry picked from commit c181ba4baeee9a0b7ed88926942c9bc814fdd18e)

(cherry picked from commit 2a5f5299f0ed6ecec6ccc99109788f487c7c3793)

* Add a few new speech emoted for Cry and Laugh * Remove Pouting me dumb and silly (cherry picked from commit f511f60fb42588c0a8f656b2e013d3722dd41d8d)

(cherry picked from commit 1f389d7a3916be1153c068fdaebb5d36e5c62f7a)

* Firestarter fixes - Actually networks the action. - Namespace fixes. * No networky for you (cherry picked from commit a6ea8b210db079d30823e7b4d8faa32aefa17582)

fix (cherry picked from commit 884a5441202dfbfe715460d3cea76ebf0dbcc550)

(cherry picked from commit 6e68a6ca10d84c90370c94af9e7ca14a6c8fb7b9)

… be slightly viable (#24765) * Viability!!! Removes the uplink headset as suggested, changes around TC prices to make a few things more viable * Binary 1 TC Changes the Encryption Binary Key to a simple 1, I don't think I've ever seen it be used before and 1 seems like a proper price for it (cherry picked from commit cb2985eabce286ba40974dcb365ec4668a6b7541)

(cherry picked from commit ff090878e73bab3bcc7382197a0406fa88642482)

* Remove wheelchairs Vehicle code is dogwater and wheelchairs just keeps exposing edgecases. If someone wants it brought it back they can do vehicle refactor. * Also this one * Remove vehicles * goodbye vehicles * Remove this check * sasd * Cronch * Add sprites back * jani (cherry picked from commit d2f20d8955a25a32aa5fb9b3631a41921b464cd4)

(cherry picked from commit 0b9c52dd15463319515731c0e8491fa12bb3ec18)

This would happen when they run out of fuel. (cherry picked from commit b029d05620292f4c9c793edfb2a52254f4f4d484)

* Change emagged laws to append modifiers instead of completely changing them. * Maybe fix everything not working * bugfix * Fix missing secrecy law and allow basic borgs to be emagged correctly * Localization * Actual localization * test * Test * Remove dummy debug value * Fix bad law ordering * Tweak the secrecy law * Minor law tweaks * Remove obsolete argument * Fix YAML (cherry picked from commit 27592ba898201d0b09c95f6b0958503407d01bb5)

(cherry picked from commit d061c164fa06b7b4af497771de1ee5685e5a3a38)

"why are they getting cold damage" THERE YOU GO (cherry picked from commit c25ddfd638e2c50b541e5ebf8c2eda85778f3711)

(cherry picked from commit 5f44cd92e15fa33405c4a58c2842b42799594142)

* New sprite * Contrast is key. (cherry picked from commit 08a31eae197860f7cd177808729857173c55b77c)

(cherry picked from commit 50e58ca8055a1837e258eff8e0d803f08ae104d7)

* A beer can and a wine can * fix wrong file locations Signed-off-by: c4llv07e <[email protected]> * Update drinks_cans.yml * A beer can and a wine can * Update drinks_cans.yml * A beer can and a wine can * replace sprites Signed-off-by: c4llv07e <[email protected]> * Update meta.json * Update meta.json * Update Resources/Textures/Objects/Consumable/Drinks/wine_can.rsi/meta.json * Update Resources/Textures/Objects/Consumable/Drinks/beer_can.rsi/meta.json --------- Signed-off-by: c4llv07e <[email protected]> Co-authored-by: c4llv07e <[email protected]> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit b80b6c04b248002c8febddf8fa961a2f95451510)

* Remove yellow oxygen tank * forgor --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit e5bf4979ae432266cd6e2e9ef1d91cb40dd99264)

(cherry picked from commit 1bbe1aba330f485cae7c2d24d52bdcfe148476e2)

* Buzzing moth * Update speech_emotes.yml (cherry picked from commit 507c39d4456df7536d13a91fd77074d436955624)

Fix ssd indicator (cherry picked from commit fed43f05d0e95d51e2426a80c7e8963d585c5521)

(cherry picked from commit 4ee95501dc7934e97c3cc867e7d54a2f74bb945e)

* clarity? * h * bleeeurgh * review ass --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 48f5bfb74ab4a2a39c7a72bcecf422dd015471a6)

- Probably confusing if you're not familiar with nentities - if I need the clientside uid for debugging I can just open VV and it's immediately there on first page. (cherry picked from commit ca5470918679d73a95404b08fc76d2be088a6876)

added warning state for AME (cherry picked from commit f3ff35dcfa5afb417c24ba9f21cfc2bc414d0c4f)

* small patch * fix * remove garbage * fix * moved to shared events * fix * LocId --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 498ad2d5d714c73d9212bda9d3d89d53b2001e04)

(cherry picked from commit 3054328d0fbe4454fb8eb64ded1381e5f09f8c3c)

Bottom text (cherry picked from commit dfef9dd0d510b7490a336e9ba800667218ce7a2a)

(cherry picked from commit 5669c412a5178eece310c2516d747d84a149baae)

* adds prototypes for airlock assemblies for other doors * fix tests (cherry picked from commit d76121d470c1e159787a6b991c0599068bd06a5f)

…age (#24586) * Initial commit, requires server restart to take effect * Exposes callbacks directly instead, takes effect immediately * Cleaned up control flow, swapped cvar for client customization * Switched to int, dictionary of callbacks, migration * Update Content.Shared/Preferences/SpawnPriorityPreference.cs * krunkle stan --------- Co-authored-by: metalgearsloth <[email protected]> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit ed0f2aa2213cc47b817476206a2dd0b4e7c176b1)

* Adds Visitor role and ShowInIdCardConsole property * Add visitor to Agent ID card * Fixes yaml test * Fixes based on feedback * Fixes based on feedback (cherry picked from commit 1862f8aa1745f147fa54428179e568c9298a9fda)

(cherry picked from commit c4f275bc5378ebabff85b0b0e5dc9d3c30cf1ade)

* Space lube now makes you slide * review * oh lord he slippin --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 4f3b8d740cecfb736b018fd78a2be71f5397644d)

(cherry picked from commit 4177e647126a1093fac46b483af9e6c23e3cb915)

* Binary Key 4-2 TC * Added Binary Key into RD Locker * Change from ID to Entity * Reverts back to ID * Found the Actual ID (cherry picked from commit 3c8882696a690a302c783de4351d5c89ec9820c1)

(cherry picked from commit bbab3944825a75be10184b6d083eb4422c6f071f)

* The zombie virus now cures paraplegia. * no wheelchairbound anymore (cherry picked from commit ecea561e44f51d2c2bbf17af46db84d3ee1a5cae)

All the engineering numbers are complete unusable garbage and it's apparently completely impossible to properly set up power on some maps. This is a band-aid fix (and apology to all engineering players) until somebody fixes this shit properly. (cherry picked from commit 879b4d171efd9ae9907369d6dd856afafb381b06)

(cherry picked from commit 1f1809d6ed7b6694485d7a4286a8d8ad579db092)

* comit * comit2 * little more range * review --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 628e22ba026724b444d8cfc900e0a6ef3cbd9c6f)

Oop (cherry picked from commit bd86447f996e10a1befda16404f0155209efa0e1)

-Electrocutions now happen using how much power there is rather than how much is being used. (cherry picked from commit cdfff3c4bd49f77d9711d590eb649e365c3bca91)

(cherry picked from commit 8385e936f30dce4c84a2a34a1823fd2d20a1318e)

* Fix tests PJB don't look no shed * weh (cherry picked from commit c0227bcb3b123fa2228fb114e5c67b985a5fcdaf)

* Cleanups PolymorphSystem * forgot this * Nah * Fix test --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit b8f0ed3975a4b887ca8dd75dcc07e0ac5ee11646)

* Edible paper * Added Paper tag (cherry picked from commit d520198f1357487940d2de12fa567b5461b20ba2)

Remove part crates (cherry picked from commit 8b292671f498db9b7f9f4db8cb7b569440259782)

(cherry picked from commit 1fc237a84ec6086095089f3a4e6b89513114697c)

(cherry picked from commit e212b10ca205b5a76c20a3daca4a13af435611c5)

(cherry picked from commit b932d94ded2ff4f8e6e563e55231263ee01389e3)

@deltanedas

* add Placeholder and make default buttons flags consistent w old behaviour * DialogWindow ops * make QuickDialog use DialogWindow * Update Content.Client/UserInterface/Controls/DialogWindow.xaml --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 6b03aaaec78bd50c8f4730c9aa7d0f5cea76e782)

…ade payloads (#24306) * Toot * Hm, but why stop there? --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 5dc1481e0380289943936af1f36a72949a86d219)

(cherry picked from commit 45dff4b47d4273378526434d363880d822c27f76)

* Add AFK detection for aHelp relay and admin specific afk time. * Correct query to new refactor * Change AFK timeout to 10min or else Pancake closes my PR 😭 * It wasnt a bug it was a feature, way less aHelps that way. * aHelp Colors arn't real! * Update Content.Shared/CCVar/CCVars.cs --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 00841217062ba60d38320dfd2b93288548bb4201)

(cherry picked from commit 3f4ddebef396f781682ec3eb5a2a6daae01b256f)

Fix gamebreaking bizzaresoft_flipped issue. * Icon now shows same detail, just from different perspective. * Cap now displays correct perspective when equipped. * Cap now displays correct perspective in hand. * Cap now appears in the same hand it's held in. (cherry picked from commit c989340c521f4d647c06942bb64ca2ac3e6099d4)

…to ghosts is now controlled by a cvar (#22194) * Initial work on having the Rev icons not be visible to ghosts depending on a Cvar and a component. This commit just makes it so that the revcomponent and headrev component are not shared with clients that shouldn't know about them. This is due to the concern that clients having access to those components, even if no image was displayed could allow modified clients to have meta knowledge of revs. Currently this has the issue that if a player later for example becomes a rev, none of the existing rev components get networked to them. I am not sure there is currently an effecient solution to this. This is probably in an issue for a lot more stuff. I might just make it so all the logic just moves to the client on whether to put the icon again. Also this commit adds the ShowRevIconsComponent to allow anyone with it to just view rev icons. * Rev components now get communicated to clients that didn't have them previously and the AntagIconSystem is now properly checking whether to give the icons. We now dirty all the rev/headrev components when someone gets converted or gets the ViewRevIcons component. The AntagIconSystem now checks whether it should draw the icons mostly based on an event, this is still done client side. This is not a full proof solution to make it so clients can't know someone is an antag when they shouldn't because: 1. There are other components that need similar treatment, to my knowledge not to for revs but for other antags. Maybe even the mind component. This could be addressed in future PRs. 2. We cannot ensure that clients forget about these components if the client gets deconverted for example. We can of course have code that does this, but it will necessarily need to be done on the client and if the client is modified then there is no way to ensure this. Of course at that point they should already know who their fellow revs are so this might not be an issue. I now need to do the same thing for zombies in a future commit. A similar system for nukies also needs to be looked at but I will not be doing that in the PR this commit ends up in. * Misc name changes and cleaning up the ZombieSystem Changed some names around and decoupled the ZombieSystem from the AntagStatusIconsystem. Now there is a cvar for ghost visibility for them as well. The Zombie Component was not made SessionSpecific because: 1. Zombies are pretty visible anyways 2. The Component is needed to change the appearance of zombie players. * Misc name changes and cleaning up the ZombieSystem Changed some names around and decoupled the ZombieSystem from the AntagStatusIconsystem. Now there is a cvar for ghost visibility for them as well. The Zombie Component was not made SessionSpecific because: 1. Zombies are pretty visible anyways 2. The Component is needed to change the appearance of zombie players. * Merged 2 if statements into 1 on the Zombiesystem. * Cut down on code duplication in AntagStatusIconSystem Now instead of having a seperate function for each component, there is 1 generic function. Functions for special cases like the Rev/Headrev comp can have a separate function that does the special check and then calls the generic one. This is done through the IAntagStatusIconComponent interface which provides a common interface to get the Icon. * Removed some duplication from the SharedRevolutionarySystem with generics. I have no idea why I didn't think of this sooner. * Addressed Reviews I think I think events get unsubbed automatically but I am probably missing something that I have not understood. Either way this is a requested change. * Replace war crimes with actual fixes for reviews It was not clear to me what the reviews meant * Addressed reviews by removing need for cvars. Whether icons are visible to ghosts is now determined by a bool in IAntagStatusIcon which all antag components with status icons should implement. * Update Content.Shared/Revolutionary/SharedRevolutionarySystem.cs --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 8b19b7fab9dd8fb115f65794d97a26ebb9aa1142)

* add bubble sprites and yaml changes * fixed issues * lizardified names * more fixes, got rid of error * add indicator to kobolds * updated sprites (removed notch, brightened colours) (cherry picked from commit 4520ac8c9ba8030f7b25b39a6f04a89e6106b0b1)

* Moves FlashComponent.cs, FlashOnTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared * Moves ExplodeOnTriggerComponent.cs, OnUseTimerTriggerComponent.cs, ActiveTimerTriggerComponent.cs, and SmokeOnTriggerComponent.cs to Shared * Delete .run/Content Server+Client.run.xml HOW DID THIS GET IN HERE ITS NOT AHHHH * Update Content.Client/Explosion/SmokeOnTriggerSystem.cs Co-authored-by: DrSmugleaf <[email protected]> * Update Content.Shared/Explosion/Components/ActiveTimerTriggerComponent.cs Co-authored-by: DrSmugleaf <[email protected]> * Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs Co-authored-by: DrSmugleaf <[email protected]> * Update Content.Shared/Explosion/Components/OnUseTimerTriggerComponent.cs Co-authored-by: DrSmugleaf <[email protected]> * Update Content.Shared/Explosion/EntitySystems/SharedTriggerSystem.cs Co-authored-by: DrSmugleaf <[email protected]> * Update Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs Co-authored-by: DrSmugleaf <[email protected]> * Update ExplodeOnTriggerComponent.cs * Revert "Delete .run/Content Server+Client.run.xml" This reverts commit 29ee05f57de60eab5c92158d8eba5e3acba483c2. * Fix? * cannot figure out how to get this to go back please forgive * Fixes a network issue * leftovers * Fixes --------- Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 467e983ba972a7ae749c95448febd19c7c285514)

* Fix outdated component name in assaultbelt whitelist RangedMagazine was replaced with BallisticAmmoProvider in the Gun refactor (#8301) * Move FlashOnTrigger, SmokeOnTrigger, Flash components to Shared * Move LightReplacerComponent to Shared * Move Utensil, Mousetrap components to Shared * Move SprayPainterComponent to Shared The PaintableAirlock tag has also been removed, as it was unused & unnecessary, likely a vestige of spray painter development when the PaintableAirlock component wasn't in Content.Shared. * Add trivial Produce and Seed components to Client This allows the plant bag and botanical belt whitelists to correctly match produce and seeds on the client, fixing the extraneous "Can't insert" message that previously appeared. --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 9cd6e4dccdfaa7e273417e3c94d66b5171c7d841)

(cherry picked from commit d4185144ddc4508f5b327d861c4da13224e47c32)

* Remove obsolete transform call Shrimple PR also fixed bad flatpack call that would break on non-standard tilesizes. * Update calls * weh (cherry picked from commit 52808694e0a479c162930a0aae20e91b68bc67a4)

(cherry picked from commit 67286f3a4c4ec0e48cb24e09aa335048c4d998d1)

(cherry picked from commit 0375cd866fdac3eb65781431d1ca2b59e3cf7e92)

(cherry picked from commit 2aa5759334be8ad5f008f132dda55d9901d11cdb)

…094) * Action for closing master prs * Spelling mistakes and better msg * a (cherry picked from commit 5d5c4c4772739c0fdf6d289217061c8f74ac1ee8)

Added missing component to base spray bottle (cherry picked from commit 66b37b45f4d1ff44ae3d558e20a09a51874fb9cf)

(cherry picked from commit abd2bfceb84c16a1918e28c4156174e6d8f282c7)

fix dylovene OD damage (cherry picked from commit eed7ca1ddc4bd76e7b02cbbb9205d974970878b6)

(cherry picked from commit 912b5915d411056e5fdf723648fb480c1bdcd4a8)

* Remove gondola & change berry box description * Removed map gondolas * Revert "Removed map gondolas" This reverts commit 42fcfb85f16e778df135d2a68b9cea08d794e28b. * Updated migration.yml to remove FoodBoxDonkpocketGondola * Replacing is better than removing * Changed description slightly (cherry picked from commit e36844de47ce0d9f5f28b11b733cd998201e1b49)

@deltanedas

* refactor and add Department to PaintableAirlock, move it to server dir since its in namespace * add departments to doors, cleanup * add style -> departments mapping * AirlockDepartmentsPrototype * update shared spray stuff to have department * name file the same as the class name * department optional * refactor spray painter system + send department * fixy * client * no need to rewrite ActivateableUi * pro ops * the reckoning * hiss * . *

* add standard atmos colors to palette * Update Content.Shared/SprayPainter/SharedSprayPainterSystem.cs --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit c49c78bafaddc3ed69714eaf41920e1565dbd292)

(cherry picked from commit efb623de19d1107f6319ebef451c043c0c606579)

(cherry picked from commit f25093e85e25ca0ea7a5c22a7a74b8a3287119e7)

(cherry picked from commit 1b424d6925eebeb58fd3c9885bde786dae447c19)

(cherry picked from commit 92dcc0a03797440bb26699dc4a067e23ee10c1bb)

Nerf (cherry picked from commit 20ecbc252cc0bdc4cb010ab8219902a948403c77)

(cherry picked from commit d356a075e65c68656c3ac1ae591806a0fafbc352)

This is literally it Ayup (cherry picked from commit 82434e7959d307f3cf4da77dfaca7241e6a0691c)

* Can't slide under fences anymore * Small mobs can't pass instead (cherry picked from commit 214961f46e18caae66ea3fe902a22b0e9750c243)

(cherry picked from commit dfa86fbff81eacc832cf2f260e7a939cc98daa69)

This standardises it with audio and whatever. Me when I sprinkle nullchecks everywhere. Was 50/50 on making new non-nullable methods but figured it would bloat too hard and you can't access strings by .Value anyway. (cherry picked from commit 606c5a8c8b1005de62c33d5de888f67a8eae0ccc)

@deltanedas

fix popup spam on invalid door Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 58e28b5136261d4b308a1882fc64c542575d40e7)

(cherry picked from commit 6b1524138b02e1a573f70364e5766705c7cd5e26)

* Reduced motion toggle disables screen shake * Actually, screen shake is its own slider instead * Cache screen shake intensity cvar (cherry picked from commit ba0ca39a7ad5ceef2ae0582e13be5044e6f0a5f7)

(cherry picked from commit 59733412365ce4baee2389755f61691697b6f44a)

(cherry picked from commit 84c5057bb53eeabd308be364d968831d6feb124d)

(cherry picked from commit 3ffa15ce3434f84012785c696c7d403bf3574f17)

* made hit sound logic potentially better * Function already tries all fallbacks, no reason to return bool * NoDamageSound execution path (cherry picked from commit b98dc669741a3e5199e9fa03d82703821ab5284c)

* fix issue * fix fix * add space * really fix --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 30bd3d1da06bd0a9b2881bc89ff7f2117b34d899)

Not every mob needs to be able to pull, no, if you want it implement it manually. (cherry picked from commit 2191c7558a7939cadeef3616be837677058c9fcd)

(cherry picked from commit 7e97d540b7420503f6e41b026f27e8c7d74df365)

* Add puller sanity test * weh * NRTs (cherry picked from commit 641fb665b7831b76aeb7ee3d22da8d947be2c5a8)

* Added stonk pockets * Give me a little credit * Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json * Update Resources/Textures/Objects/Consumable/Food/Baked/donkpocket.rsi/meta.json --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 765ea789cca4476af05871afd7d6e97a3e281e17)

(cherry picked from commit b6dbdf217de02abb8b9c716b9cc079b36d279eeb)

(cherry picked from commit ca5db8a8d4d444c946589e5d0f9648c51d1dba08)

(cherry picked from commit 215da3fb362edd50c070cc659b5a42609e4b9263)

Fix spaceup flavor (cherry picked from commit e7ee364af300b9b4c28e2a8fdf0866b302700c12)

In which I'm a goober and don't clean up after myself and accientally don't fix the issue I tried to fix in my last round restart PR. The audio is now maintained just like music during restarts (yippee to ContentAudioSystem::OnRoundRestart) This needs a refactor but at least the defect is fixed now. (cherry picked from commit 2e7d23674ed315aa3cd36e5a744008900474c3fd)

* Make scarfs craftable Also sorted the lathe a bit because I like it when it looks nice. * reverts sorting (cherry picked from commit bff50de74617ac7ee4d4253377d92b26c293e761)

(cherry picked from commit f0dddd48ad783146836aa76929fdf0da184445b6)

* We meet again, my old friend. * Helper property (cherry picked from commit 31207006f50d342d2d29c366977ebf4f783a68ea)

* Various fixes * Fix bad ordering with scrambled law orders (cherry picked from commit e4f6a4bea67e9ea99240c8053f6cbbdc70e62c7b)

(cherry picked from commit 3630956526163961e650210a18ebac11ff60d239)

Updated FollowerSystem's fix to use new helper property (cherry picked from commit 79e3a6630d94a7409500b5856fd2a1518533a3d9)

* 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 (cherry picked from commit 0d8254b2a2891f8d5623c9878bd0e567d0c7fe3c)

(cherry picked from commit f7b61f6cda93fe8daa64f564530bcb95c7d1bf22)

* localize shuttle timer eta etd * remove soapy water for real (cherry picked from commit c4e7f1ebe80b3a347d98784b8b0ec77e047b63d5)

decouple panels and wires (cherry picked from commit 5db6a3eafc08132b7415be23eb40506ca2f550a9)

(cherry picked from commit 3484e69dffd27896a4234962e2c2640a8b4a3a58)

Allows None to be selected (cherry picked from commit 778a704b5820811d9267a23a8c080a83bc606ae4)

(cherry picked from commit 240ebfa3a657221d6484c021bc9ddda709879f12)

* Decoupled from gravity, constant animation time, manual networking, cubic interpolation * Reduced overshoot * Implemented PointAttemptEvent, reacts with mobstate & sleeping * Brains can no longer point, PBs must be inside a chassis * Removed chassis check, made callback more obvious (cherry picked from commit d01d75073cc4179ca5e34cacccd2ca6387e2bf99)

(cherry picked from commit 864904dd5d3c939336c20781b70943b064490a07)

* Fix slip bug * debug assert * count * DebugAssert (cherry picked from commit 9e484c4b61352a81bb84e2e1e9e030d13ff1464a)

…enu (#24895) Update weapons.yml Fixed incorrect path to the uranium spear image in the construction menu (cherry picked from commit 8af1bea9371e77589fbe9c30ad531ffae1c382b3)

(cherry picked from commit 07523b5615903d0c0c960c8884aeb14a65afb37b)

@deltanedas

* texture * add the item * add it to present and salv loot --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 604748534ebd72efafa11344ee33d563c2ff93c3)

* Fix End of Round messages looping forever and ever and ever * Use the correct setting for round restart sounds (cherry picked from commit 09daa534bd32d4784b6dd88ac6877607efec17b8)

(cherry picked from commit c9018cf205cbb09b825c04cd3bb3d0553e0bae75)

(cherry picked from commit 2d48ec52abf6fe18f885d98ace617301e5020f89)

(cherry picked from commit b7814c7d279746246fb46bb2b7518f540717f9bc)

@deltanedas

* make chem machine boards roundstart * nuke biochem * kill * pro --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 24af66a544d9c0ef2330f7f5ff3e0a420a5655aa)

(cherry picked from commit 914bab19e8f9d02f28be656d162a0bd102e1070a)

Revert "Pulling rework (#20906)" This reverts commit 0d8254b2a2891f8d5623c9878bd0e567d0c7fe3c. (cherry picked from commit c15b0691ec452e543a3cc6894a28bb409dbc65f8)

* adds refunds to stores * Adds method to check for starting map * comments, datafields, some requested changes * turns event into ref event * Adds datafields * Switches to entity terminating event * Changes store entity to be nullable and checks if store is terminating to remove reference. * Tryadd instead of containskey * Adds a refund disable method, disables refund on bought ent container changes if not an action * Removes datafield specification * Readds missing using statement * Removes unused using statements * What the heck is listing data --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 257909fd97c05bfde837a76afe5c5c612afc9f28)

* EMP disables suit sensors * update to supersede and not disable * Revert "update to supersede and not disable" This reverts commit 337028c31af1c0fa2b1838bcf5d6759bfd7ed97c. * separate logic out into just emp events (cherry picked from commit 09dd92ce61b90f0ec64de77e0d5ae35090b931c8)

(cherry picked from commit 494af9ac68724ccfaf4d97081d8b758735acf397)

* add face bandanas * oops * make face bandanas butcherable, also one bite * oops * Add mouth IdentityBlocker to bandanas * refactor to use foldablecomponent * remove some leftover bits * remove HamsterWearable until face sprite updated * oops * review changes * remove a few unneeded bits (cherry picked from commit b503fe586423773ed6484a9ead8ff21673dcdc66)

(cherry picked from commit 7d1567281f7df0c2f8003b5d2ebbc5312232c086)

Relay wasn't really networked properly and this annoys me. EntityStorage is still pretty skrunkly but this fixes the main issue I think. (cherry picked from commit 042feae2e91f41f7d39e55340405e3c448903d61)

(cherry picked from commit 66a0896e76822448cc842f6bf53cc3f370d83f52)

Co-authored-by: Jeff <[email protected]> (cherry picked from commit aa86b93adddebd92f612cfe790b59df5f53767e9)

* Fix quantum disposable issue * remove force * Iterate over all the disposal holder children instead of contained ones (cherry picked from commit 50e38cbd21950cc3bf31113c6a222d7ef8a3625b)

This adds visual differences to the sprites of many of the game's drinks when they are opened, as well as visual fill levels for most see-through drink containers. Condiment packets are visibly torn open in the corner when opened. Glue, lube, and condiment bottles are visibly opened too. I also noticed that the soda bottles were all completely opaque, so I fixed that while I was at it. Oh, and I updated the wine bottle sprite to say 14 instead of 13, 'cause yeah. As a result of the way fill levels take on the color of the contained liquid, many of the drinks have changed slightly in appearance. This can be adjusted in the future by modifying the colors of the reagents, but seems outside the scope of this already large PR. This also means that if you refill the bottles with a different liquid, they'll take on the new color appropriately. (cherry picked from commit 41cf3e559973f89eb48d1e24099716f54a1bc87c)

(cherry picked from commit d9e6d3e2f7e3930ab1983a78d048c3cc173a1345)

@deltanedas

Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 66d7e60cdcd1dabb564ac4166aade722f6cf2583)

(cherry picked from commit 0ccdd873d258947481eb8c87f1d9472d4cc6c750)

autoAttack field (cherry picked from commit 8ae63ccc03a8b217f7b47d8a33633ff7a94addfe)

(cherry picked from commit c856dd75067bace5944332a0f4b43d5bde413042)

(cherry picked from commit 683591ab046eb720e6ccfd3d0f6e5574f5f7efbc)

(cherry picked from commit a8c9af1227714aa33efeebb88aa3c9b38067d834)

(cherry picked from commit 1ed86128ecbcdf809ed2602b1a242e8418a9df86)

(cherry picked from commit e79d2b5561692f34c3ee88c0d2a5707982227af2)

actual fix this time (cherry picked from commit b88a8f0bb2a4e1c9dca39bf0778aa3c6c947702f)

The Duality of Skull Cracking!!! Fixes a IC standpoint of what the sectech should be threatening to beat, go crack syndicate skulls not non-existent communist skulls silly (cherry picked from commit 30fd0c89e1b49ef0017c886dc5bdb09dcffb9320)

(cherry picked from commit 9deaf675216e72561da0d0b021351ebd16276fff)

@deltanedas

* move criminal records console component to shared * todone --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 9b1c88b78b4d27d7a762ebd80dc4294e9cf6332f)

(cherry picked from commit 2ba1bd22dc992df2e63de056c1ce99c6f8b0fa0f)

(cherry picked from commit 1a4b96c2fcafc59a3fbf1dfe62a45d5940a6c7ac)

(cherry picked from commit 66e997489a926146e727ddcc75f98a76ca033ee3)

(cherry picked from commit a1fa82fdb41bb615abc898b8f90ea1ac41b4e335)

@deltanedas

Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 24f91ca3d872ab2b3ec6d6771c65fe3db189ad28)

(cherry picked from commit 62b1082eb9b648dd392ef483867a08d31a801fa8)

@deltanedas

how Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit ab87db0c1ffa97f50bdf8bdb4449684155f543b2)

(cherry picked from commit 66e162c1a2358e329bbc45ace977e743c8457190)

(cherry picked from commit f59a4e4043fad7a5fd3c47ddc901bc02684e2d6a)

* embeddable pen * exploding pen * lol (cherry picked from commit 43b9233e09350f3f0483044a90212a7a1e38c953)

(cherry picked from commit 9dc73f0b61e1dcd265097e2a9a74fb28a91c2406)

Allow opening doors mid-deny animation, if you have access ofc (cherry picked from commit bedccf8e31c53faff90f46822efce6143e6dc2e1)

Minor change to cybersun pen description (cherry picked from commit d47865cb2de444435ffbc1950d3af48dccb6f32c)

* Borg Module QoL Focused on Engi Modules * Update borg_modules.yml * Update borg_modules.yml * Removed Gas Analyzer Module Recipe * Update borg_modules.yml * Removes Gas Analyzer Module from research * Update borg_modules.yml * Update lathe.yml * Update handheld_crew_monitor.yml * Update borg_modules.yml * Exchanged Service Module Dropper with BorgDropper * Made a Lingering Plasteel Stack * Made Lingering Reinforced Glass Stack * Added Reinforced Glass and Plasteel into Construction Module * Change Borg Crew Monitor Charge use * Update handheld_crew_monitor.yml * Removed Borg Crew Monitor * Removed Crew Monitor From Diagnosis Module * ID change * Update handheld_crew_monitor.yml * Delete Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml * Update borg_modules.yml * Update metal.yml * Update glass.yml (cherry picked from commit ce775891552f9fca2a54120b5a19f2a01c6e5c8b)

(cherry picked from commit b34931bbde9633bf2f5674c6d809902ef9159539)

(cherry picked from commit 4129c77a5b7c4d5cdfa4763881bdaa443c128f33)

(cherry picked from commit 8e766ba84d293e7ba50ce77a4abfaf9b96a5e89f)

* Added Monitor Computer Boards to Observation Kit * Removed crew monitor board from bundle as requested by mainters (cherry picked from commit c5027b51ecc7387a678e194fd7733a03349be536)

(cherry picked from commit 4dba9a5ea1477bfd9c04049f0f6b9f2bb0ebcbaa)

(cherry picked from commit effcc5d8277cd28f9739359e50fc268ada8f4ea6)

(cherry picked from commit f8df3ae398712acfe8132ac640ecf9d9941d48a1)

(cherry picked from commit 635bd2a2ab22c8dc3dca083c07b7ed1ecec05033)

(cherry picked from commit 8dec7a608e140a6da8ef4bb51cff6348a0e5e082)

Sandbox mode should not be votable, because players can vote for it, and then entity spam to quickly lag a server or run it out of memory. (cherry picked from commit 8ccdbe73503ac96febaa8ba6e517b43220d7e80d)

* Improved output distribution of RoundToLevels * Updated tests * Oops (cherry picked from commit 9cee54e5a1b4efd1b8d511584b3e4dcbd7e7c529)

* Fix scram teleportation out of containers * re-run ci * Use AttachToGridOrMap method (cherry picked from commit d4434dbb5e586544a5dbd067a3fee4a6bd4e9e89)

* Only rename if name matches reconstructed * Rearranged query Co-authored-by: metalgearsloth <[email protected]> * Okay --------- Co-authored-by: metalgearsloth <[email protected]> (cherry picked from commit 6e91190478ec03e038ff1c3a10ecd632808f281e)

@deltanedas

* move stuff to server and some refactoring * update spikables to not use triggering * add Delete bool just incase * a new egg * mom can we have webedit. no, we have webedit at home --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 55dbe26019ed22e11f017393c028c6760699343d)

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

Literally 1984

How many times do I need to do this lmao Signed-off-by: Debug <[email protected]>

Fruit tag

Co-authored-by: Velcroboy <>

Since uncloneable was removed in wizden but not here Might aswell take it into our folder regardin the fix.

Co-authored-by: Velcroboy <>

similar requirement to prisoner

Co-authored-by: Velcroboy <>

Merge wizden up to 08/02

Co-authored-by: Velcroboy <>

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

Co-authored-by: Velcroboy <>

move paper_stamp-matis

* New Pistol Sprites * Carbine Sprites Fix * Kill and Lethal Consistency fix

* Fix the funny mindbreaker boolet * add .38 to ammo techfab * Add practice .38 to secfab + categories * Practice is plastic whoops * give mantis a buff with printable extra mags I'm sure no one will use this for traitorous acts

--------- Co-authored-by: VMSolidus <[email protected]>

* Delete Resources/Audio/DeltaV/Glimmer_Creatures/mite.ogg Signed-off-by: Fluffiest Floofers <[email protected]> * new mite sound --------- Signed-off-by: Fluffiest Floofers <[email protected]>

centered silly insect sprite

Co-authored-by: DeltaV-Bot <[email protected]>

Update deltav.toml Signed-off-by: Debug <[email protected]>

replace the bottle with wine cans

* Felinid bubble speech. THATS RIGHT. I did something. Felinid wise, again. Im a felinid enjoyer, yes. Dont judge me. =w= * Simplification * Update felinid0.png * The finalle

* Fix PseudoItem * Add pain * Cancel attack events

* reenables bureaucratic error event * change * Update events.yml removed whitespace likely causing test failures Signed-off-by: Colin-Tel <[email protected]> --------- Signed-off-by: Colin-Tel <[email protected]> Co-authored-by: Colin-Tel <[email protected]>

* Felinid changes. A plan * Just slappin it together for a friend to see and help * Somethin somethin Cos I could be at yours on friday Tonight's at the place we started It's a long way back from sorry But here I go .... How does it feel, how does it feel Just tell me something I don't know what to tell you I don't know what to say I got into my head, i'm sorry i threw it away But i'm so glad you came back, even through all the pain Let me try and mend it, i can promise that i have changed Oh, let me give you all of me Can we just sort it out for real * just makin this less messy.... I guess * Just tell me somethin. How does it feel, how does it feel. * . * cleaning.... * Makes it work. Yey. * just a small change tbh. * okay maybe just a bit. * Hm, maybe.... * This feels bit better. * hopefully fixes yaml linter * Update Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml Co-authored-by: Debug <[email protected]> Signed-off-by: Adrian16199 <[email protected]> * Doin the changes. * Renaming. * Renaming notes. --------- Signed-off-by: Adrian16199 <[email protected]> Co-authored-by: Debug <[email protected]>

* Make felinids scream in agony when sprayed with water. Their screams will be heard thro walls and halls. You will hear a felinid scream in a shift atleast once. Their sheer agony. * Giving probability as the best possible implementation as of now --------- Co-authored-by: Debug <[email protected]>

* It begins * Delete error.txt * Patch by Debug * HIDING WINGS NOW WORKS * Runs smoother from Shared * Delete HarpyVisualsSystem.cs * The entire clientside script is no longer needed, and the visuals now work correctly. Helmetbug is gone. * Update HarpyVisualsSystem.cs * First completed Harpy Hardsuit * Captain and Atmos tech birdsuits * Update hardsuit-helmets.yml * And more content * Adding new finch tail <3 * whoops * guh * I swear the tail works now, I just need the adhd meds to kick in * birb juggsuit * More stuff * Nukie hardsuits * fixing clipping issues on birb juggsuit * Update meta.json * aaaaaaaaa * two more * Ton of extra harpy sprites * Create equipped-INNERCLOTHING-harpy.png * Harpy Ultravision trait TODO: Optional trait that disables it * Trait that removes Ultravision * Code optimizations * Adding hueshift maps to all harpy markings * No more jumpsuits * 1984 the harpy jumpsuits, they are no longer needed * last 2 * final QA pass * shennanigans related to an earlier merge conflict --------- Signed-off-by: VMSolidus <[email protected]>

* Fix being able to punt probers to unachor them * Fix my wacky comment

signey

@deltanedas

* refactor and add log * add api needed for objective * backport LastProfileLoaded * fix midround antag rule * evil twin spawning code * evil twin yml and stuff * m * hopefully fully rename it * fixy --------- Co-authored-by: deltanedas <@deltanedas:kde.org>

Stop actions from running on our bot

* Shoukou small patch Deletes plasma miner Deletes command cryo Replaces cryo in prison with cryo with prisoners included edition Ensures techmaints are under robotics and cryo Fixes shutters in robotics Provides medical with a singular cryo * gets rid of invalid * Update shoukou.yml --------- Co-authored-by: Velcroboy <[email protected]>

Co-authored-by: Velcroboy <>

* Everyone loves dog vision Updated to match the the harpy code * change locale name

Me when the maps

fix

5 normality crystals

Removes invalid warning, takes care of last unowned files Signed-off-by: Debug <[email protected]>

…to upstream-sync-4

deleted submarine station

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream Sync #53

Upstream Sync #53

Commits on Feb 8, 2024

Commits on Feb 9, 2024

Commits on Feb 10, 2024

Commits on Feb 11, 2024

Commits on Feb 12, 2024

Commits on Feb 13, 2024

Commits on Feb 15, 2024

Commits on Feb 17, 2024

Commits on Feb 19, 2024