[Resprite] Hardsuits #1620
Merged
[Resprite] Hardsuits #1620
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/equipped-OUTERCLOTHING-digi.png # Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/equipped-OUTERCLOTHING-digi.png # Resources/Textures/Clothing/OuterClothing/Suits/eva_prisoner.rsi/equipped-OUTERCLOTHING-digi.png # Secrets
github-actions
bot
added
Changes: Sprites
|
RSI Diff Bot; head commit 43f9012 merging into 79ed21c Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi
Resources/Textures/Clothing/Head/Hardsuits/brigmedic.rsi
Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi
Resources/Textures/Clothing/Head/Hardsuits/cburn.rsi
Resources/Textures/Clothing/Head/Hardsuits/clown.rsi
Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi
Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi
Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi
Resources/Textures/Clothing/Head/Hardsuits/medical.rsi
Resources/Textures/Clothing/Head/Hardsuits/rd.rsi
Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi
Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi
Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi
Resources/Textures/Clothing/Head/Hardsuits/security.rsi
Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi
Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi
Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/brigmedic.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/cburn.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/clown.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/luxury.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/piratecaptain.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/rd.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/cybersun.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/pirateeva.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/syndiecommander.rsi
Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi
|
|
они ну слишком мультяшные |
|
Возможно будет минус клоунского скафандра из-за того, что волосы маски будут вылазить из головы скафандра. |
|
Инженерные красавчики |
|
Это разве не спрайты с ТГ? Зачем перетаскивать оттуда все? |
|
Красиво. Было бы неплохо заменить корваксовский ЕРТ Тг-шным ЕРТ, раз уж ты СБЁРН решил заменить. Что насчет нюкеров? Их тоже лучше бы заменить на спрайты Ацлана и Виро |
|
Скаф вардена выглядит даже как-то не смешно. Перекрась хотя бы, а то багровый синдовский цвет на шлеме абсолютно не сочитается с СБ-шным красным. Тоже самое про контуры -- Их тоже надобно перекрасить в сб-шные цвета. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
# Conflicts: # Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml # Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png # Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png # Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
Ko4ergaPunk
added a commit
to Ko4ergaPunk/space-station-14
that referenced
this pull request
Jan 2, 2024
commit 7f433836bd80b594715aed907a03f81a0792fe5d Author: poeMota <[email protected]> Date: Sat Dec 30 20:14:23 2023 +0300 lil Delta update (#1703) Co-authored-by: poeMota <[email protected]> commit 277e33fe202dfd97b76376713cb787ba25b928cf Author: lzk <[email protected]> Date: Sat Dec 30 18:12:41 2023 +0100 Translate Upstream #1696 (#1701) Co-authored-by: lapatison <[email protected]> commit e4d82af829247bc4c28790c2730285b10d4d9880 Author: mhamster <[email protected]> Date: Sat Dec 30 17:44:06 2023 +0700 [Wiki] Grindable recipes json generator fix (#1702) commit 8e958c25bb77f3d0d7a937761cff39f74d77febc Author: Morb0 <[email protected]> Date: Sat Dec 30 00:20:13 2023 +0300 Update locale commit 46b6e11b7f0bc0053f3c1281bfcfdbf222ac2a7a Merge: c8a4362960 6feb91d8f8 Author: Morb <[email protected]> Date: Fri Dec 29 19:53:25 2023 +0300 Merge pull request #1696 from space-syndicate/upstream-sync Upstream sync commit c8a43629604a25a6d102b7ebc990a2d3840eafc8 Author: Jerry <[email protected]> Date: Fri Dec 29 20:29:58 2023 +0600 More lobby arts (#1697) commit 6feb91d8f82df646d4c1c0a8df5fb6418a726eb7 Author: Morb0 <[email protected]> Date: Fri Dec 29 17:23:31 2023 +0300 Comment recipe entry in guide generator commit 94f6257de1f64db8b86280faa98bc1e0c79b082e Author: Morb0 <[email protected]> Date: Fri Dec 29 17:23:07 2023 +0300 Fix stamps commit 69a515b802489c7467ec43ea50f3209ecce60046 Author: Morb0 <[email protected]> Date: Fri Dec 29 16:59:54 2023 +0300 Fix TTS volume is same check commit 8ba54ec46677f2d9dd43a809bae2b0bbbcf1dbc8 Merge: 6f2402f4f8 d23c8d5c19 Author: Morb0 <[email protected]> Date: Fri Dec 29 16:58:52 2023 +0300 Merge remote-tracking branch 'upstream/master' into upstream-sync # Conflicts: # Content.Client/Audio/ContentAudioSystem.cs # Content.Client/Options/UI/Tabs/AudioTab.xaml # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs # Resources/Prototypes/Datasets/ion_storm.yml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png commit 6f2402f4f844dc83312400be12e7511a3d9a0142 Author: Morb <[email protected]> Date: Fri Dec 29 16:46:01 2023 +0300 [Resprite] Centcom airlock (#1695) commit 373c675b3e77ff32b74d3d0d91e961a7585d429c Author: Ed <[email protected]> Date: Fri Dec 29 16:45:50 2023 +0300 Outpost update (#1692) commit fdebe2e8a48c2df4daab94be245cbeff13ae1024 Author: lzk <[email protected]> Date: Fri Dec 29 14:45:28 2023 +0100 Bounties, antags general, minor antags guidebook translate (#1677) commit 60e95c310badb2bf60c0ded87fa40e6bb9e72aea Author: AwareFoxy <[email protected]> Date: Fri Dec 29 16:36:14 2023 +0300 Translate ninja guidbook (#1684) commit b9c4920dd9310a3477d15b2849f71df66769094d Author: lapatison <[email protected]> Date: Fri Dec 29 16:17:18 2023 +0300 Translation fixes (#1691) commit ac93936bf8eef2fcff2cbcbc3c313b5f521a78fe Author: lzk <[email protected]> Date: Fri Dec 29 14:13:00 2023 +0100 Botany, survival, cyborgs guidebook translate (#1675) commit d23c8d5c19e56a582b6b12f832bd318efbdac7c7 Author: TemporalOroboros <[email protected]> Date: Fri Dec 29 04:47:43 2023 -0800 Revert 'Revert 'Solution Entities'' (#23168) commit 93e1af2f8d7c20fdcab3d0619be0ea57cc9fb09f Author: metalgearsloth <[email protected]> Date: Fri Dec 29 16:17:55 2023 +1100 Add click sound to verb execution (#23162) IDK how I didn't notice this before. commit bff7decef970daf5ebe71a566ed7662303830084 Author: PJBot <[email protected]> Date: Fri Dec 29 04:44:42 2023 +0000 Automatic changelog update commit 4023134cf0536d36dd1d685189e8b1ee6c004d81 Author: metalgearsloth <[email protected]> Date: Fri Dec 29 15:43:36 2023 +1100 Add UI click sounds (#22410) * Add UI click sounds * tweaks * Significant cleanup * Audio options and numerous fixes * Fix the remaining UI elements * new click sound --------- Co-authored-by: Kara <[email protected]> commit 5f7e92a2d75a37308d34719a25f77ed1ac5fdf83 Author: metalgearsloth <[email protected]> Date: Fri Dec 29 14:54:04 2023 +1100 Update submodule to 198.0.1 (#23157) commit b73753b3e26e7ab6c9c57cf04727adbf0496cb6d Author: deltanedas <[email protected]> Date: Fri Dec 29 03:49:20 2023 +0000 atlas beacons (#23159) Co-authored-by: deltanedas <@deltanedas:kde.org> commit 938d6d9945d853cd0f0a24c8d484b8824705c773 Author: Emisse <[email protected]> Date: Thu Dec 28 20:45:42 2023 -0700 Revert "Solution Entities" (#23160) Revert "Solution Entities (#21916)" This reverts commit d75e743dd7d88f530a52425e078f9b92d09186db. commit c2c76c2035b2da8cf6aa4948a44aeac123a2588b Author: Leon Friedrich <[email protected]> Date: Thu Dec 28 22:23:41 2023 -0500 Try fix random explosion test failures (#23158) commit 4bc97c9594cfab422e09020c955e8691f74edef2 Author: PJBot <[email protected]> Date: Fri Dec 29 03:09:18 2023 +0000 Automatic changelog update commit 56884fd72df6ae88aca892e68dcd9829766864b7 Author: Ubaser <[email protected]> Date: Fri Dec 29 14:08:07 2023 +1100 Science magboots (#23107) * add * uhhh * fix RSI * lathe * fix commit 608442d9f8e4bfd0e02a35a7ba3dc0b433618d78 Author: Nemanja <[email protected]> Date: Thu Dec 28 21:41:15 2023 -0500 missing station beacons (#23150) commit e6042b88817e39e99970d2c0fe8cb938a3197c39 Author: Emisse <[email protected]> Date: Thu Dec 28 19:41:02 2023 -0700 reach (#23156) commit 42dee541397f776186c011107906391e1d66b04b Author: deltanedas <[email protected]> Date: Fri Dec 29 02:35:31 2023 +0000 saltern beacons (#23140) * saltern beacons * tesla parts --------- Co-authored-by: deltanedas <@deltanedas:kde.org> commit ee73497ff1d20a89f7bfd4de78cadc94945fac1a Author: Emisse <[email protected]> Date: Thu Dec 28 19:35:23 2023 -0700 packed update (#23155) commit a6423664a74f84828f90740ffda1674d9aa41e66 Author: Emisse <[email protected]> Date: Thu Dec 28 19:35:13 2023 -0700 omega update (#23154) commit 09f571c6c422bc4285f1466a559a7520821a3cdc Author: Emisse <[email protected]> Date: Thu Dec 28 19:35:06 2023 -0700 meta update (#23153) commit a20c110e59b0f12945f92dfe952166d535b36df0 Author: Emisse <[email protected]> Date: Thu Dec 28 19:34:59 2023 -0700 marathon update (#23149) commit 7665d336eede45c8b6af8c315cac14c65f7850d5 Author: Emisse <[email protected]> Date: Thu Dec 28 19:34:52 2023 -0700 fland update (#23147) commit 86fb1b4e2d5c2dd60da85bc4e48f2d13eddcf47f Author: Emisse <[email protected]> Date: Thu Dec 28 19:34:44 2023 -0700 cluster update (#23146) commit 66b807668c7a0ea7c9a9591aec959b876c4e7443 Author: Emisse <[email protected]> Date: Thu Dec 28 19:34:37 2023 -0700 box update (#23145) * box update * telescreens commit aecc4f9602244ab9be677b974405400853c0de9d Author: Emisse <[email protected]> Date: Thu Dec 28 19:34:29 2023 -0700 barratry update (#23144) commit 536dd6cf297faba3845dc5439ec3a4c6f9b0fd4e Author: Emisse <[email protected]> Date: Thu Dec 28 19:34:15 2023 -0700 bagel update (#23141) * bagel update * telescreens commit 1e0803dd337f421886c1cade4b041eb66324a1e3 Author: Emisse <[email protected]> Date: Thu Dec 28 19:34:06 2023 -0700 aspid update (#23143) commit d75e743dd7d88f530a52425e078f9b92d09186db Author: TemporalOroboros <[email protected]> Date: Thu Dec 28 17:58:14 2023 -0800 Solution Entities (#21916) * Creates Content.Shared.Chemistry.Solutions Copies Solution class to new namespace Obsoletes old Solution class * Switches over to the Solutions.Solution Solution * Creates Content.Shared.Chemistry.Containers Copies relevant components/systems to the new namespace Obsoletes old versions * Switches over to the Containers.XYZ namespace * Creates SolutionSystem and obsoletes old SolutionContainerSystem methods * Start using SolutionSystem for Solution manipulation * EnumerateSolutions * Move TryGetMixableSolution * Move EnsureSolution to Server * Create Solution Entities * Stop using obsolete solution system methods * Fix prototype component tests * Add using ..Audio.Systems; back * Wrap solution container slots in ContainerSlots * Actually add the slot to the solution container map * Dirty SolutionContainerComponent when ensuring solutions * Revert namespace changes * Remerge SolutionSystem and SolutionContainerSystem * SolutionContainerManagerComponent refactor * Avoid wrapping necessary code in DebugTools.Assert as it is removed when compiling for release * Readd examine reagent sorting * Fix errors * Poke tests * Fix solution names not being applied * Fix WoolyComponent including statement * Fix merge skew * Fix compile errors * Make reactions use solntities * Reindent solution class namespace * Field attribute changes * AutoGenerateComponentState for SolutionContainerComponent * SolutionContainerComponent -> ContainedSolutionComponent * ref ReactionAttemptEvent * Denetwork preinit solutions * Misc 1 * Nullable TryGetSolution out vars * Cache associated solutions * Fix merge skew * Use explicit regions in SharedSolutionContainerSystem.Capabilities * Add debug assert * Use explicit regions in SharedSolutionContainerSystem.Relay + ref SolutionContainerChangedEvent * ContainedSolutionComponent.Name -> ContainedSolutionComponent.ContainerName * SolutionComponent doc comments * Implicit DataField names and property purge * ReagentEffect DataField names * Local variables for readability * Sort using statements + Entity<T> event handlers * Fix compile erros * Fix compile errors --------- Co-authored-by: ElectroJr <[email protected]> commit a4d36d408dcd3fa867d9254f734ca95a54a0e9a3 Author: Nemanja <[email protected]> Date: Thu Dec 28 20:46:51 2023 -0500 Better hover coloring for inventory (#23148) commit 345b0e6305c8deca327893cbe37b29576e6dcac8 Author: Tomás Alves <[email protected]> Date: Fri Dec 29 01:38:08 2023 +0000 Fix: Blindness radius when zooming (#23130) * Fix Zoom while Blind * Fix Zoom while Blind (ContentEyeComponent->EyeComponent) commit d167043349639a4d6d26594387db4789e997d750 Author: PJBot <[email protected]> Date: Fri Dec 29 01:00:28 2023 +0000 Automatic changelog update commit c5b7a74919ee741aa694e25b486122a2f6a26af8 Author: themias <[email protected]> Date: Thu Dec 28 19:59:23 2023 -0500 Fix toy sword (#23137) commit 93391f3e5792880b217eed2a4c4f2c5deeb9030c Author: PJBot <[email protected]> Date: Fri Dec 29 00:46:15 2023 +0000 Automatic changelog update commit 03ec7bac6700209b90075a247a23c01dab34ee7b Author: lzk <[email protected]> Date: Fri Dec 29 01:45:10 2023 +0100 Make directional barricade constructable (#22988) main comit commit a4dd4828cf585a5534c7ecc86aeb43484c924d00 Author: AJCM-git <[email protected]> Date: Thu Dec 28 20:32:46 2023 -0400 Access logs tweaks and fixes (#23096) * Fix AccessRecord not serializing correctly on map saves * record struct my beloved * Final tweaks * pro * This is no longer necessary commit 6699059da1efc28bf63bc6d3ff43e023159fdbf4 Author: PJBot <[email protected]> Date: Fri Dec 29 00:03:26 2023 +0000 Automatic changelog update commit 99d78c4b97aff1a5a0dad6804bac00d4bc425e1f Author: Nemanja <[email protected]> Date: Thu Dec 28 19:02:21 2023 -0500 Station beacons (#23136) * Station beacons * crate * remove navmap from warp points * ack * oh damn * okay emisser commit aa8861ab004291035fe91d55b05b96fc87594e1d Author: Alzore <[email protected]> Date: Thu Dec 28 17:53:25 2023 -0600 Meatball Salvage (#23127) * SpaceproofMeat * Meatball * M commit 0d5ef4e9085613a6bad0e380fb84d46bd306e737 Author: PJBot <[email protected]> Date: Thu Dec 28 23:51:31 2023 +0000 Automatic changelog update commit b7decfe9ee9083a50a639c31624c3d04540b002e Author: Ed <[email protected]> Date: Fri Dec 29 02:50:25 2023 +0300 Add Thiefs to NukeOps (#23102) Update roundstart.yml commit 526b966f090f221010b08e36f375629ac7bf24de Author: Nemanja <[email protected]> Date: Thu Dec 28 18:50:08 2023 -0500 Fix zipties/makeshift cuffs dropping multiple broken entities on removal (#23095) commit 194e9e790f75769cf86487b2b0c47c937e4fb8d6 Author: brainfood1183 <[email protected]> Date: Thu Dec 28 23:48:55 2023 +0000 Origin Station Update (remove christmas) (#23120) commit 042330c9984ad199dc69e01563401f8cfc7661cc Author: Ubaser <[email protected]> Date: Fri Dec 29 10:47:35 2023 +1100 Update Core (#23111) update commit 2fe1164a03c212095aa383461335b016f9d7fb47 Author: qwerltaz <[email protected]> Date: Fri Dec 29 00:28:15 2023 +0100 flammable entities hotfix (#23113) * flammable fix * move air check and ignition to if statement commit 974d0ed6e72d292610d853dfde26c69ddf023286 Author: Flareguy <[email protected]> Date: Thu Dec 28 13:42:44 2023 -0600 Fixes the glass damage overlay (#23128) * fixes the glass damage overlay * fix diagonal window commit ff77e830d320592e99db93c6ea4f7f9b0fbd1fd8 Author: Dakamakat <[email protected]> Date: Thu Dec 28 20:16:04 2023 +0300 Fix Admin-spawned Nukies not counting as dead (#23103) fix(NukeopsRuleSystem): admin created nukeops not count as dead commit 33ccd5cc932c687c7ea3fa2e19fcd33e3302c790 Author: Flareguy <[email protected]> Date: Thu Dec 28 11:11:31 2023 -0600 Fxes airlock assembly sprites (#23115) fixes airlock assembly sprites commit 89ccd6aaba743121c779604029f53c770e7805f8 Author: Whisper <[email protected]> Date: Thu Dec 28 11:54:09 2023 -0500 remove unsafe presents from present tree. (#23118) commit a7791dd5617b8f42a03de01d34156beb0f82d91b Author: PJBot <[email protected]> Date: Thu Dec 28 13:12:56 2023 +0000 Automatic changelog update commit 88d7cfb4c035a5a5c2c3e7fc643b9a0d4ad18f5f Author: Ed <[email protected]> Date: Thu Dec 28 16:11:50 2023 +0300 Tesla (#21124) * upload all textures finished easiest part - TeslaGenerator * Added Tesla energy logic * add lightning pulse priority * work * optimise lightning arc system * now tesla moving to LightningTarget entity and consume it * some audio work add airlock and computers to the LightningTarget * add nice visual and explosions add crashing to game * rsi meta fix * disabling explosions (crashing server) I'll get back to that problem later. * adding important admin logging * a little bit of cleaning and documentation * Persistent attempts to fix the server crashing on explosions. Accidental cleaning of everything I see. * now the tesla incinerates everything it touches except the containment field. * colliders work * fix falling tesla on ground after being exploded * add consume sound, add spawn and collapses sound * added TeslaGenerator to cargo trading console * add all tesla part to cargo trading console * Tesla coils: Turn on and off, get energy from lightning, give energy to the grid. * tesla coil is ready * tesla grounding rod is ready * clean up * clean up 2 * grounding rods now working without power * add LightningResistance parameter for LightningTarget Component * add chaotic teleport * eletrocution remove? * deltanedas fix pack * more fixes * FIXES * FIIIXEEES * The "Grounding Rod" component is removed, and replaced with "LightiningSparking", which is responsible for changing the visuals when hit by lightning. Duplicate code from the coil is removed. * ops * fix * nah, is escaped anyway * increase tesla collider size * keron bb * try fix test? * fix * bruh * check turn off sus comp * prototype cleaning * FIIX * return and fix sus component * fix tesla eating lightnings, now mini tesla is electrocuted * commented some issues * remove linq sorting fix jumping system minor fixes * fix second Linq * fix tesla colliders! Yeah, it works * fix componentregistration * Just retests * not fix * FIX TESLA * fixes * store targets * back * make dictionary of hashsets * some sloth fixes * stump * playtest balance energy generation, return to unpotimized (but working) lightning shoot * parity * work on * some new fix, some new bug (chasingComponent not chasing) * comment * fix ChasingWalkSystem * fix collider tesla problem * revert old unoptimized shoot lightning * new fix pack --------- Co-authored-by: metalgearsloth <[email protected]> commit 06719a3232950cf6d5e69d0390c4d70e99c0a08d Author: Emisse <[email protected]> Date: Thu Dec 28 00:35:04 2023 -0700 meta update (#23101) commit 99cc7f1c2c0e01ffe3a507a3732e8185f9741e96 Author: Emisse <[email protected]> Date: Thu Dec 28 00:08:44 2023 -0700 centcomm update (#23098) * centcomm update * real commit fc7249550a48bc915807eb4f639b334ce099c80f Author: Emisse <[email protected]> Date: Thu Dec 28 00:08:19 2023 -0700 nukieplanet update (#23099) * nukieplanet update * tree kill commit 019db5a20be0dfeb195c092444b745bb34654279 Author: PJBot <[email protected]> Date: Thu Dec 28 05:34:00 2023 +0000 Automatic changelog update commit d78e6cc818d6427d571ff880fb704e8ee8bff881 Author: Ubaser <[email protected]> Date: Thu Dec 28 16:32:55 2023 +1100 Kobold Monkeys (#22108) * add * fix maybe * clean up yaml * clean up more yaml maybe * dash * second dash * aahhh handcuffss * balancing(?) * sprite and desc change commit 7a77d6d5dd73a34be238fdebc284da5bc2917c67 Author: TemporalOroboros <[email protected]> Date: Wed Dec 27 21:30:03 2023 -0800 Content ecs containers (#22484) commit 1d065394327fa8a549d3f30cb4e1a9aae5887180 Author: Dakamakat <[email protected]> Date: Thu Dec 28 06:34:32 2023 +0300 Change id insertion sound (#23007) * feat(id audio): add id insertion sound * feat(pda): change id insertion sound * feat(minor): change filename * feat(attributions): update license commit 3dde45f9d9a56bcde7875af64dbcef28cdf5cc12 Author: PJBot <[email protected]> Date: Thu Dec 28 03:12:18 2023 +0000 Automatic changelog update commit 9bd03824ac863cb4d87bfc984dcc163b84926649 Author: Nemanja <[email protected]> Date: Wed Dec 27 22:11:13 2023 -0500 GORILLA Gauntlets (#23012) * GORILLA gauntlets * oh shit this too commit f2379040f2607fa4e68b6d56820f76620e792476 Author: PJBot <[email protected]> Date: Thu Dec 28 03:10:10 2023 +0000 Automatic changelog update commit f16f826589a94e02ac72987552dbbafd2888487b Author: Dvir <[email protected]> Date: Thu Dec 28 05:09:51 2023 +0200 Suffix Fix (#23050) commit 3e08fe07cd4eae61b6518660ec466b8015db799e Author: Nemanja <[email protected]> Date: Wed Dec 27 22:09:05 2023 -0500 clerical error station event (#23091) commit 28b825d898361b06fc3a942209c0b93d8c2eced0 Author: Stanislav4ix <[email protected]> Date: Thu Dec 28 04:08:30 2023 +0100 Added disabler SMG! (#23051) * Added disabler SMG! * Changed a few errors * errors.. again * Update battery_guns.yml * Update security.yml * Update lathe.yml * Update security.yml commit 62a6a03cd1f341bb975729e3c4bda6b22a9604b3 Author: deltanedas <[email protected]> Date: Thu Dec 28 03:06:45 2023 +0000 allow crusher suicide (#22987) Co-authored-by: deltanedas <@deltanedas:kde.org> commit a0f9e159130fa031cf9e7b2cc093b44ec2e51c11 Author: PJBot <[email protected]> Date: Thu Dec 28 03:06:09 2023 +0000 Automatic changelog update commit 3f9102839579506e8bf71f5fbf48c92328104e58 Author: qwerltaz <[email protected]> Date: Thu Dec 28 04:05:50 2023 +0100 Fix flammables air ignition (#23063) * Fix welder ignition * fix mobs on fire hotspot expose frequency * fix shotgun pellets ignition * ensure ignitionComp on flammable init * \n * Revert "ensure ignitionComp on flammable init" This reverts commit 6915dcdc commit c138809ba98abbc7dd549786abd573e4ec428846 Author: Alekshhh <[email protected]> Date: Thu Dec 28 05:05:04 2023 +0200 Wall Locker Tweaks (#23060) locker commit abdfc6de95a10a2b3d32efda94a51f586abf0e5a Author: PJBot <[email protected]> Date: Thu Dec 28 03:04:05 2023 +0000 Automatic changelog update commit f8a258f0cc31c7ecc72944282ae0f92f8714d32c Author: Emisse <[email protected]> Date: Wed Dec 27 20:03:55 2023 -0700 change morty to old sprite (#23071) webedit commit 880ca0af509fae208e3cf4f61d4615d1a1476e9c Author: Emisse <[email protected]> Date: Wed Dec 27 20:03:00 2023 -0700 remove ion storm announcement (#23045) real commit 48aecc2e38e121fd506feaf8b3f2cc4e6d5abf90 Author: Emisse <[email protected]> Date: Wed Dec 27 20:01:07 2023 -0700 packed update (#23092) commit a8eb03e27bd58769f5d7ef328615be62171f7352 Author: PJBot <[email protected]> Date: Thu Dec 28 03:00:24 2023 +0000 Automatic changelog update commit ff75b1be56e0e4e4c24dc9c07bbe9fa067fe21f4 Author: Velcroboy <[email protected]> Date: Wed Dec 27 20:59:14 2023 -0600 Salami does melee dmg (#23041) * Add melee dmg to salami * Bump up dmg to 6, 1 more than a punch * Add in-hand and wielded sprites, and adjust swing angle --------- Co-authored-by: Jeff <[email protected]> commit cc5f8990e3295c5895b9953fe9199595651dc438 Author: deltanedas <[email protected]> Date: Thu Dec 28 02:53:48 2023 +0000 atlas update (#23088) Co-authored-by: deltanedas <@deltanedas:kde.org> commit 3c165ffdbfef9480da37afe980804a73c8286e18 Author: Emisse <[email protected]> Date: Wed Dec 27 19:52:00 2023 -0700 omega update (#23090) commit 61ad747e771938c3caf2dc482cb01d5426682bb1 Author: Emisse <[email protected]> Date: Wed Dec 27 19:38:33 2023 -0700 cluster update (#23089) commit 1ad4924275ee42787e0ddac3b09eda0a8dc8abe1 Author: Emisse <[email protected]> Date: Wed Dec 27 19:38:26 2023 -0700 meta update (#23087) commit 63d708670e0426d8d12b8485f523ae54b678ea97 Author: deltanedas <[email protected]> Date: Thu Dec 28 02:25:04 2023 +0000 saltern apc 2 (#23085) redo salv and qm apcs :trollface: Co-authored-by: deltanedas <@deltanedas:kde.org> commit 6dd469959cc89de5dc38dea6b92c87388d788105 Author: Emisse <[email protected]> Date: Wed Dec 27 19:24:37 2023 -0700 fland update (#23084) commit 8b110304d026b477ee1100e415120aa628587345 Author: deltanedas <[email protected]> Date: Thu Dec 28 02:08:29 2023 +0000 saltern update (#23082) * saltern update * :trollface: --------- Co-authored-by: deltanedas <@deltanedas:kde.org> commit 928451435b9b0403da8174f0ca2484e956b65f04 Author: Emisse <[email protected]> Date: Wed Dec 27 19:08:21 2023 -0700 box update (#23081) commit 3664a17272f1458a9d36ce413add6ebc42787f68 Author: Nairod <[email protected]> Date: Wed Dec 27 19:48:48 2023 -0600 Marking Locale Fix (#23072) * Marking Locale Fix * A Couple Touch-ups * Gah commit 7950653a06a22c0b66cb1119166996c7ed4b82b5 Author: Emisse <[email protected]> Date: Wed Dec 27 18:40:13 2023 -0700 marathon update (#23076) commit 2146bece86717a1588936e2caa5f2817569116c9 Author: Emisse <[email protected]> Date: Wed Dec 27 18:40:03 2023 -0700 barratry update (#23079) commit 6b3e7cab5de5d7f99e458feb173343df53b92e1b Author: Emisse <[email protected]> Date: Wed Dec 27 18:39:56 2023 -0700 Bagel (#23075) * bagel update * kill christmas commit b2d374bb3b87dd961c5c4b3d7c5280e06bc18eb6 Author: Emisse <[email protected]> Date: Wed Dec 27 18:39:48 2023 -0700 aspid update (#23077) commit 6a523656fea9194f11897f50477ace81cda3647e Author: Emisse <[email protected]> Date: Wed Dec 27 18:39:38 2023 -0700 atlas update (#23078) commit cc476b3593033a72d4053f0f3aa9df1700f3bf42 Author: Leon Friedrich <[email protected]> Date: Wed Dec 27 20:28:45 2023 -0500 Update engine to v197.1.0 (#23080) commit d82767be7db6d0cdf0782600b6a46b3a34b4c026 Author: Leon Friedrich <[email protected]> Date: Wed Dec 27 18:57:48 2023 -0500 Revert to v196.0.0 (#23074) commit 35ba42af9ccbbe41e8a3e59b30f2799ef8ca4b8d Author: Leon Friedrich <[email protected]> Date: Wed Dec 27 18:05:20 2023 -0500 Add some tests and fix some miscellaneous bugs (#22836) * Add some tests and fix some bugs * Add more helper methods * remove submodule * fix merge * also fix DirtyAll() * poke commit 44adc3261361970ac00d7675fc33fd5d78ca9220 Author: PJBot <[email protected]> Date: Wed Dec 27 22:54:15 2023 +0000 Automatic changelog update commit d10ebbc5bf43f00afd955bbc2673c2b5bc6142f9 Author: Alekshhh <[email protected]> Date: Thu Dec 28 00:53:10 2023 +0200 Inspector Coat and Brown Fedora Tweak (#23065) * det * hat * oops commit 364ecae94f66dc0a4e87760def5203cca4745cee Author: Leon Friedrich <[email protected]> Date: Wed Dec 27 17:50:49 2023 -0500 Cache ItemSizePrototype in StorageSystem (#22611) commit 0734a876f90530f6214f17b1e771aea972e7a482 Author: Leon Friedrich <[email protected]> Date: Wed Dec 27 17:48:10 2023 -0500 Try fix organ networking (#23034) commit 1c8eb2f3de92e52fcc5100e4751e0dd51f20c77e Author: Darkie <[email protected]> Date: Thu Dec 28 00:47:35 2023 +0200 Added a regular and an engraved zippo (flippo) lighter (#23020) * Added the zippo and engraved zippo. Added the engraved zippo in the detective's coat. * Added copyright. * Renamed to Flippo * Gave the Flippo new sounds. Moved the lighter sound collections to their own folder in Items. * Fixed YAML issues that showed up with moving the lighter noises to their own folder. * Added the detective's Flippo as a thief objective, with half the weight of the forensic scanner. commit 78965d1e368fa19549bfb043620c85d48188d78e Author: lzk <[email protected]> Date: Wed Dec 27 23:46:30 2023 +0100 Move stamps out of big mess (#22877) * gigacommit * Update honkbot.yml * foxing * merg * bring back mime sound * ; * :trollface: commit 5dc9a954bc37fe40c8d2ddf97d7cb8ebff7a817c Author: lzk <[email protected]> Date: Wed Dec 27 23:46:12 2023 +0100 some chairs tweaks (#22901) * make all chairs rotatable and anchorable * Revert "make all chairs rotatable and anchorable" This reverts commit d7f98261d5c228b7035b611f2becf2355c2f257f. * comt commit ae243007a849119f4435a60d98ff0878087cf80e Author: Leon Friedrich <[email protected]> Date: Wed Dec 27 17:41:58 2023 -0500 Fix missing entities in round summary window (#23032) commit a608071dda93d55f71ae96d7eb1a9b9051bc447e Author: Leon Friedrich <[email protected]> Date: Wed Dec 27 17:41:42 2023 -0500 Update engine to v197.0.0 (#23069) commit eb04a982948bd4378d297f7796725450e6cc8146 Author: Leon Friedrich <[email protected]> Date: Wed Dec 27 16:51:42 2023 -0500 Update ToolshedTest for engine PR (#22989) commit 065f22917286887b3df90b964a894d044f6ef95c Author: Jerry <[email protected]> Date: Thu Dec 28 03:33:46 2023 +0600 more new year lobby arts (#1689) commit 227ebcbf9da1c44f7397191e8e31ed836104570d Author: lapatison <[email protected]> Date: Thu Dec 28 00:20:45 2023 +0300 Translate Upstream #1687 (#1688) commit 8080d7e642ed61cdf3b3467f0c4e867674f8d3d5 Author: Syxapik <[email protected]> Date: Thu Dec 28 04:13:37 2023 +0700 [MapUpdate] Avrite (#1690) commit b032d778faaf712f8962fb7307768058fcf39d15 Author: PJBot <[email protected]> Date: Wed Dec 27 20:43:20 2023 +0000 Automatic changelog update commit 166296b2c510a81cdf3a11636a296b1ad859ed85 Author: Ed <[email protected]> Date: Wed Dec 27 23:42:15 2023 +0300 Thief hotfix (#22976) * fixes! * reduced collection amount * omeeeeega * pipup * popup commit 7d19a323b5e82a08503c6c74dee67cde8301c5df Author: Flareguy <[email protected]> Date: Wed Dec 27 12:44:33 2023 -0600 Makes brown rocks have a planetmap suffix (#23011) * makes brown rocks planetmap stuff * revert le procgen asteroids commit 1d7c88b631a05eb32544acb72edbbabdf32edce1 Author: poeMota <[email protected]> Date: Wed Dec 27 16:25:23 2023 +0300 Delta update (#1685) Co-authored-by: poeMota <[email protected]> commit b1e2e4c16e8a6ada1c3291a56ec2df517305cfcd Author: PJBot <[email protected]> Date: Wed Dec 27 12:32:07 2023 +0000 Automatic changelog update commit 412170f0e702783ef26b790debd6cf7273f47b42 Author: Emisse <[email protected]> Date: Wed Dec 27 05:31:02 2023 -0700 the grand lottery update (#23048) * the grand lottery update * Update cargo.yml commit ed997dc5beb794ef1009e75fd3a8344c045d4f37 Author: LankLTE <[email protected]> Date: Wed Dec 27 04:30:24 2023 -0800 remove racism (#23039) * Remove only 'species' is crew rules * hit space one too many times commit 8530ad27d1419152853a7f2ccef75f3d0acd5d6b Author: PJBot <[email protected]> Date: Wed Dec 27 12:29:34 2023 +0000 Automatic changelog update commit a1110a4ca951aaa7a8e7308667f4907f8bd69b1f Author: Blazeror <[email protected]> Date: Wed Dec 27 13:28:29 2023 +0100 Adding missing tag to make windoors pryable. (#23047) Fixed tag to be pryable by hand commit e584970c261aedbe07e834659d75043598ee2ccd Author: PoorMansDreams <[email protected]> Date: Wed Dec 27 03:13:47 2023 -0800 Added "The Throngler" (#22995) * The Throngler. * The Thronger * Thron * Revert "Thron" This reverts commit e6774ea4eefd4eee52bd6e3340f77d5890b50083. * Fixes Inhand sprites commit b5a53c0b6bff42386e23fd7009b3a921c3a94f4d Author: Nemanja <[email protected]> Date: Wed Dec 27 05:34:30 2023 -0500 fix potted plant drawdepth (#23027) commit f1a91b71f34de576d028666889b510b521cee32b Author: PJBot <[email protected]> Date: Wed Dec 27 09:57:05 2023 +0000 Automatic changelog update commit 1c3645e31c3e35bdeff4fa5efe29639d60ede880 Author: sneb <[email protected]> Date: Wed Dec 27 04:55:59 2023 -0500 Fix emergency and extended nitrogen tanks having the same volume (#23040) Update gas_tanks.yml commit faca1d7043927b502afb3f0ee2e362e01516eaef Author: Kara <[email protected]> Date: Wed Dec 27 02:55:48 2023 -0700 Pacifism rework (#23037) * Pacifism rework * grammar commit 0366d2758699228c9127c260ed47d5a88807b667 Author: Admiral-Obvious-001 <[email protected]> Date: Wed Dec 27 01:26:42 2023 -0800 Dial back shotgun pellet damage slightly. (#23042) Suggesting reducing the individual per pellet damage of the common shotgun shell from 12 to 10, changing the effectiveness at mid to long range to be slightly less oppressive. This would mean that shotguns will still 2 hit crit an unarmored target at point blank but allow a well armored target to withstand one more shot, and this should make them a little less effective down long hallways. commit af42cf82b7ca57fbdb0fd9dd16fd56248e92c7d1 Author: Leon Friedrich <[email protected]> Date: Tue Dec 26 23:39:04 2023 -0500 Fix device networking, again (#23035) commit 6e07bc70f8a216492d82b47896cabe9eb84836bc Author: Emisse <[email protected]> Date: Tue Dec 26 19:33:46 2023 -0700 marathon update (#23028) * marathon update * missed one commit 958d56f5c6bb0991a3e64186817379627c4b2e39 Author: Emisse <[email protected]> Date: Tue Dec 26 18:54:05 2023 -0700 emergency box update (#23026) commit b7224da34de0ebd654e7628753f533fd5a944cd1 Merge: b52e9bb64a 0a7f00f631 Author: Morb <[email protected]> Date: Wed Dec 27 03:09:29 2023 +0300 Merge pull request #1687 from space-syndicate/upstream-sync Upstream sync commit 0a7f00f631cd49551c79569ae3c5e1bc0428efa8 Author: Morb0 <[email protected]> Date: Wed Dec 27 02:53:57 2023 +0300 Update locale commit 6ef12e62e37fba1e2bea51ff09c40489081c87c0 Author: themias <[email protected]> Date: Tue Dec 26 18:32:38 2023 -0500 Define plastic bottle (#23015) * Define plastic bottle * mark beer bottles as small so trash bag can collect them commit cf98300ba223cc9b8bed72d9b6dff273a79119a3 Author: Leon Friedrich <[email protected]> Date: Tue Dec 26 18:32:25 2023 -0500 Fix rotation visuals desync & appearance state spam (#23016) * Fix rotation visuals desync * :bucklemeup: * A commit 476ea14e8a0925e7f90ddbe5f6dd7144bf43cde5 Author: Chief-Engineer <[email protected]> Date: Tue Dec 26 16:24:53 2023 -0600 Add access logs (IC ones) (#17810) commit 27798dc08268aaca255bbb48d09effffe90c3568 Merge: b52e9bb64a 4d42d00194 Author: Morb0 <[email protected]> Date: Wed Dec 27 00:32:56 2023 +0300 Merge remote-tracking branch 'upstream/master' into upstream-sync commit 4d42d00194057b66265f44f450f7c394459fef56 Author: lzk <[email protected]> Date: Tue Dec 26 22:22:33 2023 +0100 Fix awful slimepeople parts sprites (#22969) fix awful slime parts commit b52e9bb64a79c53b647a124302931f547f68188e Author: lzk <[email protected]> Date: Tue Dec 26 20:51:52 2023 +0100 some locale tweaks (#1686) commit d75d7d71879d8ef9251b5fab4b44489fb8b92cde Author: LankLTE <[email protected]> Date: Tue Dec 26 04:57:52 2023 -0800 fix ahelp relay times (#23001) RoundDuration instead of CurTime commit f6b8f183d7e808fbcf6f58fad83af6c8da6ef252 Author: Chief-Engineer <[email protected]> Date: Tue Dec 26 06:57:11 2023 -0600 Revert "temporarily override WizDen admin names" (#23004) Revert "temporarily override WizDen admin names (#22878)" This reverts commit 0f6d062da437fe266db7077cb9d5a450da3c54d2. commit 6324b0fb8e751437c1c0d4b23ea8dc381ce5d769 Author: Morb0 <[email protected]> Date: Tue Dec 26 14:54:24 2023 +0300 Fix forced manifest instead of ACZ for public build commit 82083e37e365f9ff834b7d5b47b9cdbbb835776c Author: lapatison <[email protected]> Date: Tue Dec 26 14:41:49 2023 +0300 Translate Upstream #1681 (#1683) Co-authored-by: lzk <[email protected]> commit aadc75a07abcbffeea292b61411838fbfd2777e6 Author: lzk <[email protected]> Date: Tue Dec 26 09:27:15 2023 +0100 Fix potted plants going over doors (#22869) * Update potted_plants.yml * Update potted_plants.yml commit ef726a9cb05e041839492bf2b7c2c401112bd0a7 Author: Avalon <[email protected]> Date: Tue Dec 26 03:22:34 2023 -0500 fix the mothroach crate saying it contains six mothroaches instead of four (#22968) FINALLY FUCKING FIX THAT ONE FUCKING LIKE FUCK IT commit d3ae3776ed40cf7b88b60d0f87f7e5c17803497a Author: Leon Friedrich <[email protected]> Date: Mon Dec 25 23:04:57 2023 -0500 Update engine to v195.0.1 (#22994) commit fd3c922a08d8b8c863153b3f9a519a04083551bb Author: Ubaser <[email protected]> Date: Tue Dec 26 12:05:59 2023 +1100 Add chaplain stoles (#22955) add commit 88b59c0053a21729c900a2cdd7940e88018e6692 Author: qwerltaz <[email protected]> Date: Tue Dec 26 02:05:39 2023 +0100 fix origin teg (#22979) commit cde532bfa4cc04b454967ade5cddd45e0cb7326a Author: Boaz1111 <[email protected]> Date: Mon Dec 25 23:33:20 2023 +0100 fixed the sulfacid issue, made some more chems use the industrial chems (#22981) commit 33ddee42802e52abfb1417b458f3c6b16a49a954 Author: lzk <[email protected]> Date: Mon Dec 25 22:20:05 2023 +0100 Change looc prefix (#1676) commit 85798bd851741cb668e6b867cabe8136db4fd4f1 Author: Morb <[email protected]> Date: Tue Dec 26 00:19:16 2023 +0300 Make thieves not pacifist (#1682) commit ab6726136f452dc4372a5cc8d1d5dcabf65024b3 Author: Kara <[email protected]> Date: Mon Dec 25 13:50:10 2023 -0700 Optimize artifact analyzer UI state sending (#22949) * Remove n rename cruft old shit * Artifact analyzer UI updating optimization * Revert "Remove n rename cruft old shit" This reverts commit 8789338fb20f77d79c5b0e40719896efe0103fcc. commit c3749cc685ced461c595043131b2a4e551057829 Merge: b8ab292dea edde2b651d Author: Morb <[email protected]> Date: Mon Dec 25 21:52:11 2023 +0300 Merge pull request #1681 from space-syndicate/upstream-sync Upstream sync commit b8ab292deaccd0411c6696b733d047a09957d589 Author: lzk <[email protected]> Date: Mon Dec 25 19:42:22 2023 +0100 Move corvax datasets to corvax folder (#1680) commit edde2b651d93d9b839fc187040125f9dde3aca82 Author: Morb0 <[email protected]> Date: Mon Dec 25 21:33:26 2023 +0300 Update locale commit 918f543c2c7550ff0f36bc1f4b87abb92e160831 Merge: f9e99fa02c 7b46390b9c Author: Morb0 <[email protected]> Date: Mon Dec 25 21:03:49 2023 +0300 Merge remote-tracking branch 'upstream/master' into upstream-sync # Conflicts: # Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml # Resources/Textures/Objects/Devices/nuke.rsi/meta.json # Resources/Textures/Objects/Misc/Lights/lamp.rsi/meta.json commit 7b46390b9cfa6ae77b303e3f24737e2baf91d1dd Author: LordCarve <[email protected]> Date: Mon Dec 25 18:46:42 2023 +0100 Removed senior roles from job supervisor locales (#22972) commit c326e5d08727139aa19d231995c16d54f71b42b8 Author: metalgearsloth <[email protected]> Date: Tue Dec 26 00:19:12 2023 +1100 Fix multi-ghosts (#22964) * Fix multi-ghosts * Fix mind visits commit 724cde264c7f6e639f8f80458e254baccd8af3b3 Author: lzk <[email protected]> Date: Mon Dec 25 10:56:17 2023 +0100 Botany yaml fixing (#22865) * 1 * Update chapel.yml * Revert "Update chapel.yml" This reverts commit 3e297a1b20254823a088af2aa3d179184c377638. * add to seeds vendor commit 742fd7420b54d11ce3d69c6f5c4e37d466a06f64 Author: Kara <[email protected]> Date: Mon Dec 25 02:13:12 2023 -0700 Thief description & grammar fixes (#22951) * Thief description & grammar fixes * sad * cant do that sad commit 450414c8fcaf7535f59857176de84fd9a6a817b9 Author: Flareguy <[email protected]> Date: Mon Dec 25 02:11:37 2023 -0600 Adds gingerbread men to the game (#22927) adds gingerbread men to the game commit dd0270a252ac82c466db7e3469f0b6e6e526d92d Author: Emisse <[email protected]> Date: Mon Dec 25 01:11:05 2023 -0700 bagel update (#22948) commit 789fd894544276f408420fb0d1d7c15f19c2560b Author: Emisse <[email protected]> Date: Mon Dec 25 01:09:10 2023 -0700 reduce nuke required floor radius variable (#22947) Update NukeComponent.cs commit 0144bbdf4bc35ccdfc69a1f08505a279b06d2d1f Author: Emisse <[email protected]> Date: Mon Dec 25 01:09:00 2023 -0700 nukieplanet update (#22946) commit 213eb7591272bcfd50e2d39bd993bb6819f825ca Author: Emisse <[email protected]> Date: Mon Dec 25 01:08:52 2023 -0700 centcomm update (#22944) commit 82ddf451e6d70710a93d40aa1f5bbb7138333fb3 Author: LankLTE <[email protected]> Date: Sun Dec 24 23:55:56 2023 -0800 change the restart vote to have no effect with admins online (#22945) * Change the vote and cvar * Only denies successful votes * Add comments because I'm a good coder, I swear * I added a space to the first line of ccvars it's so over commit 4cd4805a0116bca830c9a7ed767eedf3d0c7970c Author: reverie collection <[email protected]> Date: Sun Dec 24 23:39:20 2023 -0800 Atmos crab pet: Tropico! (#22773) * tropico mob fully functional, adjusted base crab mob * FINALLY YES I GOT THE MAPS COMMITTED * origin fix hopefully * removed ghost role * undid map changes, pulled from current master * tropico is no longer communist commit 9a40cf81f55722083a985e4cdddda9c6008beb08 Author: metalgearsloth <[email protected]> Date: Mon Dec 25 18:34:21 2023 +1100 Add sprite movement states (#22940) * Add sprite movement states Did it for borgs for reference for future implementations. * Fix * Fix prediction issue * review commit 721a445bbd707d21744ba01220e5ce46eda84e4e Author: Leon Friedrich <[email protected]> Date: Mon Dec 25 02:33:32 2023 -0500 Fix pulling mispredicts (#22941) * Fix pulling mispredicts * Make behaviour consistent * Good ol terminating entities commit 9eaa4c3a5d3f0f6e55f88f79c6d36db09367c6df Author: Leon Friedrich <[email protected]> Date: Mon Dec 25 02:15:33 2023 -0500 Make cargo arbitrage test ignore gambling crate (#22943) commit e10a314ec2314a6a24a59956c9594b3ba65cbd34 Author: LankLTE <[email protected]> Date: Sun Dec 24 22:57:00 2023 -0800 add round time to the ahelp relay (#22937) * Basic roundtime implementation * Forgot to clamp the length checker commit 00813171c1caa0a6e56dc28fbcbb37dcfc417ebc Author: Nemanja <[email protected]> Date: Mon Dec 25 01:52:43 2023 -0500 Automatic holiday sprites (#22929) commit 2d213b8ab0a5ba24ebb5348176cc03bd6daa489b Author: deltanedas <[email protected]> Date: Mon Dec 25 06:51:32 2023 +0000 give plasma half of co2 air alarm threshold (#22938) Co-authored-by: deltanedas <@deltanedas:kde.org> commit ba88a9a022db90861e50a7609cffeff22509d81f Author: Kara <[email protected]> Date: Sun Dec 24 23:50:42 2023 -0700 Revert "Add YAML gas reactions (#22803)" (#22939) This reverts commit 054321d2c2c17eb55a1640150131c61c29a3eb2b. Co-authored-by: Kevin Zheng <[email protected]> commit 0baffe32435341a066198805c94f38fd049395ae Author: Leon Friedrich <[email protected]> Date: Mon Dec 25 01:48:58 2023 -0500 Fix closet skeletons spawning in nullspace (#22942) commit 8587c3778abdf94041a491b1ff6330fbe6746c03 Author: Leon Friedrich <[email protected]> Date: Sun Dec 24 23:12:22 2023 -0500 Make some prototypes use frozen collections (#22576) * Make some prototypes use frozen collections * poke tests * Remove frozen dictionary enumeration commit 78354052eae0231e2d41715c0528f08ec29d3111 Author: Ed <[email protected]> Date: Mon Dec 25 06:42:48 2023 +0300 Thief pacifist (#22932) * pac * to settings * ensuuure me princess * Update Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs Co-authored-by: faint <[email protected]> * Update Content.Server/GameTicking/Rules/ThiefRuleSystem.cs Co-authored-by: faint <[email protected]> --------- Co-authored-by: faint <[email protected]> commit 52532e40759d874e25daf1620ad5d808b0942116 Author: deltanedas <[email protected]> Date: Mon Dec 25 03:16:56 2023 +0000 exterminator midround minor antag (#19946) * terminator locale * terminate objective * terminator components and shared system * terminator roles rules and system * terminator events * skeleton recolour * terminator and endoskeleton * ghost role spawn * damage modifier sets * :trollface: * :trollface: * add antag prototype * ghost role locale * skynet * :trollface: * :trollface: * :trollface: * add endoskeleton body prototype * :trollface: * :trollface: * smite locale * implement terminate smite * :trollface: * :trollface: * implement PopupBehavior * endoskeleton transform popup * move stuff from shared to server since nothing actually used it * recolour everything * update parts * :trollface: * :trollface: * ok fire was using the damage set, back to 1.0 * tweak * :trollface: * :trollface: * simplemob ops * 1 rule per pro * :trollface: * :trollface: * update some sprites * structural damage * :trollface: * :trollface: * Revert "update some sprites" This reverts commit 459196c6a8942c5412885d5fe2f1a83a48408ddc. * offbrand, add die objective to maybe remove fear of murderbone * add shut down objective to the list * fix ghost role * fix control mob * :trollface: * :trollface: * please * naming * code changes for GenericAntag terminator * yml changes for GenericAntag terminator * :trollface: * moved kill objective override to an objective component * use kill objective override * fix * oh * locale changes * change burn to heat for skin melting gib * change some endoskeleton stuff * pro * i already did this dementia ops * objective * fix * pro * swap out full sprite * update parts * forgor * fix mind transfer * type * endoskeleton has 500 mass * evil * fishops * warops --------- Co-authored-by: deltanedas <@deltanedas:kde.org> commit 2b25e00453bff6d648cae0755e5bc2c9e4f6aa3e Author: lzk <[email protected]> Date: Mon Dec 25 02:30:58 2023 +0100 Make some items goodlooking in inventory (rotate) (#22935) comit commit 2ca649edfa4963215919f3fc4dc621899cd8c595 Author: deltanedas <[email protected]> Date: Mon Dec 25 01:20:55 2023 +0000 add limits to steal objectives (#22672) * add ObjectiveLimit comp/system * give ian and disk limits * all * up limit --------- Co-authored-by: deltanedas <@deltanedas:kde.org> commit f9e99fa02c84dd79c0563b1b23c2c82cb078536c Author: Morb <[email protected]> Date: Mon Dec 25 04:12:53 2023 +0300 [Resprite] Hardsuits (#1620) commit 3f51955a0e723fb44ef286f91bf822d16209fc0c Author: lapatison <[email protected]> Date: Mon Dec 25 04:10:53 2023 +0300 Translate Upstream #1672 (#1674) commit b20fcf51411761710a7289765d216bd3980ded35 Author: Arimah Greene <[email protected]> Date: Mon Dec 25 02:08:15 2023 +0100 Add a 'Copy' button to the fax UI (#22027) * Add a 'Copy' button to the fax UI * Add ValidatePrototypeId attribute Co-authored-by: Kara <[email protected]> --------- Co-authored-by: Kara <[email protected]> commit 28310a131c451a220391e8093315497aeecca04e Author: Sirionaut <[email protected]> Date: Mon Dec 25 02:02:54 2023 +0100 Janibelt whitelist fix and update (#21058) * Update belts.yml added LightReplacer and JanicartKeys tags to the Jani belt * removed LightReplacer from whitelist but added Plunger adding LightReplacer to the Whitelist doesn't get rid of the error msg. Now it just adds Plunger & JanicartKeys (both tags already exist) * added spray to botany belt and syringe to med belt * fixed things, i hope * added self tag to LightReplacer * added LightReplacer to the taglist * lightreplacer tag does exist now commit 1f0f34632b95514c9fe061bcebc06a91e789e12c Author: I.K <[email protected]> Date: Sun Dec 24 16:51:38 2023 -0600 fix fireaxe rotation (#22930) * Update fireaxe.yml * i am so dumb commit 79ed21cf94d2daf2626d4a719dbe1bc30f8a6984 Author: lzk <[email protected]> Date: Sun Dec 24 23:45:37 2023 +0100 Borg locale (#1663) commit b062a4e53504fa771119cf12d8450bef0e01deac Author: lapatison <[email protected]> Date: Mon Dec 25 01:45:18 2023 +0300 Translation fixes (#1671) commit be7842dbbd22c9de765f170f56e1a0bd5b8c67d0 Author: Jerry <[email protected]> Date: Mon Dec 25 04:43:30 2023 +0600 Add new year lobby arts (#1673) commit 9d37dde7146799477b81106eb40395723e14480d Author: Emisse <[email protected]> Date: Sun Dec 24 14:16:25 2023 -0700 remove max item size from storage implant (#22928) commit 8b781ed84effbdc59524857a8773f31cc60c16b5 Author: deltanedas <[email protected]> Date: Sun Dec 24 20:58:22 2023 +0000 nukie medic chest rig explosion res buff (#22923) leave my beaker alone Co-authored-by: deltanedas <@deltanedas:kde.org> commit a1210ca69135b6cff3db95a6be7a07db88e4e338 Author: Nairod <[email protected]> Date: Sun Dec 24 14:49:23 2023 -0600 Central Command Access, Doors, and Locked Vendor (#22924) * CentComm Acess and Doors * Central Command Access Windoor commit dd2f8deee9971bb12128227ce91bb0c89fa908be Author: Ubaser <[email protected]> Date: Mon Dec 25 07:01:17 2023 +1100 Increase cigarette count in cig packs (#22919) add commit fd5a1b293a14ae53387eda20167a350fc8e61198 Author: Warentan <[email protected]> Date: Sun Dec 24 13:59:44 2023 -0600 Nerfed bloodsuckers- They can no longer tank some incoming damage types by chugging blood (#22880) Nerfed bloodsuckers- Can no longer tank some damage types by chugging blood Co-authored-by: Warentan <[email protected]> commit 97f0fba07b67f1fa87f7cf4a88ac4de2d8a40f5b Merge: 44db1ac483 1efc71f146 Author: Morb <[email protected]> Date: Sun Dec 24 22:38:46 2023 +0300 Merge pull request #1672 from space-syndicate/upstream-sync Upstream sync commit beb1a4c4a496bbfa9d5fdb0c2557d5e2dca05df6 Author: lapatison <[email protected]> Date: Sun Dec 24 22:35:40 2023 +0300 Janitor equipment slot locale, vehicle slot (Keys) locale (#22859) * stuff * fixes * vehicle locale commit 16f4572c5780f9c0d3514b8ba535258ea0ce663b Author: lapatison <[email protected]> Date: Sun Dec 24 22:13:02 2023 +0300 Minor alert locale (#22926) locale commit 446b47a4b75bfa0ee95879349031407c8e2874e8 Author: Boaz1111 <[email protected]> Date: Sun Dec 24 20:12:36 2023 +0100 Adding intermediate industrial chems (#22614) * added hydroxide, benzene, and changed the phenol recipe * I forgot to commit a bunch of changes, whoopsie doopsie * Update chemicals.yml made an error while resolving conflicts * Update chemicals.yml same here * Update flavor-profiles.ftl * Update chemicals.yml * Update chemicals.ftl * Update chemicals.ftl * Update chemicals.yml * Update medicine.yml * Update chemicals.yml * Update medicine.yml * guh * Revert "guh" This reverts commit a0e5dfd4182d1a407bffd21d0eaa36355023993c. * final touches and fixes * fixed all the issues, for realsies * thefuck * Revert " thefuck" This reverts commit 22068cb73d9902ccf81d065d92d078f423c67aea. * maybe this fix? * Revert " maybe this fix?" This reverts commit 4bfd534f73a956e595c809ce77e52819ed142f2b. * Update chemicals.yml * Update chemicals.yml * Update chemicals.yml Trying to figure out my issue * Update chemicals.yml * Update chemicals.yml * Update chemicals.yml * Disabled the ethanol breakdown, fixing the issue * Revert "Update chemicals.yml" This reverts commit 1239512c0b7df5eab106bf64ec2af38185f2f016. * Revert "Disabled the ethanol breakdown, fixing the issue" This reverts commit 96190c967d22b1422d144e4211579f5af7bf9a09. * Emo suggested I'd do this * Update chemicals.yml * made temps needed for the uhh hydroxide and benzene * Update chemicals.yml * removed SugarBreakdown commit 1efc71f1465a53ef95930361e0c3ba766eee5fef Author: Morb0 <[email protected]> Date: Sun Dec 24 22:04:30 2023 +0300 Update locale commit c333fc2b207e2f23d3a0542e2d6f877007471955 Merge: 44db1ac483 bd398a6a9a Author: Morb0 <[email protected]> Date: Sun Dec 24 20:02:16 2023 +0300 Merge remote-tracking branch 'upstream/master' into upstream-sync # Conflicts: # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml # Resources/Prototypes/Maps/omega.yml # Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json commit bd398a6a9ae5f71eb5077cb612c39bfe82ec5d06 Author: Hmeister-fake <[email protected]> Date: Sun Dec 24 15:20:08 2023 +0000 Adds sound to Smoke Grenades (#22866) * New smoke grenade sound Very new to PR's and stuff, sorry * Adds sound to smoke grenades and tear gas grenades on trigger * Update attributions.yml Deltanadas asked for it * Update grenades.yml * Change sound to an unlicenced sound * Update attributions.yml commit 2c3f3e5686f18381b5c802b40a67026770adde85 Author: Kevin Zheng <[email protected]> Date: Sun Dec 24 07:05:42 2023 -0800 Add maximum atmos temperature limit (#22882) * Add Tmax * Increase Tmax commit df2b4c1088366a9fab105eab10516b65ed475c61 Author: deltanedas <[email protected]> Date: Sun Dec 24 14:37:35 2023 +0000 add ninja borg laws (#22778) add ninja laws Co-authored-by: deltanedas <@deltanedas:kde.org> commit 06fea3e8936be793df8248072107bd9f7c2dbe14 Author: Flareguy <[email protected]> Date: Sun Dec 24 04:41:59 2023 -0600 New boxstation emergency shuttle (#22912) new boxstation emergency shuttle (omega has the old one now also) commit 144af233c4f4135cccacfa5d50281fce44a1595e Author: Ed <[email protected]> Date: Sun Dec 24 12:58:28 2023 +0300 New Thief minor antagonist (#21520) * start working * add right-click thief antagins some architecture restruct * add meh thief greeting audio * add thief subgamemode to Traitors gamemode * add late join thief (not tested yet) add briefing * add pacifism * add Steal tasks to thief * fix crash thief+traitor on person * add new condition: collection steal * add tracking of succes collection objective * add stamp collection target remove some boring steal target add check pulling entity to collection target * finalize first 2 group objective * start merging stealing objective systems * merging * finish merging. Now traitor steal objective work better * we don't check the items of pullable sentient entity * clear naming, enable thief signle item objective start * objective pack add * finish with steal item objectives * convert string to ProtoId<> * some clean up * add thieves to revolution game mode * Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl Co-authored-by: Flareguy <[email protected]> * Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl Co-authored-by: Flareguy <[email protected]> * update pacifism: fix crashing, monkey-thief without pacified * adaptive animal briefing, cleaning locales * add structure steal objectives * remove RCD target * add thiefs to manifest, but bug with traitor duplications * add escape objective * add chat briefing * setup animal objective group system * add animal steal objectives * add animal objectives notroleconditions * add morty * now thief mode has a chance of not launching Now there are a random number of thieves per round from 1 to 3 * 6 hours of trying to fix duplicate tasks. Failure * added thief pinpointer (buggy) * start thief backpack UI work * revert pinpointer for scope reason * UI continue work * add thief starter kits content * remove ERP kit :trollface: * finally! giving starting items to thief. Now it playable, but still need more work * clean up * fix * fox * add merged items into thief new Starting Kit (buggy) * fix YES antag menu * objection tweaks * remove hearts objective, working on spawning things from toolbox * smug * fixes * add race specifier objective condition LAMPS * meh * fix fix fix * the alive * Adding stamps * Update backpack.ftl * Revert1 * Revert ftl * add voice mask to communicator kit * Update Resources/Locale/en-US/administration/antag.ftl Co-authored-by: Colin-Tel <[email protected]> * Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl Co-authored-by: Colin-Tel <[email protected]> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <[email protected]> * Update Resources/Locale/en-US/objectives/conditions/steal.ftl Co-authored-by: Colin-Tel <[email protected]> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <[email protected]> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <[email protected]> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <[email protected]> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <[email protected]> * Update Resources/Locale/en-US/prototypes/roles/antags.ftl Co-authored-by: Colin-Tel <[email protected]> * Update Resources/Locale/en-US/thief/backpack.ftl Co-authored-by: Colin-Tel <[email protected]> * update * fix * more reusable function, add documentation * fix doc * faint fixes --------- Co-authored-by: Flareguy <[email protected]> Co-authored-by: Colin-Tel <[email protected]> commit 82349d46aeef2a0400faf36e0e670c4db620df3f Author: Emisse <[email protected]> Date: Sun Dec 24 02:45:03 2023 -0700 bagel update (#22910) commit 044f5e7c4ebda196c1cd57322424b9ff932e6f9f Author: LordCarve <[email protected]> Date: Sun Dec 24 09:58:00 2023 +0100 Fixed PaperSystem bugs (#22896) commit 681f9a2c852033949f0b984f9f3b711c52e4cfdf Author: Nemanja <[email protected]> Date: Sun Dec 24 01:58:02 2023 -0500 Ion law visuals (#22908) commit ba4b03f9be112d3c1f4e6908189e564f…
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Описание PR
Медиа
Проверки
Изменения
🆑 Morty, Kuro