Charlotte Tezuka
ea713efb05
Merge remote-tracking branch 'corvax/master' into upstream
2026-01-14 18:15:24 +02:00
Pok
1cc0f83350
[Wiki] Подгрузка всех ключей локализации ( #3482 )
2026-01-14 12:55:26 +07:00
Dmitry
6187a5a7bd
merge remote stable wizden
2026-01-08 10:32:52 +07:00
Pieter-Jan Briers
787330f5c6
v269.0.0 RT update - .NET 10 ( #41855 )
...
* Make ServerPackaging automatically get extra server assemblies
* Make the switch
* Use Content.Server.deps.json instead
* Remove debug
* Rewrite
Now recursively fetches dependencies from Content.Server
Only copies dependencies not covered by Robust
This removes the need to manually specify most of the dependencies, even the content ones!
Also look at runtime key properly to figure out the proper dll name.
This actually removes some assemblies that were duplicated between the main directory and assemblies (various Microsoft.Extensions stuff)
* Fix test compile errors when updating dependencies
Ran across this while updating dependencies on the RT .NET 10 update. Should be fine to merge immediately.
* More .NET 10 prep
* Convert to SLNX
Hell yeah
* slnx now has size-2 indents
* Update SLNX with new RT system
* Remove reference to RT test in toolshed test
* Remove accidental usage of transitive RT dependencies
* Move Robust project references to RobustApi
* Update solution file
* Fix warnings in pow3r
* Fix nullable warnings in integration tests
idk where these came from
* gitignore binlog files
* Fix transitive dependency warnings in Content.Benchmarks
* Update slnx
* Okay, the Robust API thing didn't pan out. New plan.
It apparently broke clean builds, as the dependencies aren't in the project asset list or something anymore. I tried to fix this, but it seems impossible to do without relying on .NET SDK internals, as there's no point in the NuGet graph walk process that seems cleanly extensible.
Instead let's just do the much dumber thing: a bunch of .props files for content to import. Hooray!
This also means that I have to go through and *explicitly* disable transitive dependencies everywhere in RT. This thankfully isn't too hard.
* Update RT to 269.0.0
* One last solution update
* Fix more data definition issues
* Update RT to 269.0.1
* Fix it again
---------
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com >
2025-12-22 01:24:24 +00:00
Litogin
8693c3418e
Remove offmed ( #439 )
2025-12-21 23:18:41 +03:00
tau
cdbdb2528b
Change checkout reference in publish.yml
2025-11-10 20:47:16 +03:00
tau
b26f7f8f5e
Update publish.yml
2025-11-10 11:45:58 +02:00
tau
8a59799ad9
Update publish.yml
2025-11-09 18:14:20 +03:00
Pupchansky
f85d510adf
Fax papers ( #355 )
...
* теперь факсам нужна бумага, чтоб копировать документы(и получать их)
* очепяточка
* фиксы от кодрэббита
2025-10-31 22:48:44 +03:00
tau
99d65db4cc
Add ref option to checkout action in publish.yml
2025-10-17 20:14:07 +03:00
tau
514a11448b
Remove 'ref' option from checkout action
...
Removed the 'ref' option from the checkout action.
2025-10-16 20:36:14 +03:00
tau
b8c68d44ce
Tests changes ( #300 )
...
* Revert "Респрайт муринов (#245 )"
This reverts commit d267583601 .
* Test offmed add
* Offmed brang
2025-10-14 00:27:27 +03:00
Charlotte Tezuka
1d11757bb0
Upstream 09.10
2025-10-09 14:18:23 +02:00
Jerry
b8785bba3f
cleanup
2025-10-07 19:22:05 +05:00
Jerry
bf118cf0fd
tired of making this shit
2025-10-07 19:20:06 +05:00
Jerry
72de18abbc
remove that if
2025-10-07 19:13:06 +05:00
Jerry
0b9656c17a
god, just work please
2025-10-07 19:12:48 +05:00
Jerry
b498b77d26
aaand woops.. again
2025-10-07 19:07:38 +05:00
Jerry
6c0075aa9c
woops...
2025-10-07 19:05:27 +05:00
Dmitry
a06b3ef808
Merge pull request #3395 from DIMMoon1/upstream9.1
...
Upstream9.1
2025-09-23 00:56:07 +07:00
Charlotte Tezuka
d5e69e73e5
Upstream from corvax/master 19.09
2025-09-19 00:42:32 +02:00
Jerry
cad32f4a26
Revert self-host runners ( #3398 )
2025-09-17 21:19:58 +05:00
Dmitry
f01a60f5c7
upstream 9.1
2025-09-17 06:41:33 +07:00
Jerry
3e96f49c1d
fix: move deps installation into runner ( #3388 )
2025-09-12 19:55:06 +05:00
Jerry
4e8f21ab9b
fix: fix mkdir in secrets ( #3383 )
2025-09-10 16:21:23 +05:00
Jerry
76beaa8a72
fix: fix some workflows being not self-hosted ( #3382 )
2025-09-10 16:14:37 +05:00
Myra
5d3de5d1aa
Add a space in osx-arm64 to fix arm64 osx builds ( #40137 )
2025-09-05 20:41:08 +02:00
Pieter-Jan Briers
d33478e41f
Package win-arm64 and osx-arm64 servers ( #40113 )
2025-09-04 19:33:44 +02:00
Morb
6f70abfe0d
Revert publish.yml
2025-09-04 05:00:21 -07:00
Morb
a3e471f076
Update publish.yml
2025-09-04 04:44:26 -07:00
Morb
dc34e94341
Update publish.yml
2025-09-04 04:37:42 -07:00
Jerry
ed41622174
chore: self-hosted is real ( #3376 )
2025-09-04 02:11:37 +05:00
Jerry
317b82aa81
chore: check .net install before using
2025-09-04 01:48:17 +05:00
ssdaniel24
6591aabe4f
Merge remote-tracking branch 'corvax/master' into upstream-07-23
2025-07-23 22:35:40 +03:00
Dmitry
4948a136f1
stable upstream syns
2025-07-17 14:36:21 +07:00
Pieter-Jan Briers
69674a1710
Make Review Requested label get applied to all opened PRs ( #38625 )
...
It previously only applied automatically to PRs that have reviews requested, which happens if the PR touches files owned by code owners. Now it applies to *all* opened PRs.
2025-06-27 20:23:12 +02:00
Myra
6cffa8aabe
Properly evaluate publish condition for master branch ( #38556 )
2025-06-25 13:56:47 +02:00
Tayrtahn
6a582db4b8
Treat duplicate dependency warnings as errors ( #38480 )
...
* Treat duplicate dependency warnings as errors
* GitHub workflows
* commas
* Maybe we just don't use these?
* I think we can get rid of these?
2025-06-22 00:25:20 +02:00
Myra
6e59f748e0
Fail if we attempt to run publish on master ( #38431 )
...
* Fail if we attempt to run publish on master
BREAKING: FORKS REMOVE THIS
* Update publish.yml
2025-06-21 02:32:31 +02:00
Morb0
f990964b03
Add Audio to Secrets copy
2025-06-20 12:55:30 +03:00
ssdaniel24
3fc0562c41
Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-06-10
...
Conflicts:
Content.Server/GameTicking/GameTicker.Spawning.cs
Resources/Credits/GitHub.txt
Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
Resources/Prototypes/GameRules/cargo_gifts.yml
Resources/Prototypes/Maps/omega.yml
Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_wagging.png
2025-06-10 22:07:39 +03:00
Dmitry
5722bd3044
again upstream
2025-06-10 17:13:14 +07:00
slarticodefast
f8c71db50f
Revert "Add trailing whitespace check workflow" ( #38179 )
...
Revert "Add trailing whitespace check workflow (#37367 )"
This reverts commit be35f6e9ce .
2025-06-09 19:21:42 +02:00
ssdaniel24
d399099102
Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-try-2
...
Conflicts:
Content.Client/Humanoid/HumanoidAppearanceSystem.cs
Content.Client/LateJoin/LateJoinGui.cs
Content.Client/Stylesheets/StyleNano.cs
Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
Content.Server/Fax/FaxSystem.cs
Content.Server/GameTicking/GameTicker.Spawning.cs
Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
Content.Server/Station/Systems/StationSpawningSystem.cs
Content.Shared.Database/LogType.cs
Content.Shared/Ghost/GhostComponent.cs
Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
Content.Shared/Preferences/HumanoidCharacterProfile.cs
Content.Shared/Roles/SharedRoleSystem.cs
README.md
Resources/ConfigPresets/Corvax/common.toml
Resources/Credits/GitHub.txt
Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl
Resources/Maps/Shuttles/trading_outpost.yml
Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml
Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
Resources/Prototypes/Entities/Structures/Power/substation.yml
Resources/Prototypes/GameRules/cargo_gifts.yml
Resources/Prototypes/GameRules/events.yml
Resources/Prototypes/GameRules/meteorswarms.yml
Resources/Prototypes/Maps/bagel.yml
Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
Resources/Prototypes/Reagents/chemicals.yml
Resources/Prototypes/Reagents/medicine.yml
Resources/Prototypes/Reagents/pyrotechnic.yml
Resources/Prototypes/Reagents/toxins.yml
Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
Resources/Prototypes/Roles/Jobs/Command/captain.yml
Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
Resources/Prototypes/Roles/Jobs/Science/research_director.yml
Resources/Prototypes/Roles/Jobs/Security/detective.yml
Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
Resources/Prototypes/Roles/Jobs/Security/warden.yml
Resources/Prototypes/Voice/disease_emotes.yml
Resources/Prototypes/Voice/speech_emotes.yml
Resources/Prototypes/radio_channels.yml
Resources/Textures/Effects/speech.rsi/meta.json
Resources/Textures/Interface/Default/Slots/id.png
Resources/Textures/Interface/Minimalist/Slots/pda.png
Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
RobustToolbox
2025-06-02 12:30:02 +03:00
Dmitry
a6ecbc3410
Merge remote-tracking branch 'upstream/master'
2025-05-24 22:35:13 +07:00
Dmitry
25c5e59248
Upstream ( #3172 )
...
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com >
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com >
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com >
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com >
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com >
Co-authored-by: Partmedia <kevinz5000@gmail.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: themias <89101928+themias@users.noreply.github.com >
Co-authored-by: Victor Shen <71985089+Vexerot@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Milon <milonpl.git@proton.me >
Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: Stomf <5dorkydorks@gmail.com >
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com >
Co-authored-by: PraxisMapper <praxismapper@gmail.com >
Co-authored-by: EmoGarbage404 <retron404@gmail.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com >
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com >
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com >
Co-authored-by: abadaba695 <spacestation13thingy@gmail.com >
Co-authored-by: kosticia <kosticia46@gmail.com >
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com >
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com >
Co-authored-by: Myra <vasilis@pikachu.systems >
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: BIGZi0348 <svalker0348@gmail.com >
Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com >
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com >
Co-authored-by: Matthew Herber <32679887+happyrobot33@users.noreply.github.com >
Co-authored-by: Ertanic <36124833+Ertanic@users.noreply.github.com >
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: eoineoineoin <helloworld@eoinrul.es >
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com >
Co-authored-by: nikitosych <boriszyn@gmail.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com >
Co-authored-by: YoungThug <ramialanbagy@gmail.com >
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com >
Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com >
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com >
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com >
Co-authored-by: 3nderall <101940324+3nderall@users.noreply.github.com >
Co-authored-by: Radezolid <snappednexus@gmail.com >
Co-authored-by: J <billsmith116@gmail.com >
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com >
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com >
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com >
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com >
Co-authored-by: Spanky <scott@wearejacob.com >
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com >
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com >
Co-authored-by: Deerstop <edainturner@gmail.com >
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com >
Co-authored-by: archee1 <archee3@hotmail.co.uk >
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com >
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com >
Co-authored-by: poklj <compgeek223@gmail.com >
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com >
Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com >
Co-authored-by: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Zalycon <84675130+Zalycon@users.noreply.github.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: ScarKy0 <scarky0@onet.eu >
Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com >
2025-05-24 11:00:17 +03:00
Litogin
8adf9442cd
Merge branch 'master' into Fix_Checs
2025-05-15 16:51:15 +03:00
LEVELcat
21351727de
revert "oops..."
2025-05-13 14:52:55 +03:00
slarticodefast
be35f6e9ce
Add trailing whitespace check workflow ( #37367 )
...
* whitespace check
* fix formatting
* fix indentation
* eof new line
* add EOF new line check
* revert accidental deletion
* rename
2025-05-12 23:08:00 +02:00
LEVELcat
f1678fa7ca
oops...
2025-05-12 10:52:23 +03:00