0026c525929d98281c10cc2f9240886f28e3b549
116 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Jabak
|
9689e027f3 | fix db.... Я блять вахуе с этого говна | ||
|
Jabak
|
22e019ab17 | Пиздец | ||
|
Jabak
|
5fd2ef7628 | Merge remote-tracking branch 'upstream/master' into Suka | ||
ThereDrD0
|
192d2d5de7 |
Лоадауты + апстрим, ебанешься (#421)
* Game server api (#24015) * Revert "Revert "Game server api (#23129)"" * Review pt.1 * Reviews pt.2 * Reviews pt. 3 * Reviews pt. 4 (cherry picked from commit 297853929b7b3859760dcdda95e21888672ce8e1) * Revert "Game server api" (#26871) Revert "Game server api (#24015)" This reverts commit 297853929b7b3859760dcdda95e21888672ce8e1. (cherry picked from commit 3aee19792391cbfb06edb65d6f16f77da0f36f13) * Give botanists droppers (#26839) Start botanists with droppers so that they can better dose robust harvest or mutagen. (cherry picked from commit 935127f25fef5cce6e0d5c4b73db5c6077badf56) * Automatic changelog update (cherry picked from commit 7d599a7199f21d71f3befa26e7ffec003a887dd3) * Automatic changelog update (cherry picked from commit 57911975c70dafcc3af9dfa08a86c9acda472497) * fix lots of door access (#26858) * dirty after calling SetAccesses * fix door access * D * pro ops * nukeop --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 1cdf05a7a7169ed655a294b6bbe24a75f58f62fa) * Add emergency nitrogen lockers (#26752) (cherry picked from commit 4017f9bd28251a3cbf3c0fb34499c6b821051498) * Automatic changelog update (cherry picked from commit 8c16b466132d946578e7ab4c8c92dd3ddfe94f89) * Update ashtray to allow all cigarettes / cigars (#26864) * Update ashtray to allow all cigarettes / cigars This also includes joints (as they are technically cigarettes) * ? (cherry picked from commit 9eb1e12022c22d0a8b431e4def3a8178aa1924d8) * Fix door electronics configurator usage (#26888) * allow usage of network configurator for door electronics * add checks for "allowed" items (cherry picked from commit 2bcdb608a3ddd9c91a1169d3f0d2d5b31aaebc88) * Fix TEG assert (#26881) It's possible to trigger this by stacking it weirdly with the spawn panel. Just make it bail instead. (cherry picked from commit 210ed3ece4230a7fa31c12a43f4fdee0f0614915) * Automatic changelog update (cherry picked from commit 00dc99769c2442410204c1ea57bb24cc8353c16a) * Bug fix for deconstructing tiles and lattice with RCDs (#26863) * Fixed mixed deconstruction times for tiles and lattice * Lattice and power cables can be deconstructed instantly (cherry picked from commit fc5a90be0da4801aa7ff1fbc996c2f55f8cb7ae7) * Immovable Rod changes (#26757) (cherry picked from commit 036abacbb731c0d1128a4c6cd1658f64dd488985) * fix evil roleplay changelog (#26893) agh (cherry picked from commit 75d3502d267d2050b4f9db1a4c0260c9fb6205e9) * Cryogenic storage tweaks (#26813) * make cryo remove crewmember's station record when going to cryo * Revert "make cryo remove crewmember's station record when going to cryo" This reverts commit 9ac9707289b5e553e3015c8c3ef88a78439977c6. * make cryo remove crewmember from station records when the mind is removed from the body * add stationwide announcement for people cryoing (remember to change pr title and desc) * minor changes * announcement actually shows job now * requested changes * get outta here derivative (cherry picked from commit 9d62b3c3e690cdda48143774a5e5db853894e1b8) * Automatic changelog update (cherry picked from commit 6fa90e06c737d449f354b727550a5d1e13aeae44) * Allow advertisement timers to prewarm (#26900) Allow advertisement timers to prewarm. (cherry picked from commit 264bf7199d805bd07dbdccc4345c672b19df9333) * Fix shaker sprites (#26899) * Change basefoodshaker to parent from basefoodcondiment instead * Make them still refillable (cherry picked from commit b895e557d4503074622ec1ca60e1f7749783a29e) * Automatic changelog update (cherry picked from commit 4627c7c859f12da60b75880c50b761b4646ea3a0) * Update .editorconfig to correspond Code Conventions (#26824) Update editorconfig to Code Style End of line is: CRLF (suggestion) Namespace declarations are: file scoped (suggestion). Instead of block scoped (cherry picked from commit 882aeb03143d07a4cef91412008c81c9902075d8) * Remove reagent slimes from ghost role pool (#26840) reagentslimeghostrole (cherry picked from commit e12223c355b3b452d6d6043ec126124189b64f84) * Automatic changelog update (cherry picked from commit 8f17bf1a3d96c8392c227ecc27b0e7d32c971126) * Fix grammar in changelog (#26894) Grammar Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit 261e5354d3601b5ed1a8ea6c6a161a6f79c3f791) * NoticeBoard is craftable now (#26847) * NoticeBoard is craftable now * Fix notice board to proper name capitalization * Fix notice board proper name in description * Update Resources/Prototypes/Recipes/Construction/furniture.yml --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> (cherry picked from commit e88b2467ca36c25c15095b7e7e0357c55ed581e2) * Automatic changelog update (cherry picked from commit 85aef16954725a72a2c590e9cf7445b15b93d23e) * Add drink container suffixes (#26835) Co-authored-by: Velcroboy <velcroboy333@hotmail.com> (cherry picked from commit 7d480acb0c859e0f186df41b7f2940b2ef5789bb) * uplink and store freshening (#26444) * uplink and store freshening * more * im gonna POOOOOOGGGGGGG * we love it (cherry picked from commit 9d5a3992fa635194cfe1d9fbfa60a5ea72288f4e) * Sterile swab dispenser instead of box (#24986) * sterile swab dispenser * trust --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 3a00e8c59cc595d8f85bdf0319d56bf0741d2dec) * Automatic changelog update (cherry picked from commit 2a5d23f3f1fdc72268419bd09fd29d6c265b3e51) * Strobes added (#26083) * Done * Adds new * empty * attributions * empty * strobe admin deleted (cherry picked from commit 279e01c3d26ce8332114103b2045abb61886c614) * Automatic changelog update (cherry picked from commit c8f75d99186301810a3c16d99ad138107637e723) * Health analyzer UI unit correction (#26903) Correct Kelvin displayed on health analyzer UI, use T0C constant. (cherry picked from commit 998bf453684ed91ae5971e41be72820c87b441ef) * Fix the stripping menu being openable without StrippingComponent (#26908) (cherry picked from commit 24b6456735ae83dd9de53097d625f20b723c578f) * Fixed magboot activation distance (#26912) (cherry picked from commit 0a1ce9dd437f162a59c826904241bf15ad6f2838) * Automatic changelog update (cherry picked from commit 2360376b4064db390275f407fcb89190c1e78bd7) * Uncooked animal proteins is safe for animal stomachs only (#26906) Uncooked animal proteins is safe for animal stomachs (cherry picked from commit a49a576b031d2f90b7e127fd2b639a20bb31aaf4) * Automatic changelog update (cherry picked from commit 5d00305a2279b455a7ff5196f62050abeebc4085) * Fix incorrect "Cycled" and "Bolted" popups when (un)wielding a gun (#26924) (cherry picked from commit b51482f51a67bb90f6ccc7fb355c316e200bb36d) * Fix guns that spawn without a magazine looking like they have one (#26922) (cherry picked from commit 2d53cfeabcc977938f217c303ce46a79d7fe80c9) * Fixes polymorph cooldowns (#26914) fixes polymorph cooldowns (cherry picked from commit d4b7bc5aa328e200bb087672d00c07776f98edce) * Automatic changelog update (cherry picked from commit b08677916557f34740a9b06e09493751b0af7a82) * Glowy lights - light fixtures now actually glow (#23428) * glowy lights - makes light fixtures actually physically glow when active * serviced the lights * ya sure * fixes * Removed Salv Borg Crusher Dagger (#26865) (cherry picked from commit eeb460fb2956381b44ead42f0d435ade11ec0ba3) * Fix pulling a new entity when already pulling an entity (#26499) Fix pulling when already pulling The TryStopPull were failing due to wrong arguments provided. Replacing the virtual item in hand with a different pull was failing due to the hand not being cleared. Fix stop pulling checks that had the wrong variables provided. VirtualItems are already queue deleted at the end of HandleEntityRemoved. (cherry picked from commit 037a7d7d3d53a623f70a07908299e8fc4df1b4a5) * Replace SetDamage call with TryChangeDamage in ImmovableRodSystem.cs (#26902) (cherry picked from commit 48330745147aba1ce89cdd6e7949da62dc9cbb78) * Automatic changelog update (cherry picked from commit 154b8606f9d9cc543c6b8ad422c43f563079327f) * Fix for the salvage ice labs map. (#26928) * done * more work (cherry picked from commit 1bf97c94eecfb9b76d4e2f08765ee5e8a7472151) * Automatic changelog update (cherry picked from commit ed065e8a3dbecb688b8aef1c1d597794de1503ef) * Update Credits (#26938) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> (cherry picked from commit 1f4a01aa3857af6d924c4ad9cb2c105b793c2e53) * Fix cryostorage identifying unknown characters as captain (#26927) Fixed cryostorage getting captain's record for unknown jobs. Also localized Unknown job string. (cherry picked from commit 9b97a2e05d5fe65b1d81aefcf37b69033c78f21f) * Automatic changelog update (cherry picked from commit d44db87bfb9e84fb8181d8dbd2ee250d0c6829d3) * Fixed Honkbot/jonkbot honking like crazy, gave honkbot/jonkbot standard idle ai. (#26939) * Fixed Honkbot/jonkbot honking like crazy, gave honkbot/jonkbot standard idle ai. * Update Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml --------- Co-authored-by: Tayrtahn <tayrtahn@gmail.com> (cherry picked from commit 8272d7a345264e3c10a895f838b3f5f4fa6b35e1) * Automatic changelog update (cherry picked from commit ba9091ff59251f20aa3d21615d52b40cb937f01c) * Bug fix: Force cancellation of RCD constructions if the construction type is changed (#26935) Force cancellation of RCD constructions if the construction type is changed (cherry picked from commit 33e5e4e581a8d224cc2c44465db188ded0302e4e) * Fix standart -> standard and dressfilled test fail (#26942) Fix standart -> standard (cherry picked from commit dc19964d84149354bb10fd186283f1a9d7da9cf5) * Add Ability to stop sound when MobState is Dead (#26905) * Add stopsWhenEntityDead to sound components * Convert component * Review * Fix dupe sub --------- Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit da618d791a48efacebe441eee9398c0d1c571ec8) * Automatic changelog update (cherry picked from commit bbff00cd2af7a5f5700489b42d94c9d99bc88a52) * Fix rockets and lasers looking like they have nothing loaded (#26933) (cherry picked from commit 13cef85a6e7d0f5873d1f66358ef742356541582) * Automatic changelog update (cherry picked from commit cb4561fe96adacac3283e9af138fff6eb349eb9f) * You can now see paper on crates (with color!) (#26834) * Implement changes on not-cooked branch * Made it work * Fix update appearance calls * Fix extra indents, clean-up code, fix tests hopefully * Fix hammy cagecrate * Fix messing up the yml, add artifact crate specific labels back in * Visual Studio hates yml, sad * Seperate the colors for cargonia * sorry json * make label move with artifact door * Apply suggestion changes Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Fix remaining crate offsets, add a few for livestock and graves (why are you labeling graves) and coffin label sprites (why are you labeling coffins??) --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> (cherry picked from commit 96ad9002f1d6390bf666c74ddfd871a45a8fe1df) * Make UtensilSystem and SharpSystem not run AfterInteract if it has already been handled (#25826) * Make UtensilSystem and SharpSystem not run AfterInteract if it has already been handled * merge conflicts --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> (cherry picked from commit c67948407ec9ee21c0459ca9679b6fac904aad63) * Automatic changelog update (cherry picked from commit f1d1e6c6fdf169b11e950feeac5d68f7f0aedddd) * Add two-message overload to PopupPredicted (#26907) Added two-message overload to PopupPredicted (cherry picked from commit 9107d421bdd2600883780d02d521ebbbec06ac68) * Update submodule to 218.0.0 (#26945) (cherry picked from commit 54b3d7fe45d8c491acea785aa8081c752cd6d91f) * Autism pins! (#25597) * hee hee he ha ha * added gold varients, forgive me for my spritework * maints loot, copying from past PRs * Trying to fix RSI * speedran these sprites in break time, pictures will be later * Fixed/Tweaked glows * consensus * gregregation * dam copiryte * oops i forgot to delete 2 fields hope this works (cherry picked from commit d2d62b97ac904fd486edd85a885ce682f362576c) * Automatic changelog update (cherry picked from commit dbf8a036ecf5a933270127d133927f42a88e3586) * Fix database round start date issues (#26838) How can ONE DATABASE COLUMN have so many cursed issues I don't know, but it certainly pissed off the devil in its previous life. The start_date column on round entities in the database was added by https://github.com/space-wizards/space-station-14/pull/21153. For some reason, this PR gave the column a nonsensical default value instead of making it nullable. This default value causes the code from #25280 to break. It actually trips an assert though that's not what the original issue report ran into. This didn't get noticed on wizden servers because we at some point backfilled the start_date column based on the stored admin logs. So I change the database model to make this column nullable, updated the C# code to match, and made the existing migration set the invalid values to be NULL instead. Cool. Wait how's SQLite handle in this scenario anyways? Well actually turns out the column was *completely broken* in the first place! The code for inserting into the round table was copy pasted between SQLite and PostgreSQL, with the only difference being that the SQLite key manually assigned the primary key instead of letting SQLite AUTOINCREMENT it. And then the code to give a start_date value was only added to the PostgreSQL version (which is actually in the base class already). So for SQLite that column's been filled up with the same invalid default the whole time. Why was the code manually assigning a PK? I checked the SQLite docs for AUTOINCREMENT[1], and the behavior seems appropriate. I removed the SQLite-specific code path and it just seems to work regardless. The migration just sets the old values to NULL too. BUT WAIT, THERE'S MORE! Turns out just doing the migration on SQLite is a pain in the ass! EF Core has to create a new table to apply the nullability change, because SQLite doesn't support proper ALTER COLUMN. This causes the generated SQL commands to be weird and the UPDATE for the migration goes BEFORE the nullability change... I ended up having to make TWO migrations for SQLite. Yay. Fixes #26800 [1]: https://www.sqlite.org/autoinc.html (cherry picked from commit d3ac3d06bb6eddd9c2076a586974aabf514a5c86) * Fix options menu crashing in replays (#26911) Not having the nullable set properly is annoying but fixing that would probably be a significant amount of work. (cherry picked from commit 4cb344cc307c33247492ba64cccca6dfe720540f) * Greyscale color clothing (#26943) * greyscales color gloves, color jumpsuits, and shoes * remove popbob * fix test fails (cherry picked from commit 2b8e26fa2ebd1946211b245ebd10c1863b82e66d) * Automatic changelog update (cherry picked from commit 7787a82d032185b2e165bafe1f342d1a39aeb9fc) * WT550 Buffs + Burst Mode for WT550 & C-20R (#26886) * Slightly increased WT550 Firerate, drastically reduced recoil, and given it the option to fire in 5 round bursts. * Given the C-20 a 5 round burst aswell (cherry picked from commit 7b0dd31b1fa3a91225c1b3d312ac88dc03ea9959) * Automatic changelog update (cherry picked from commit e0ff7f7625db366751000018c298d0ca97df085b) * make holoparasites actually holographic (#26862) it's over (cherry picked from commit c6ef37cc5f717116a59f465daa119d023a15c262) * Automatic changelog update (cherry picked from commit 734b6f321d83541c9282bc264a2512f95a686ccb) * Add character sheets to board game crate (#26926) add character sheets to board game crate (cherry picked from commit 7a86b1d0977d51c3a43752a7a8bfe055fadadd56) * Automatic changelog update (cherry picked from commit 9752746775021f6076fdd88ae384c7df44ba858b) * Game server admin API (#26880) * Reapply "Game server api" (#26871) This reverts commit 3aee19792391cbfb06edb65d6f16f77da0f36f13. * Rewrite 75% of the code it's good now (cherry picked from commit 9d0dfcf2b9fa1b6ba54b3aa26a3f41982b945323) * Wield recoil components (#26915) * WieldRecoilComponents * WieldRecoilComponents * Update Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com> * Update Content.Shared/Weapons/Ranged/Components/GunWieldBonusComponent.cs --------- Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> (cherry picked from commit a7fad5d43953ea679418d7c39272bf3224f7767f) * Clown shoes make you waddle, as God intended (#26338) * Clown shoes make you waddle, as God intended * OOPS * Toned down, client system name fix * Tidy namespacing for @deltanedas * Refactor to handle prediction better, etc. * Resolve PR comments. (cherry picked from commit ef42fb38061b29d7202eb6d65f1b658aecc43452) * Automatic changelog update (cherry picked from commit 055c5ab323168314095b45b532440508c1447303) * Use round time instead of server time for criminal history (#26949) make criminal records computer use round time for history instead of the server time (cherry picked from commit fbec5d18cf175d9418fed77fcb38b673692771c6) * Rotate and Offset station CCVar nuke (#26175) * no content * add noRot to Europa * bruh. and this * yay * fix (cherry picked from commit 44b20f60ff178813ebbc5b449229b0bbba81f649) * Fixed cybersun pen attacking noise (#26951) * Uupdated the cyberpen * Updated noise * Removed flashlight (cherry picked from commit 0a29508f431e2f08213ca3d2554dc21a80c15061) * Automatic changelog update (cherry picked from commit 5270e6f5f9e639b2c55dc26e01b5a184f468101f) * Revert "Game server admin API (#26880)" This reverts commit 087e013406cdd45201ebd73056fdbe5852485658. * fixes * Fix rubber hammer being unshaded (#26956) (cherry picked from commit cf8f68c7e51df1c11b38b0efffda39996a4c4e73) * Make lockers can be deconstructed only when unlocked now (#26961) * Fix lockers are not deconstrucable now Lockers are was deconstructable event when they closed and you didn't have access to them. In short - get stuff by 5 seconds, 5 sec it's time to screw down any locker, except LockerBaseSecure one * Revert un-destructable lockers fix Make lockers destructable again * Fix lockers that deconstructable only when unlocked now (cherry picked from commit 7a6067989fde5b5e1b791d40d566adf7a74d203f) * Automatic changelog update (cherry picked from commit 563f304ac57a61bba618c8ec1ffec77151ffc687) * nerf incendiary grenade (#26959) Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 516f5f3161396f8a759d9b44c35d5e9d59f6249f) * meatWall incorrect node fixed (#26966) changed node in construction meatWall (cherry picked from commit 41d2f06ffcfb8a67bfeb863ff24889e199971bb6) * Automatic changelog update (cherry picked from commit 637fc2d47571cec3c4d2509ac5aa285d2ccd2ab9) * SS14-26950 Fix Waddling During Improper States (#26965) * SS14-26950 Fix Waddling During Improper States Fix some states when a clown can waddle when no clown should be able to waddle, no-matter their clowning powers. 1. You cannot waddle whilst weightless 2. You cannot waddle whilst stunned 3. You cannot waddle whilst slowed down due to stam damage 4. You cannot waddle whilst you're knocked down 5. You cannot waddle whilst you're buckled 6. You cannot waddle whilst crit 7. You cannot waddle whilst dead There's some argument for being able to waddle whilst on the floor and doing some bizarre floor-humping exercise but I'm not coding an animation layer system just to handle clowns doing the worm. * Use a nicer "can move" check (cherry picked from commit 3d0fc1067303635a743af04ef4c463abd0dba343) * Mobs burn to ashes on excessive heat damage (#26971) * mobs burn to ashes on excessive heat damage * remove comment, remove random lines I didn't mean to add * combine code into behavior * clean unused * fix namespace * drop next to * fix spawn entities behavior spawning entities outside container (cherry picked from commit 4a6cf480cc557447a89ec98b6305b4b461f494ca) * Fix dragon slowdown on damage (#26975) Fix dragon slow on damage (cherry picked from commit 34fbd2874e3f2602f8cf1cb55bf4c20588aa8764) * Fix some airlocks with multiple access types (#26980) Co-authored-by: Velcroboy <velcroboy333@hotmail.com> (cherry picked from commit cd46282e51b0368b63344d655564315a709c7355) * Automatic changelog update (cherry picked from commit faba129e780859336cfa1a97bb492e7044348ed2) * Fix some TryGetMind overrides relying on player data (#26992) * Fix some TryGetMind overrides relying on player data * A * Rider has bamboozled me * Update `data.Mind` before attaching to entity. (cherry picked from commit 229caa10bf3417858d2cbd7c1290af12dcad4acc) * Give names to solution & identity entities (#26993) (cherry picked from commit faec39ced4d6a65b1ecbf373ba282202171f5224) * Add QM maintenance airlock (#26982) Co-authored-by: Velcroboy <velcroboy333@hotmail.com> (cherry picked from commit b23ef00d37f1c1782e8ca2ff7f3cbea6cffefa7b) * Loadouts redux (#25715) * Loadouts redux * Loadout window mockup * More workout * rent * validation * Developments * bcs * More cleanup * Rebuild working * Fix model and loading * obsession * efcore * We got a stew goin * Cleanup * Optional + SeniorEngineering fix * Fixes * Update science.yml * add add * Automatic naming * Update nukeops * Coming together * Right now * stargate * rejig the UI * weh * Loadouts tweaks * Merge conflicts + ordering fix * yerba mate * chocolat * More updates * Add multi-selection support * test h * fikss * a * add tech assistant and hazard suit * huh * Latest changes * add medical loadouts * and science * finish security loadouts * cargo * service done * added wildcards * add command * Move restrictions * Finalising * Fix existing work * Localise next batch * clothing fix * Fix storage names * review * the scooping room * Test fixes * Xamlify * Xamlify this too * Update Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> * Update Resources/Prototypes/Loadouts/loadout_groups.yml Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> * Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> * Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> * Update Resources/Prototypes/Loadouts/loadout_groups.yml Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> * Update Resources/Prototypes/Loadouts/Jobs/Security/detective.yml Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> * Update Resources/Prototypes/Loadouts/loadout_groups.yml Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> * ben * Margins --------- Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com> Co-authored-by: Mr. 27 <koolthunder019@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> (cherry picked from commit 12766fe6e37bb600a53693cfa5392892bc100685) * Fix starting gear (#27008) Slight blunder on the loadout prototype being used and all the names aligning means playtesting didn't catch it earlier. Ideally player spawning code wouldn't have sucked so I could add tests like I wanted but it is what it is. (cherry picked from commit 9bc3e076288c4e4ede6e757aa59ded9cef413340) * Reduce clown snore volume (#27012) * reduced gain by 25dB * changed volume again --------- Co-authored-by: Martin Petkovski <63034378+martin69420@users.noreply.github.com> (cherry picked from commit 11207a06490e593acab1121a9db200931b672c32) * Automatic changelog update (cherry picked from commit 9102a065a98faf4501f79e0fefc23d3dcc269c11) * Add changelog for loadouts (#27020) (cherry picked from commit 46cfd63c4fcba29c5fb62a9c13b269c9b39508fa) * Automatic changelog update (cherry picked from commit 33888b64d6a128823b60c6ce228726ce38a69d31) * Fix senior ID cards and other loadout shit (#27017) * remove senior backpacks * fix ID cards * Update atmospheric_technician.yml (cherry picked from commit e2be85bc52b51b7c736b2f0c7bfb4a2a0fc39e71) * Automatic changelog update (cherry picked from commit 5e7f2244fc52a3a0d1a0e6ea41800c1abf482a47) * fixes 1 * fixed double SlowOnDamage component * may be fixed * update engine * fix db * fix tts * fix setup gui * fix sponsor loadouts * fix: fix loadout gui * Fix potted plant popup/sfx spam (#26901) Fixed potted plant hide popup/sfx spam. (cherry picked from commit 8e9d2744f3d196fc11e88a4755f98cac8ad8dbee) * Fix StepTrigger blacklist not working (#26968) (cherry picked from commit 7810cbe41101fe152c6b30fea937cc4351d4ae29) * Re-add IAdminRemarksCommon to DB model for SS14.Admin (#27028) This was removed in #25280 as the relevant DB entities didn't go outside the DB layer anymore. SS14.Admin however still uses them directly (as it only supports Postgres), so the interface is still useful there. (cherry picked from commit bbf0505fdc0f49a40a66473296f912cb4d580cb9) * Add autism pins to loadout (#27034) add autism pins to loadout (cherry picked from commit d5b7e4baf2b867ea184c6566b1e00b5f1384867e) * Add winter coats and shoes to loadouts (#27022) * inital * Update loadout-groups.ftl * fix order * add winter boots * fix test fails (cherry picked from commit 34fa48bff9b9af20843152debd40f4a1b0226d3a) * Automatic changelog update (cherry picked from commit 30f73cfb6cd0565816801d860b816ce5a0a5e739) * LobbyUI fixes (#27033) * LobbyUI fixes I have no idea which were bugs prior but anyway fix stuff. * More fixes * Test moment (cherry picked from commit fcd6c25242c195266c3b4c4aa2ed78922683567c) * fix: fix loadout prototype * fix: fix music label * fix: add title and artist to lobby music metadata * Automatic changelog update (cherry picked from commit 4fa245f723dffc64b7f5fd1ffaec5f5b498fb48a) * Automatic changelog update (cherry picked from commit 5ee597d98c73af26ecf3985ea921b350fa834c53) * Add Nun Hood to Chaplain loadout options (#27025) Adds Nun Hood to starting Chaplain loadout options (cherry picked from commit 7114b1939c82acb593dad32f8bf34d557b8e722e) * Automatic changelog update (cherry picked from commit f825e5e38bbfc517e40f9ea99ce075187a9310b5) * add ancient jumpsuit to passenger loadout (#27035) inital (cherry picked from commit 5742dee84a04623e2b2626f49b6ab303863e2575) * update engine 2 * Added Jukebox (#26736) * Added Jukebox, along with music for jukebox * Fixed Jukebox meta.json copyright * Removed songs I couldn't find a license for. * Renamed files to solve check failures from spaces * Added missing attributions.yml * Fixed lack of description in Jukebox * Jukebox is now constructable. * Change Jukebox menu to FancyWindow * Moved Jukebox messages out of jukebox component * Removed Jukebox OnValueChanged. * JukeboxComp now uses AutoGenerateComponentState * Removed state code, since it's auto generated * Fixed various Jukebox code to match conventions. * Updated Standard.yml to match changed song list. * fixes * Jukebox workin * Fix * Polishing * Finalising * Revert * bad * jukey * Reviews * name * Update submodule to 218.2.0 --------- Co-authored-by: iNVERTED <alextjorgensen@gmail.com> (cherry picked from commit 2db374988c91c6ce5f932b9cee1ba251cbfb22e5) * fix: fix loadout prototype * fix: fix jukebox * Add jani gloves loadout (#27011) (cherry picked from commit e2341c0089a136deec40520595914086c428f466) * Mobs auto state handlers (#26957) * Autogenerate MobStateComponentState * changed CurrentState to DataField, updated DataField attribute for AllowedStates * Update Content.Shared/Mobs/Components/MobStateComponent.cs * Update Content.Shared/Mobs/Components/MobStateComponent.cs --------- Co-authored-by: BuildTools <unconfigured@null.spigotmc.org> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> (cherry picked from commit 5b8468c9d8463e68dbf4b40226895cfed7d7e143) * Fix capitalization for pirates and rats (#26644) * Fix capitalization for pirates and rats * Deal with replacements better * Be smarter about caps * Do last word properly * Variables named a bit better * Fix Consistency * Undo change that's not needed anymore * Fix up pirate since it doesn't need to check early either * Make mobster replacin' a bit better anyway * Remove extra space * Use capture groups for mobster in', add comments for first and last words * Slightly more clarification with comments (cherry picked from commit 432e6ec45dedd2982d0dcea0fe30945113835705) * Automatic changelog update (cherry picked from commit 03f51ca3aa9ed71aa99476e3a4d256b17b78be53) * Fix character preview not updating on character change (#27043) I love lobby code :3 (cherry picked from commit f9f204a6d03e08cb0d189f7d64c031a025711430) * Automatic changelog update (cherry picked from commit 0785516eacfdc06a0c568fdd96d7c1a291efd557) * Fixed gloved weapons being able to attack when not equipped. (#26762) * Initial commit. No evil hidden files this time :) * Added newline because I forgot :( * We <3 tags :) * Fixed! Works now * Update Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> (cherry picked from commit afcdc8b8668a0504fd0392eaa1b6dcd36b4f1108) * Automatic changelog update (cherry picked from commit 9f461dec5a281adab5634bed4e587a0458c82b6e) * Make cargo pallets smoothing with eachother (#27049) (cherry picked from commit 24390ef51bdf00f65d199d74300504391a83c521) * Revert "Update .editorconfig to correspond Code Conventions" (#27051) Revert "Update .editorconfig to correspond Code Conventions (#26824)" This reverts commit 882aeb03143d07a4cef91412008c81c9902075d8. (cherry picked from commit ef72d3cf7fac8ed8c21d1ea43c7740a2c49ccf03) * Show volume on the gas analyzer (#25720) The gas analyzer now shows the volume of pipes, tanks, canisters and the environment. Adjust gas analyzers so that the volume and number of moles shown corresponds to only the scanned element, e.g. a canister or single pipe in a pipenet. (cherry picked from commit 5a5efa11cf1d68708a70d48a286cb97fde96afdf) * Automatic changelog update (cherry picked from commit 20b16944adc63d810186c18ed2a4cafc7c026a48) * Navmap rework (#26713) * Optimized the drawing of lines and tracked entities * Optimized nav map updating and added thin wall support * Added support for thin doors * Removed floor tile seams, more line drawing optimizations * Fixed split grids not updating correctly * Cleaned up NavMapControl code * Fix nav map header * Converted nav map updates from system network messages to delta-states * Addressed review comments * Fixed timing issue where NavMapSystem would update before AirtightSystem did (cherry picked from commit 009d06d97833b7700bcfaa534b20575fdbbd7db5) * fland update (#27064) * fland update * n2 lockers (cherry picked from commit e0589a1350db5f129c8b5ab5950bc8932cfdefb1) * meta update (#27067) (cherry picked from commit f2ed5085628a06813d7831bad826782633d06a7d) * saltern update (#26507) * saltern update * update atmos too * run fixgridatmos * fix power outside botany, fix botany air alarm --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit d08600240f81d86dee98c51823cebfb094637c1b) * atlas artifact update (#26506) atlas update Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 46733616df769c04244c778aa2e6dd010b02886b) * prop hunt ss14 (real) (#26691) * texture appropriation * add code for projector * add chameleon projector yml * damage and actions * prevent small props being killed round removing you (700 damage from a single shot) * tweak default * oop * do appearance properly, need engine update * fix bugs, blacklist pda * remove status icons * amou * sus * fix test + make props fast * amouuuung * remove funny log --------- Co-authored-by: deltanedas <@deltanedas:kde.org> (cherry picked from commit 395c33024cb9d4e80078e3ab3c70c1e92e7fd5bc) * Automatic changelog update (cherry picked from commit a376f4784a5f14f1587a47d1c10327327f78aaf6) * box update (#27069) * box update * argh (cherry picked from commit da136826e7d1ca51f8f2d51d7f16d976a493805a) * Fix PDA and ID card data not getting set on loadouts (#27062) (cherry picked from commit a95fc86f7a73c95383bcc41cb2cf63c4fe4ce575) * Automatic changelog update (cherry picked from commit d2dc0734df6a686f2415134183ec019097876376) * Standardize HoS/Warden winter coats, add unarmored variants for printing (#24865) * Both winter coats with same armor as their counterparts * Matching description for HoS's, unarmored variants for balancing the uniform printer * Forgot some text * New sprite provided by PursuitinAshes, old sprite moved to unarmored version * Removed the 'unarmored' specifier, in line with the rest of the winter coats * Remove unarmored warden, no sprite * Re-implemented the warden's unarmored coat, with sprites from Dutch-VanDerLinde * CRLF to LF * Move armor values to abstract (cherry picked from commit d67d782f99f5d26558dbafaf43ec4b95202d16d6) * Chances of triggering effects (#27056) * electrocution * slippery * flashibg * Update SlipperyComponent.cs * Update SlipperySystem.cs (cherry picked from commit 5659edd207c36b1148ba675204c74f94821abb87) * Automatic changelog update (cherry picked from commit 92089da19240f20ced7fd91f09677ac3edabe799) * cargo console radio messages on approving (#27038) * 1 * void --> "Unknown" (cherry picked from commit fd109d61b88468a1b623975ce7258462fc40b7f6) * Automatic changelog update (cherry picked from commit 45cefc9643d447e9594fd683ec1cb5312437d78a) * Low-Key Zombie Rebalance (#27060) initial soft zombie rebalance - lower infection chance, damage, and chance of outbreak Co-authored-by: Bellwether <null> (cherry picked from commit 8213c89fdb127eba36c2c5d44e92bdae62308f2b) * Automatic changelog update (cherry picked from commit d76211514bc5697d5c1b7c93309704f73d6083b2) * Partially reverts the remote signaller resprite (#27073) de-sprites the remote signaller (cherry picked from commit 66f32d428959a1c8b5b17bd0f1346bdfbc34e8f0) * fix soap popup (#27054) fix soap (cherry picked from commit 4453fe50cfdd380f76f2c41d314e6c7ecce729fb) * Automatic changelog update (cherry picked from commit ac8d3d55ccc524f5972619502d7928f88764987e) * add greysec loadout (#27023) * inital * George orwell (cherry picked from commit 06ecf2af052b11cdc82c000be77b916109197ada) * Automatic changelog update (cherry picked from commit 8d64d2bc1e49b9fd2b2679e6a03a9bec59c5c3b8) * Add ability to shake fizzy drinks so they spray in peoples' faces (#25574) * Implemented Shakeable * Prevent shaking open Openables * Prevent shaking empty drinks. Moved part of DrinkSystem to Shared. * DrinkSystem can have a little more prediction, as a treat * Cleanup * Overhauled PressurizedDrink * Make soda cans/bottles and champagne shakeable. The drink shaker too, for fun. * We do a little refactoring. PressurizedDrink is now PressurizedSolution, and fizziness now only works on solutions containing a reagent marked as fizzy. * Documentation, cleanup, and tweaks. * Changed fizziness calculation to use a cubic-out easing curve. * Removed broken YAML that has avoid the linter's wrath for far too long * Changed reagent fizzy bool to fizziness float. Solution fizzability now scales with reagent proportion. * Rename file to match changed class name * DoAfter improvements. Cancel if the user moves away; block if no hands. * Match these filenames too * And this one * guh * Updated to use Shared puddle methods * Various fixes and improvements. * Made AttemptShakeEvent a struct * AttemptAddFizzinessEvent too (cherry picked from commit cfa94be4c2044146298d07c703f3b71bc377ca63) * Automatic changelog update (cherry picked from commit b672ea73f00a6f760f8fee720c1fe1f4160523fa) * Add Hardhats to Station Engineer Loadouts (#27044) * Add hardhats to loadout. * Update Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml * Update Resources/Prototypes/Loadouts/loadout_groups.yml --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> (cherry picked from commit 3c1ec9ac3435600f547c30d77512744b003a1f27) * Fix loadouts UI not refreshing on char change (#27075) I love lobby code. Refreshing the entire jobs UI doesn't seem to cause issues. At least jobpriorityselector was my fault when I was far fucking stupider writing this shit. (cherry picked from commit 9b1a8b07d734853c8cfcb83a6e2b7aad4e6dd764) * fixes * fixed translation for jukebox * loadout improved part 1 * Fucking prototypes * loadout improved part 2 * fucking prototypes for fucking loadouts * remove hardcoded equipment * loadouts finally done * fixes * Clown shoes make you waddle, as God intended (#26338) * Clown shoes make you waddle, as God intended * OOPS * Toned down, client system name fix * Tidy namespacing for @deltanedas * Refactor to handle prediction better, etc. * Resolve PR comments. * fixes build * better timings for clown animation * new jukebox music and songs * Maps jukeboxes update * Emergency toolbox fill rework (#29202) * emergency toolbox fill rework * Fuck --------- Co-authored-by: Simon <63975668+simyon264@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: Flareguy <78941145+flareguy@users.noreply.github.com> Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com> Co-authored-by: Jark255 <jaroslav.asanov@gmail.com> Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: lunarcomets <140772713+lunarcomets@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Token <esil.bektay@yandex.com> Co-authored-by: liltenhead <104418166+liltenhead@users.noreply.github.com> Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Co-authored-by: Nemanja <98561806+emogarbage404@users.noreply.github.com> Co-authored-by: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: deathride58 <deathride58@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: superjj18 <gagnonjake@gmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Co-authored-by: Terraspark4941 <terraspark4941@gmail.com> Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Froffy025 <78222136+Froffy025@users.noreply.github.com> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: ilya.mikheev.coder <imc-ext+github@ilyamikcoder.com> Co-authored-by: Ed <96445749+theshued@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: HS <81934438+HolySSSS@users.noreply.github.com> Co-authored-by: Whisper <121047731+quietlywhisper@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: tosatur <63034378+tosatur@users.noreply.github.com> Co-authored-by: rhailrake <splatt.pr@gmail.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: Doctor-Cpu <77215380+Doctor-Cpu@users.noreply.github.com> Co-authored-by: Bellwether <157836624+bellwetherlogic@users.noreply.github.com> Co-authored-by: Alfred Baumann <93665570+CheesePlated@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com> Co-authored-by: Krunklehorn <42424291+krunklehorn@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: MisterMecky <mrmecky@hotmail.com> Co-authored-by: Pancake <pangogie@users.noreply.github.com> Co-authored-by: Jabak <163307958+Jabaks@users.noreply.github.com> Co-authored-by: PointPNG <edvard232005@gmail.com> |
||
Aviu00
|
2ccbaf09a4 | Merge remote-tracking branch 'upstream/master' into ups | ||
Remuchi
|
0b2238b57a |
Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts: # Content.Client/Clothing/ClientClothingSystem.cs # Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs # Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml # Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs # Content.Server/Administration/Commands/AdminWhoCommand.cs # Content.Server/Bed/Sleep/SleepingSystem.cs # Content.Server/Body/Components/BloodstreamComponent.cs # Content.Server/Body/Components/RespiratorComponent.cs # Content.Server/Body/Systems/InternalsSystem.cs # Content.Server/Body/Systems/RespiratorSystem.cs # Content.Server/Chat/Managers/IChatManager.cs # Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs # Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs # Content.Server/Electrocution/ElectrocutionSystem.cs # Content.Server/Holosign/HolosignProjectorComponent.cs # Content.Server/Holosign/HolosignSystem.cs # Content.Server/Remotes/DoorRemoteSystem.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs # Content.Server/Store/Systems/StoreSystem.Ui.cs # Content.Server/VendingMachines/VendingMachineSystem.cs # Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Content.Server/VoiceMask/VoiceMaskerComponent.cs # Content.Server/Zombies/ZombieSystem.cs # Content.Shared/Bed/Sleep/SleepEmitSoundComponent.cs # Content.Shared/Cuffs/SharedCuffableSystem.cs # Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs # Resources/Locale/en-US/escape-menu/ui/options-menu.ftl # Resources/Maps/bagel.yml # Resources/Maps/box.yml # Resources/Maps/centcomm.yml # Resources/Maps/cluster.yml # Resources/Maps/europa.yml # Resources/Maps/marathon.yml # Resources/Maps/meta.yml # Resources/Maps/omega.yml # Resources/Maps/origin.yml # Resources/Maps/packed.yml # Resources/Maps/reach.yml # Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml # Resources/Prototypes/Entities/Clothing/Hands/colored.yml # Resources/Prototypes/Entities/Clothing/Neck/mantles.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml # Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml # Resources/Prototypes/Entities/Objects/Misc/land_mine.yml # Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml # Resources/Prototypes/Entities/Structures/Decoration/curtains.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml # Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml # Resources/Prototypes/Entities/Structures/Holographic/projections.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Maps/marathon.yml # Resources/Prototypes/Maps/packed.yml # Resources/Prototypes/Recipes/Lathes/security.yml # Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Textures/Clothing/OuterClothing/Armor/lingarmor.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon-open.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat.rsi/open-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon-open.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_chem.rsi/open-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon-open.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/equipped-OUTERCLOTHING-body-slim.png # Resources/Textures/Clothing/OuterClothing/Coats/labcoat_sci.rsi/open-equipped-OUTERCLOTHING-body-slim.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Misc/nunrobe.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/atmos_firesuit.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatclown.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatnomi.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json # Resources/Textures/Clothing/Shoes/Boots/combatboots.rsi/meta.json # Resources/Textures/Clothing/Shoes/Specific/bling.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/atmosf.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hosformaldress.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/operative_s.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcomformal.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hosformal.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/journalist.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/operative.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/psychologist.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/reporter.rsi/meta.json # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence0.png # Resources/Textures/Interface/Alerts/essence_counter.rsi/essence16.png # Resources/Textures/Objects/Storage/boxes.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/highsec/highsec.rsi/meta.json |
||
|
Remuchi
|
5e74f6ae53 |
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
# Conflicts: # Content.Client/Administration/Managers/ClientAdminManager.cs # Content.Client/Administration/Systems/BwoinkSystem.cs # Content.Client/Alerts/ClientAlertsSystem.cs # Content.Client/Audio/BackgroundAudioSystem.cs # Content.Client/CardboardBox/CardboardBoxSystem.cs # Content.Client/Chemistry/UI/InjectorStatusControl.cs # Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml # Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs # Content.Client/Clothing/ClientClothingSystem.cs # Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs # Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs # Content.Client/Decals/Overlays/DecalOverlay.cs # Content.Client/DoAfter/DoAfterOverlay.cs # Content.Client/Doors/AirlockSystem.cs # Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml # Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs # Content.Client/Launcher/LauncherConnectingGui.xaml # Content.Client/Launcher/LauncherConnectingGui.xaml.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/MainMenu/UI/MainMenuControl.xaml # Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml # Content.Client/MassMedia/Ui/MiniArticleCardControl.xaml.cs # Content.Client/MassMedia/Ui/NewsWriteMenu.xaml # Content.Client/MassMedia/Ui/NewsWriteMenu.xaml.cs # Content.Client/Options/UI/Tabs/MiscTab.xaml # Content.Client/Options/UI/Tabs/MiscTab.xaml.cs # Content.Client/Outline/InteractionOutlineSystem.cs # Content.Client/Overlays/ShowSecurityIconsSystem.cs # Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs # Content.Client/Popups/PopupOverlay.cs # Content.Client/Popups/PopupSystem.cs # Content.Client/Preferences/ClientPreferencesManager.cs # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Client/StatusIcon/StatusIconOverlay.cs # Content.Client/Stylesheets/StyleNano.cs # Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs # Content.Client/UserInterface/Systems/Chat/ChatUIController.cs # Content.Server/Access/Systems/IdCardConsoleSystem.cs # Content.Server/Administration/Commands/BanCommand.cs # Content.Server/Administration/Notes/AdminMessageEui.cs # Content.Server/Administration/Notes/AdminNotesSystem.cs # Content.Server/Administration/Notes/IAdminNotesManager.cs # Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs # Content.Server/Administration/Systems/BwoinkSystem.cs # Content.Server/Administration/UI/PermissionsEui.cs # Content.Server/Antag/AntagSelectionSystem.cs # Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs # Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs # Content.Server/Chat/Systems/ChatSystem.cs # Content.Server/Chemistry/EntitySystems/InjectorSystem.cs # Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs # Content.Server/Database/DatabaseRecords.cs # Content.Server/Database/ServerDbBase.cs # Content.Server/Database/ServerDbManager.cs # Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs # Content.Server/Doors/Systems/DoorSystem.cs # Content.Server/Execution/ExecutionSystem.cs # Content.Server/Explosion/EntitySystems/ExplosionSystem.cs # Content.Server/Fax/FaxSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs # Content.Server/GameTicking/GameTicker.Replays.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs # Content.Server/GameTicking/Rules/GameRuleSystem.Utility.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs # Content.Server/GameTicking/Rules/ThiefRuleSystem.cs # Content.Server/GameTicking/Rules/TraitorRuleSystem.cs # Content.Server/GameTicking/Rules/ZombieRuleSystem.cs # Content.Server/Hands/Systems/HandsSystem.cs # Content.Server/Holosign/HolosignSystem.cs # Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs # Content.Server/Info/InfoSystem.cs # Content.Server/Kitchen/EntitySystems/SharpSystem.cs # Content.Server/Magic/MagicSystem.cs # Content.Server/MagicMirror/MagicMirrorSystem.cs # Content.Server/Mapping/MappingSystem.cs # Content.Server/MassMedia/Systems/NewsSystem.cs # Content.Server/Medical/Components/HealthAnalyzerComponent.cs # Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs # Content.Server/Medical/CryoPodSystem.cs # Content.Server/Medical/HealthAnalyzerSystem.cs # Content.Server/Nutrition/EntitySystems/OpenableSystem.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Server/Remotes/DoorRemoteSystem.cs # Content.Server/Resist/EscapeInventorySystem.cs # Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs # Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs # Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs # Content.Server/Species/Systems/NymphSystem.cs # Content.Server/StationEvents/Components/GasLeakRuleComponent.cs # Content.Server/StationEvents/EventManagerSystem.cs # Content.Server/Store/Systems/StoreSystem.Ui.cs # Content.Server/Strip/StrippableSystem.cs # Content.Server/VendingMachines/VendingMachineSystem.cs # Content.Server/Weapons/Ranged/Systems/GunSystem.cs # Content.Shared.Database/LogType.cs # Content.Shared/Actions/SharedActionsSystem.cs # Content.Shared/Administration/AdminFlags.cs # Content.Shared/Administration/SharedBwoinkSystem.cs # Content.Shared/Anomaly/SharedAnomalySystem.cs # Content.Shared/Bed/Sleep/SharedSleepingSystem.cs # Content.Shared/Buckle/SharedBuckleSystem.Strap.cs # Content.Shared/Chat/ChatChannel.cs # Content.Shared/Chemistry/Components/InjectorComponent.cs # Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs # Content.Shared/Chemistry/SharedReagentDispenser.cs # Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs # Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs # Content.Shared/Cuffs/SharedCuffableSystem.cs # Content.Shared/Doors/Systems/SharedDoorSystem.cs # Content.Shared/Friction/TileFrictionController.cs # Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Content.Shared/Implants/SharedImplanterSystem.cs # Content.Shared/Lock/LockSystem.cs # Content.Shared/MedicalScanner/HealthAnalyzerScannedUserMessage.cs # Content.Shared/Nutrition/Components/OpenableComponent.cs # Content.Shared/Nutrition/EntitySystems/SharedOpenableSystem.cs # Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/ICharacterProfile.cs # Content.Shared/Projectiles/SharedProjectileSystem.cs # Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs # Content.Shared/Security/SecurityStatus.cs # Content.Shared/Security/Systems/DeployableBarrierSystem.cs # Content.Shared/Slippery/SlipperySystem.cs # Content.Shared/Species/Systems/ReformSystem.cs # Content.Shared/Standing/StandingStateSystem.cs # Content.Shared/StatusIcon/StatusIconPrototype.cs # Content.Shared/Store/ListingPrototype.cs # Content.Shared/VendingMachines/SharedVendingMachineSystem.cs # Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs # README.md # Resources/Audio/Ambience/Antag/pirate_start.ogg # Resources/Changelog/Changelog.yml # Resources/Credits/GitHub.txt # Resources/Locale/en-US/criminal-records/criminal-records.ftl # Resources/Locale/en-US/escape-menu/ui/options-menu.ftl # Resources/Locale/en-US/medical/components/health-analyzer-component.ftl # Resources/Locale/en-US/reagents/meta/biological.ftl # Resources/Locale/en-US/reagents/meta/fun.ftl # Resources/Locale/en-US/reagents/meta/physical-desc.ftl # Resources/Locale/en-US/seeds/seeds.ftl # Resources/Locale/en-US/wires/wire-names.ftl # Resources/Maps/Shuttles/cargo_fland.yml # Resources/Maps/core.yml # Resources/Maps/europa.yml # Resources/Maps/fland.yml # Resources/Maps/origin.yml # Resources/Maps/saltern.yml # Resources/Maps/train.yml # Resources/Prototypes/Actions/diona.yml # Resources/Prototypes/Atmospherics/gases.yml # Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml # Resources/Prototypes/Catalog/Cargo/cargo_engines.yml # Resources/Prototypes/Catalog/Cargo/cargo_fun.yml # Resources/Prototypes/Catalog/Cargo/cargo_security.yml # Resources/Prototypes/Catalog/Cargo/cargo_service.yml # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Catalog/Fills/Boxes/general.yml # Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml # Resources/Prototypes/Catalog/Fills/Crates/engines.yml # Resources/Prototypes/Catalog/Fills/Items/briefcases.yml # Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml # Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Catalog/Fills/Lockers/security.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml # Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml # Resources/Prototypes/Catalog/uplink_catalog.yml # Resources/Prototypes/Datasets/Names/first_male.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Clothing/Hands/colored.yml # Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml # Resources/Prototypes/Entities/Clothing/Head/hats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml # Resources/Prototypes/Entities/Mobs/NPCs/animals.yml # Resources/Prototypes/Entities/Mobs/Player/silicon.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Mobs/Species/slime.yml # Resources/Prototypes/Entities/Mobs/Species/vox.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml # Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml # Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml # Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml # Resources/Prototypes/Entities/Objects/Devices/nuke.yml # Resources/Prototypes/Entities/Objects/Devices/pda.yml # Resources/Prototypes/Entities/Objects/Fun/toys.yml # Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml # Resources/Prototypes/Entities/Objects/Materials/parts.yml # Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml # Resources/Prototypes/Entities/Objects/Misc/implanters.yml # Resources/Prototypes/Entities/Objects/Misc/kudzu.yml # Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml # Resources/Prototypes/Entities/Objects/Shields/shields.yml # Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml # Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml # Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml # Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Structures/Decoration/curtains.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml # Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml # Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml # Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml # Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml # Resources/Prototypes/Entities/Structures/Storage/glass_box.yml # Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml # Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml # Resources/Prototypes/Entities/Structures/Walls/asteroid.yml # Resources/Prototypes/Entities/Structures/Walls/grille.yml # Resources/Prototypes/Entities/Structures/Walls/walls.yml # Resources/Prototypes/Entities/Structures/Windows/window.yml # Resources/Prototypes/Entities/Structures/stairs.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Hydroponics/seeds.yml # Resources/Prototypes/Maps/saltern.yml # Resources/Prototypes/Reagents/biological.yml # Resources/Prototypes/Reagents/fun.yml # Resources/Prototypes/Recipes/Construction/Graphs/utilities/solarpanel.yml # Resources/Prototypes/Recipes/Construction/weapons.yml # Resources/Prototypes/Recipes/Crafting/improvised.yml # Resources/Prototypes/Recipes/Lathes/clothing.yml # Resources/Prototypes/Recipes/Reactions/fun.yml # Resources/Prototypes/Research/arsenal.yml # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml # Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml # Resources/Prototypes/Roles/Jobs/Security/detective.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/departments.yml # Resources/Prototypes/Species/human.yml # Resources/Prototypes/Species/vox.yml # Resources/Prototypes/Stacks/Materials/materials.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/Tiles/plating.yml # Resources/Prototypes/Voice/speech_emote_sounds.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Prototypes/explosion.yml # Resources/Prototypes/game_presets.yml # Resources/Prototypes/lobbyscreens.yml # Resources/Prototypes/secret_weights.yml # Resources/Prototypes/tags.yml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/Textures/Clothing/Belt/emt.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/beret_qm.rsi/meta.json # Resources/Textures/Clothing/Head/Soft/bluesoft_flipped.rsi/meta.json # Resources/Textures/Clothing/Head/Soft/corpsoft_flipped.rsi/meta.json # Resources/Textures/Clothing/Head/Soft/greensoft_flipped.rsi/meta.json # Resources/Textures/Clothing/Head/Soft/greysoft_flipped.rsi/meta.json # Resources/Textures/Clothing/Head/Soft/paramedicsoft_flipped.rsi/meta.json # Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/slayer.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/qmformal.rsi/meta.json # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNESW.png # Resources/Textures/Decals/Overlays/greyscale.rsi/checkerNWSE.png # Resources/Textures/Decals/Overlays/greyscale.rsi/fulltile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/halftile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/quartertile_overlay_90.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_180.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_270.png # Resources/Textures/Decals/Overlays/greyscale.rsi/threequartertile_overlay_90.png # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Interface/emotions.svg.192dpi.png.yml # Resources/Textures/LobbyScreens/dead-in-space.png.yml # Resources/Textures/LobbyScreens/doomed.webp.yml # Resources/Textures/LobbyScreens/pharmacy.png.yml # Resources/Textures/LobbyScreens/pharmacy.webp.yml # Resources/Textures/LobbyScreens/robotics.webp.yml # Resources/Textures/LobbyScreens/supermatter.png.yml # Resources/Textures/LobbyScreens/susstation.png.yml # Resources/Textures/LobbyScreens/warden.png.yml # Resources/Textures/LobbyScreens/warden.webp.yml # Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json # Resources/Textures/Mobs/Effects/brute_damage.rsi/LLeg_Brute_40.png # Resources/Textures/Mobs/Effects/brute_damage.rsi/RLeg_Brute_40.png # Resources/Textures/Objects/Devices/nuke.rsi/meta.json # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_deployed.png # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_exploding.png # Resources/Textures/Objects/Devices/nuke.rsi/nuclearbomb_timing.png # Resources/Textures/Objects/Misc/books.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-lawyer.png # Resources/Textures/Objects/Storage/boxes.rsi/meta.json # Resources/Textures/Objects/Tools/t-ray.rsi/tray-off.png # Resources/Textures/Objects/Tools/t-ray.rsi/tray-on.png # Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/bolt.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/emergency_open_unlit.png # Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi/emergency_open_unlit.png # Resources/Textures/Structures/Doors/Windoors/plasma.rsi/emergency_unlit.png # Resources/Textures/Structures/Doors/Windoors/uranium.rsi/emergency_unlit.png # Resources/Textures/Structures/Power/Generation/Singularity/emitter.rsi/locked.png # Resources/Textures/Tiles/attributions.yml # Resources/Textures/Tiles/shuttleblue.png # Resources/Textures/Tiles/shuttleorange.png # Resources/Textures/Tiles/shuttlepurple.png # Resources/Textures/Tiles/shuttlered.png # Resources/Textures/Tiles/shuttlewhite.png # Resources/Textures/White/Fluff/DOOMMAX/cap_cap.rsi/meta.json # Resources/Textures/White/Fluff/HSKveez/hardsuit.rsi/meta.json # Resources/Textures/White/Fluff/Vtergot/strictgloves.rsi/meta.json # Resources/clientCommandPerms.yml # Resources/migration.yml |
||
Pieter-Jan Briers
|
4ad1e0598b |
Fix missing semicolon after migration. (#26337)
Are you kidding me EFCore doesn't sanitize this itself? |
||
|
Pieter-Jan Briers
|
d776c4b392 |
Improve admin message seen/dismiss state. (#26223)
Fixes #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. |
||
|
Pieter-Jan Briers
|
fc76996dc5 | Fix EFCore obsoletion warnings in Content.Server.Database (#26285) | ||
Cinkafox
|
95054e072a |
Fixes (#73)
* - fix: Genitals sprite shit and meow for tajaran * - add: fart sound if kicked from server * - tweak: vulpies and tajaran now for donaters!!! * - fix: Fart on exit * - add: roleplay think * - fix: database shit and loc * - add: ears for slime * - fix: LOC interaction fix * - add: height setting * - fix: height for felinids * - fix: nigga fix * - fix: no bitches on captain * - fix: interaction panel animation shit |
||
| 614318c0f2 |
Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts: # Content.Client/Humanoid/HumanoidAppearanceSystem.cs # Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs |
|||
Remuchi
|
3515e87f74 |
[Feat] Тонкие спрайты снова в строю (#102)
* Revert "Hair Overhaul (#19298)"
This reverts commit
|
||
|
Remuchi
|
34d4c529fa |
[Upstream] Upstream (#109)
* Automatic changelog update * atlas update (#25071) * atlas update * untroll --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * box update (#25074) * fland update (#25075) * marathon update (#25076) * meta update (#25077) * Syndicate key grammar fix (#25085) * Syndicate encryption key grammar fix An encryption key used by... wait... Who is owner of this chip? > An encryption key used by... wait... Who is the owner of this chip? * Syndicate key grammar fix An encryption key used by... wait... Who is owner of this chip? > An encryption key used by... wait... Who is the owner of this chip? * Fix hybridization seedless probability (#25084) Fix comparison Hybrids (different plants being crossed) are supposed to have a high chance of becoming seedless to balance overpowered plants. However, a logic error in the comparison gave seedless to plants when they were from the same seed (not hybrids) rather than the other way around. Reported by: @genderGeometries * Added Tourniquets to stop bleeds (#23198) * Fixed Error with RobustToolbox Edits. Removed the addition of secbelt tag from assault belt. * Resprite of the monstrosity * Resprite of the tourniquet NO LONGER PHALLUS SHAPED * too bright, now darker and edgier * Tourniquet resprite * metajson yay * Update Skelly Vs The Rev lobby art (#25088) Someone said the original was a bit low res and I agreed. This is a 1440p (from an 8k base image) rendition of the same scene, with a new dramatic forced perspective look, and generally cleaner art throughout. Also now there's two mothroaches. * Automatic changelog update * Minor airlock assembly clean up (#25073) 1 * Update README.md (#25067) * Update README.md * emo review Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * prevent opening debug menus without perms (#25091) prevent people without permissions from opening the tile, entityspawn, or decal menus * Remove battery from crew observation kit, fix description (#25000) -Remove battery from crew observation kit, fix description * Laughin' Peas (#25089) * laughter * make clownmobs bleed laughter * laughin syrup and laughter recipe * add laughin peas * Automatic changelog update * QM drip DLC (#24477) * New Drip for the QM QM beret and QM formal uniform * Asd Asd * Adds the new clothing to the uniform printer what it says on the tin * I always forget to update the copyright RAAAAAH yup * EMT Belt Part 2 (#24289) * add * fix * aaaa * Flipped caps real (#24961) * Flipped caps real * oops * whoops * flip not fold * fix formatting * cargosoft formatting * Automatic changelog update * Nerf Beanbags (#24653) Lowers beanbag damage from 55 stam to 30 stam * Automatic changelog update * Fix screenspace popups (#24987) * Fix screenspace popups Never got around to it earlier but need to draw it above UI controls. * Minor null change * Automatic changelog update * Fix crew manifest department bugs (#24975) * Automatic changelog update * Changed door remote to trigger based on vision occlusion(#25093) Changed door remote to trigger based on vision occlusion rather than opaque collision targeting check. Ian's butt will no longer absorb your 5G signals. Co-authored-by: Plykiya <plykiya@protonmail.com> * GPS In Paramed Locker (#25096) GPS in paramed locker * Remove 'travis scott day' from the game (#25106) * remove travis scott from the game * KILL TRAVIS EVEN MORE * Automatic changelog update * Remove erroneous changelog (#25107) * fixed fland cargo shuttle not having tiny fans (sorry) (#25095) * Glass box for antique laser pistol (#25104) * glassbox * fix * Gibbing refactor (Per-part gibbing and giblet throwing!) (#24989) * Moving Gibbing rework out from medrefactor into it's own PR * Re-enabled warning for missing gibbable on TryGibEntity * Implemented better logic for gibbing failover and better logging * Allowing audio params and drop scattering customization per component. Created UnGibbable organ base types and made brains ungibbable. Removed delete brain from gibBody function. Artifact crusher does not destroy brains anymore. It only destroyed brains before not other organs which was wierd. * Update Content.Shared/Body/Systems/SharedBodySystem.Body.cs Fixing space for multiplication Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Added event raised when attempting to gib contained entities to allow modification of allowed and excluded container ids * removing audioParams var from component (sound specifier includes it) * Fixing signature --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Automatic changelog update * Gibbing contents hotfix (#25114) Fixing gibbing contents not respecting Include/Exclude container lists. This is currently unused * Predict two-way levers (#25043) * Predict two-way levers Annoys me the rare occasions I touch cargo. Doesn't predict the signal but at least the lever responds immediately. * space * a * Replace Romerol with Ambuzol in chemist guidebook (#25108) replace romerol with ambuzol * Fix borgs being able to emag themselves (#24748) * Fix self emagging borgs * Add popup on self emag failure. * Ectoplasm is grindable into Necrosol (#25053) add * Automatic changelog update * Automatic changelog update * Roundstart Food Service research (#25046) add * Automatic changelog update * Add option for character name colors in chat & move coloration to clientside (#24625) * Adds option to disable character names in chat/speechbubbles * Moved the coloring of names to clientside * Move string functions to SharedChatSystem to avoid duplicate code in SpeechBubble.cs * Changed to be put under Accessibility section * Cache CVar * Automatic changelog update * Update Credits (#25115) Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> * Replace fixed drink glasses with metamorphic versions (#25134) * Replaced fixed drink glasses with metamorphic versions * Fine, no milkshake then * ambuzol beef (#25119) * Automatic changelog update * Shuttle floor resprite (#25127) * resprites shuttle tiles * resprites shuttle floor tiles & adds grey/black shuttle tiles * attributions.yml update * Adding a period to an object description (#25138) Added a period to an object description. Adds a period to silk's description. This is my first and last pull request. * Door Remote Changelog Entry (#25144) I'm so dumb. Co-authored-by: Plykiya <plykiya@protonmail.com> * Automatic changelog update * Lowered Ion Storm Reoccurence Delay to 20 (#25135) * Lowered reoccurencedelay to 45 * Lowered Further down to 20 * Re-added shivs to crafting menus (#25094) Added a recipe for crafting menu * Automatic changelog update * Color Tipped Ammo (#25103) * Tipped .35 ammo * used layers instead of new sprites * remove the useless old sprites * changed the green slightly * Automatic changelog update * Add overlay decals for mini tiles and bricks (#24949) Add minitile and brick decals overlay * Update Core (#24862) * add * Update Resources/Textures/Parallaxes/attributions.yml * sprite change * address review --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Buyable Jani Trolley (#25139) Trolley * Added display for amount of hits left in stun batons/stun prods. (#25141) Added display for amount of hits left in stun batons/stunprods. Co-authored-by: Plykiya <plykiya@protonmail.com> * Automatic changelog update * autolatheable air tanks (#25130) * gastankening * fix price * Automatic changelog update * Fix pointing arrow trajectory (#25061) Initial commit * make linking logic gates 1000% better (#25041) * make door status use SendSignal * LastSignals and logic, add ClearSignal api too * make everything outputting a logic signal default to false * refactor ops * :trollface: * :trollface: * protoid for LastSignals * oop --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Buff emergency toolbox fill (#24225) Resolves issue #23059, for which the submitter wrote: Emergency toolboxes contain a crowbar, two flashlights (sometimes one), two breath masks, and two chocolate. With the addition of water bottles to survival boxes and emergency nitrogen tanks, I think emergency toolboxes should be updated to include said water bottles and emergency tanks. Would make these just a little bit more useful. It feels weird they don't have oxygen tanks when they have two breath masks, and since water bottles are now commonplace it would be a good idea to put them in a place where emergency food is stored as well. * Void jetpack resprite (#25150) add * Automatic changelog update * Allow configuring gen_build_info.py through environment variables (#25162) This makes the life of forks slightly easier by letting you pass an environment variable instead of having to maintain this file yourself. * Significantly nerf Deathnettles (#25068) * Balancing my beloved Significantly nerfs deathnettles so botanists can't just take down jug's like it's no issue, we have guns, we should be using them * Additional Balancing Changes. * Losing my mind * Automatic changelog update * Fix spelling errors in mechs.yml (#25168) * fix showhealthbars perms (#25157) * Allow inspecting ID's and Health of people behind glass (#25163) Hops will love me * Automatic changelog update * Fix decal error spam (#25172) * Restore MonoOverlay (#25170) https://github.com/space-wizards/space-station-14/pull/24949 nuked it. * Automatic changelog update * Added "wink" and "tearfully smiles" emotes + more cry emote variations (#25129) Added wink and tearfully smiles emote + more cries variations * Automatic changelog update * Update submodule to 210.0.0 (#25175) * Update submodule to 210.0.0 * 210.0.1 instead, the previous one was broken * 210.0.3 instead, the previous one was ALSO broken --------- Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> * The medical beret is real (#25176) * 1 * 2 * button is real. * Automatic changelog update * Fixed Tipped ammo not being Spent (#25167) Fix Tipped Ammo not being Spent * Automatic changelog update * Hoods and some chaplain's hats now hides hair (#25142) * Hoods now hide hair * additional plague hat and witch hat now hide hair * fixing some tags in hats * hoods tag fix * Glassbox shatter resprite (#25136) * Automatic changelog update * Random spontaneous cleanup PR (#25131) * Use new Subs.CVar helper Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe. This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown. * Fix a bunch of warnings * More warning fixes * Use new DateTime serializer to get rid of ISerializationHooks in changelog code. * Get rid of some more ISerializationHooks for enums * And a little more * Apply suggestions from code review Co-authored-by: 0x6273 <0x40@keemail.me> --------- Co-authored-by: 0x6273 <0x40@keemail.me> * Decrease the chemical cost of regen mesh and sutures and move them to their own file (#24948) * WHYWEREMEDSINMEALRECIPES * 20chem * didiforgettosavethis * Split slime marking leg gradient (#24928) * Split slime marking leg gradient * up markings to 4 * Automatic changelog update * Require plants to be harvestable before sampling (#24851) * Add verbs to Open/Close Openable containers, and add optional seals (#24780) * Implement closing; add open/close verbs * Add breakable seals * Allow custom verb names; make condiment bottles closeable * Remove pointless VV annotations and false defaults * Split Sealable off into a new component * Should have a Closed event too * Oh hey, there are icons I could use * Ternary operator * Add support for seal visualizers * Moved Sealable to Shared, added networking * Replaced bottle_close1.ogg * Automatic changelog update * Shadow anomaly returns (#24629) * content * add cat * ambient * I FORGOT HEARTS! * fix ambient * some fixes * canCollide: false * connect to damageable * pi * remove fx * some fixes * *sad bruh* * hazed * Update base_shadow.yml * Automatic changelog update * Microwave UX enhancements (#24547) * Facelift Microwave UI Includes new background light in UI, Uses predictive input, UI now properly disables buttons when microwave is active * Microwave now shows Elapsed time * Fixed bad formatting * Added new term for "BottomMargin" * Change yellow color * Update StyleNano.cs just spacing fixed * Cook time countdown now detached from server Instead of the server constantly sending out messages for the cook countdown, it is now predicted client side using TimeSpan * Update MicrowaveMenu.xaml forgot to re-add item space * Automatic changelog update * Additional damage visualisers (#24618) * brute * add * Anomaly Synchronizer + Signallers tweaks (#24461) * content * nerf * fix rsi * Automatic changelog update * saltern update (#25182) Co-authored-by: deltanedas <@deltanedas:kde.org> * Allow players to run saveconfig command. (#25200) Benign client-side command. * Revert "Allow configuring gen_build_info.py through environment variables" (#25201) Revert "Allow configuring gen_build_info.py through environment variables (#2…" This reverts commit |
||
|
Pieter-Jan Briers
|
b1de6dd601 |
Switch project files to C# 12. (#25487)
Just unlocks new language features like primary constructors. |
||
|
Pieter-Jan Briers
|
2e6eaa45c5 |
Fix admin notes and database time nonsense. (#25280)
God bloody christ. There's like three layers of shit here. So firstly, apparently we were still using Npgsql.EnableLegacyTimestampBehavior. This means that time values (which are stored UTC in the database) were converted to local time when read out. This meant they were passed around as kind Local to clients (instead of UTC in the case of SQLite). That's easy enough to fix just turn off the flag and fix the couple spots we're passing a local DateTime ez. Oh but it turns out there's a DIFFERENT problem with SQLite: See SQLite we definitely store the DateTimes as UTC, but when Microsoft.Data.Sqlite reads them it reads them as Kind Unspecified instead of Utc. Why are these so bad? Because the admin notes system passes DateTime instances from EF Core straight to the rest of the game code. And that means it's a PAIN IN THE ASS to run the necessary conversions to fix the DateTime instances. GOD DAMNIT now I have to make a whole new set of "Record" entities so we avoid leaking the EF Core model entities. WAAAAAAA. Fixes #19897 |
||
| c3e8e64fb8 | - add: database for genitals | |||
Valtos
|
eb6149f508 |
- fix: Fixed fucked DB migrations (maybe?) (#41)
* HZ MB FIX DB * real fix |
||
|
Aviu00
|
22db173b81 | Merge branch 'final-version' into upupup | ||
Krunklehorn
|
ed0f2aa221 |
Client customization late-join spawner priority for arrivals/cryostorage (#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 <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> |
||
rhailrake
|
6e198dc038 | unfuck database | ||
|
Aviu00
|
d3cd3c430a | Upstream upstream | ||
HitPanda
|
7c9bd1d934 |
[Feat] Респект и уважуха (#476)
* db * wd comment * manager & commands * system & round end results * raise ban event * client manager & cached values * role pick tweak * tweak last commit * more fixes * weights fix * Fix for short rounds * tweak in cached dictionary * reva pick system * fix last commit * cult role pick * nukeops role picking * fix cache in async & show command * ooc msg show value * move pick method to manager & traitor pick fix |
||
|
rhailrake
|
d19d3b6fac | [add] db shit | ||
|
rhailrake
|
68e52f60c9 | [feat] Custom name for clown, mime and borgs | ||
|
Pieter-Jan Briers
|
a6c9c36b68 |
Dependency update / fixes / skrungle bungle (#23745)
* Give .props files 2-space indents.
* Move to Central Package Management.
Allows us to store NuGet package versions all in one place. Yay!
* Update NuGet packages and fix code for changes.
Notable:
Changes to ILVerify.
Npgsql doesn't need hacks for inet anymore, now we need hacks to make the old code work with this new reality.
NUnit's analyzers are already complaining and I didn't even update it to 4.x yet.
TerraFX changed to GetLastSystemError so error handling had to be changed.
Buncha APIs have more NRT annotations.
* Remove dotnet-eng NuGet package source.
I genuinely don't know what this was for, and Central Package Management starts throwing warnings about it, so YEET.
* Remove Robust.Physics project.
Never used.
* Remove erroneous NVorbis reference.
Should be VorbisPizza and otherwise wasn't used.
* Sandbox fixes
* Remove unused unit test package references.
Castle.Core and NUnit.ConsoleRunner.
* Update NUnit to 4.0.1
This requires replacing all the old assertion methods because they removed them 🥲
* Oh so that's what dotnet-eng was used for. Yeah ok that makes sense.
* Add Robust.Analyzers.Test
* Update submodule
* commit to re-run CI
|
||
|
rhailrake
|
977e075086 |
[feat] Разделение банов по серверам.
# Conflicts: # Content.Client/Administration/UI/BanList/BanListLine.xaml.cs # Content.Client/Administration/UI/BanList/Bans/BanListHeader.xaml # Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml # Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml # Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs # Content.IntegrationTests/Tests/Commands/PardonCommand.cs # Content.Server/Administration/Commands/BanCommand.cs # Content.Server/Administration/Commands/DepartmentBanCommand.cs # Content.Server/Administration/Commands/RoleBanCommand.cs # Content.Server/Administration/Managers/RoleBanManager.cs # Content.Server/Database/ServerDbManager.cs # Content.Server/Database/ServerDbPostgres.cs # Content.Server/Database/ServerDbSqlite.cs |
||
|
Pieter-Jan Briers
|
a39999fb9c |
Fix admin log key order. (#23052)
The keys for admin logs were set as (log_id, round_id). This made no sense because logs are usually accessed per round. |
||
|
rhailrake
|
ea4f7595a2 |
[feat] TTS
# Conflicts: # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Server/Database/ServerDbBase.cs # Content.Server/Entry/EntryPoint.cs # Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs # Content.Server/IoC/ServerContentIoC.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Mobs/Species/base.yml |
||
|
Pieter-Jan Briers
|
b4f8393f42 | Log server ID in connection logs table (#21911) | ||
DrSmugleaf
|
0e0ac5fcc5 | Drop admin log entity db table (#21216) | ||
|
DrSmugleaf
|
52e1d64ee2 | Stop all reads/writes to the admin_log_entity table (#21186) | ||
|
DrSmugleaf
|
43d5c00648 | Store round start date in the database (#21153) | ||
|
Pieter-Jan Briers
|
7c9d7423d2 | Remove autogenerated from admin log key. (#18377) | ||
|
Pieter-Jan Briers
|
e0c4884995 | GDPR stuff update (#18300) | ||
|
Pieter-Jan Briers
|
b4b0fe41db | Admin notes bugfixes (#18189) | ||
Riggle
|
579913b617 |
Better notes and bans (#14228)
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> |
||
Chief-Engineer
|
5eba1d230a | Add IP ban exemption flag (#15815) | ||
|
Pieter-Jan Briers
|
c8e90e561b | Server ban exemption system (#15076) | ||
|
Pieter-Jan Briers
|
360a507688 | Shared interfaces for server and role ban entities (#14730) | ||
|
Pieter-Jan Briers
|
c5b3f62f6f | Update project files for configuration changes. (#14281) | ||
|
Pieter-Jan Briers
|
220b19f5ca | Rename migrations to fix CS8981 warnings. (#14160) | ||
|
DrSmugleaf
|
cd803a82bd | Update projects to C# 11 (#13111) | ||
Visne
|
4cc5fa239e | Implement traits system (#10693) | ||
|
Pieter-Jan Briers
|
e852ada6c8 |
Play time tracking: Job timers 3: more titles: when the (#9978)
Co-authored-by: Veritius <veritiusgaming@gmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> |
||
Moony
|
8e90bf46e9 |
Implements panic bunkering. (#9315)
* Implements panic bunkering. Helps with raid management, esp with unknown accounts. * adds an enable/disable command. |
||
wrexbe
|
0fc8c0ef5e | Update some nugets (#8738) | ||
Veritius
|
3b7e202044 | Flavor text (#8070) | ||
|
wrexbe
|
bc68ac96dd | Cleanup the namespaces (#8132) | ||
Julian Giebel
|
288f66d8c4 | Implement count estimate query for postgresdb (#7956) |
