Morb0
|
1b513f0c1a
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Tiles/attributions.yml
|
2023-08-29 05:58:14 +03:00 |
|
DrSmugleaf
|
d1eea3f6f6
|
Update CI to use .NET 7.0.x, setup-dotnet 3.2.0, checkout 3.6.0 (#19552)
|
2023-08-25 15:33:01 -07:00 |
|
DrSmugleaf
|
f9c3e6e00c
|
Add CI workflow to build and run the map renderer on the Dev map (#19548)
|
2023-08-25 14:57:00 -07:00 |
|
Morb0
|
5277dceed2
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/CODEOWNERS
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
|
2023-08-24 22:01:46 +03:00 |
|
Moony
|
baf7af05a4
|
Update issue templates (#19458)
|
2023-08-23 16:50:49 -05:00 |
|
Moony
|
b61b0e1fd2
|
Update CODEOWNERS (#19457)
|
2023-08-23 16:23:06 -05:00 |
|
Kevin Zheng
|
d31c79fa59
|
Update pull request template (#18900)
|
2023-08-18 09:22:00 -08:00 |
|
faint
|
6cdde107bb
|
Update CODEOWNERS (#19173)
|
2023-08-15 14:44:56 +02:00 |
|
Morb0
|
1f35458078
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Player/diona.yml
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/broken.png
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/meta.json
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/normal-unshaded.png
# Resources/Textures/Structures/Machines/VendingMachines/discount.rsi/off.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/dark_plastic.png
# Resources/Textures/Tiles/plastic.png
# Resources/Textures/Tiles/steel_dirty.png
# Resources/Textures/Tiles/white_plastic.png
|
2023-08-05 05:10:09 +03:00 |
|
Leon Friedrich
|
5a9317027f
|
Warn on improperly disposed tests. (#18594)
|
2023-08-03 13:07:21 +10:00 |
|
Nemanja
|
e7b74ca3e7
|
Add EmoGarbage to codeowners (#18424)
* I own the code, the game is mine!
* scrunkle dan
* dunckle gran
|
2023-07-29 09:42:37 -04:00 |
|
Morb
|
7167fdb504
|
Disable Discord changelog (#1205)
|
2023-07-13 18:56:54 +03:00 |
|
faint
|
31f283cc8e
|
Merge remote-tracking branch 'wizards/master' into upstream-sync
|
2023-07-04 03:14:11 +03:00 |
|
Pieter-Jan Briers
|
7bfc322ff2
|
Publish changelogs via RSS (#17788)
|
2023-07-02 14:18:39 +02:00 |
|
Chief-Engineer
|
2d9d27c1b2
|
Add Chief-Engineer to code owners (#17296)
|
2023-06-13 01:27:10 -05:00 |
|
faint
|
d79c0f0a6c
|
CODEOWNER's ServerInfo assigment fix (#17221)
|
2023-06-08 20:54:24 +02:00 |
|
faint
|
3fdb5c1076
|
CODEOWNERS now contains .ftl files assigment (#1100)
|
2023-05-28 18:15:37 +03:00 |
|
Morbo
|
8febc3aac2
|
Copy secrets directories recursively
|
2023-04-16 11:09:13 +03:00 |
|
Morbo
|
cb971528e1
|
Just copy secret folders
|
2023-04-16 11:07:28 +03:00 |
|
Morbo
|
4efe21b213
|
Correct secrets setup
|
2023-04-16 10:55:20 +03:00 |
|
Morbo
|
8dec7bafe9
|
Call prototypes secret directory setup
|
2023-04-16 10:26:54 +03:00 |
|
DrSmugleaf
|
25bb9c0470
|
Add Emisse to CODEOWNERS for maps (#15416)
|
2023-04-14 13:22:14 -07:00 |
|
Morbo
|
60dd232b44
|
Ignore IanComradeBot in workflows
|
2023-04-04 15:40:13 +03:00 |
|
DrSmugleaf
|
ead0352fd1
|
Remove Vera from CODEOWNERS (#14970)
|
2023-03-29 17:19:25 -07:00 |
|
Morbo
|
a33dfe1de8
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/ISSUE_TEMPLATE/config.yml
|
2023-03-11 07:49:26 +03:00 |
|
Pieter-Jan Briers
|
497be5a470
|
Project files CI changes (#14466)
|
2023-03-10 11:58:57 -08:00 |
|
Visne
|
b5b619d51a
|
Add SECURITY.md (#14551)
|
2023-03-09 16:01:40 -06:00 |
|
Morbo
|
82a466f4ff
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
# Resources/Audio/Announcements/license.txt
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
|
2023-03-07 18:54:29 +03:00 |
|
Moony
|
028fa395d8
|
fix bors config (#14389)
i did an oops
|
2023-03-04 23:56:55 +00:00 |
|
Moony
|
7232bf4ba4
|
Configure and enable bors (#14383)
* Update build-test-debug.yml
* Update build-test-release.yml
* Update test-packaging.yml
* Update validate_mapfiles.yml
* Update yaml-linter.yml
* Update validate-rsis.yml
* Update validate-rgas.yml
* Create bors.toml
|
2023-03-03 22:55:05 -06:00 |
|
Morbo
|
cdaecf70bc
|
Add translation api secret to workflow
|
2023-03-01 14:11:34 +03:00 |
|
Morbo
|
0e5004268b
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/workflows/publish.yml
|
2023-02-28 20:00:24 +03:00 |
|
Pieter-Jan Briers
|
587e173bcc
|
Oopsied the workflow file, awesome. (#14293)
|
2023-02-26 17:48:06 +01:00 |
|
Pieter-Jan Briers
|
61a671bbc6
|
Send changelog to Discord webhook. (#14292)
|
2023-02-26 17:45:06 +01:00 |
|
Morbo
|
b93625f808
|
Fix publish workflow
|
2023-02-20 05:27:21 +03:00 |
|
Morb
|
fdfafd06e7
|
Add evil twin + Secrets (#823)
|
2023-02-18 23:49:55 -08:00 |
|
Morbo
|
8cdd0cda60
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Server Info/Guidebook/Controls/Controls.xml
|
2023-02-12 03:57:54 +03:00 |
|
Moony
|
202680ac56
|
Enable merge group checks for our workflows. (#14005)
* Enable merge group checks for our workflows.
* Update build-test-release.yml
* Update validate-rgas.yml
* Update validate-rsis.yml
* Update validate_mapfiles.yml
* Update yaml-linter.yml
* Update test-packaging.yml
|
2023-02-09 16:35:34 +00:00 |
|
Morbo
|
8bff10af81
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
|
2023-01-27 21:05:54 +03:00 |
|
metalgearsloth
|
0e8b8c0735
|
Don't run gh actions on draft prs (#13706)
|
2023-01-26 14:37:28 -08:00 |
|
Morbo
|
6b8912167b
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/Afk/AFKSystem.cs
# Resources/Prototypes/Maps/marathon.yml
|
2023-01-13 05:38:06 +03:00 |
|
DrSmugleaf
|
098074fb61
|
Reword the PR template to be more concise (#13420)
|
2023-01-11 23:48:19 -07:00 |
|
Visne
|
a4725ef58e
|
Improve issue template (#13379)
Since Markdown doesn't work in that menu anyways.
|
2023-01-10 22:39:54 +11:00 |
|
Morbo
|
88d2445740
|
Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
# Resources/Prototypes/Maps/origin.yml
|
2023-01-01 01:21:40 +03:00 |
|
metalgearsloth
|
033e87aa3b
|
Don't run CI For PJBot (#13188)
I have no idea what I'm doing
|
2022-12-26 17:37:57 -06:00 |
|
wrexbe
|
741c5a3c60
|
Remove self from test co-owner (#13131)
|
2022-12-21 06:13:10 -08:00 |
|
Morbo
|
6343d1e1f8
|
Merge remote-tracking branch 'upstream/master' into master-syndie
# Conflicts:
# Content.Server/Chat/Managers/ChatManager.cs
# Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
|
2022-12-20 14:15:13 +03:00 |
|
Pieter-Jan Briers
|
14f8b4e6d5
|
Use new validate-rsis for workflow (#12997)
* Use new validate-rsis for workflow
* A
* Add python deps
* --ignore-installed
* Make it only work on RSI changes again.
* Fix a bunch of RSIs.
|
2022-12-20 06:31:17 +01:00 |
|
Kara
|
a5d25fc75a
|
Condense PR template a bit (#13021)
|
2022-12-13 16:37:17 -08:00 |
|
Morb
|
2f365fc41a
|
GitHub files update (#633)
|
2022-12-10 22:48:56 -08:00 |
|