juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,944 Commits 57 Branches 0 Tags
workbench-update
Commit Graph

223 Commits

Author SHA1 Message Date
Ed
a75ac73c70 Merge remote-tracking branch 'upstream/master' into ed-22-12-2024-upstream 2024-12-30 15:05:05 +03:00
crazybrain23
4e9862d01f Add crazybrain23 to CODEOWNERS (#34038) 
Add myself to CODEOWNERS

Basically just added myself where Nik was since I am also doing headmin things.
 2024-12-24 03:14:42 +01:00
Ed
4173d96d83 Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.IntegrationTests/Tests/ResearchTest.cs
#	Resources/Prototypes/Entities/Objects/Decoration/flora.yml
#	Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
#	Resources/Prototypes/Maps/Pools/default.yml
 2024-12-22 15:48:30 +03:00
slarticodefast
984b29082d Update PR size labeler line counts (#33915) 
new numbers
 2024-12-18 00:40:49 +01:00
Saphire
3fe576b4c9 Merge main and stable back together 2024-12-18 01:59:46 +06:00
Myra
fb6e85e87e Test can now run on stable prs (#33914) 
Make tests also run on stable and staging
 2024-12-17 20:40:57 +01:00
Ed
cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml
 2024-12-11 14:49:02 +03:00
slarticodefast
8bb4c82890 add "Changes: Audio" label to labeler (#33790) 
add audio label to labeler
 2024-12-09 11:56:30 +01:00
Myra
337952dcb4 Codeowners cleanup (#33297) 2024-12-08 01:01:57 +01:00
Myra
b53c8ea60e Approval labeler fix electric boogaloo (#33633) 
Nik told me to not name this "nya"
 2024-11-28 21:54:01 +01:00
Ed
677e5194d6 Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync 
# Conflicts:
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/Traits/TraitSystem.cs
#	Content.Shared/CCVar/CCVars.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/box.yml
#	Resources/Maps/core.yml
 2024-11-23 01:48:24 +03:00
Vasilis
4f703ae9ce Fix approval labeler (#33440) 
* Fix approval labeler

* Update labeler-review.yml

* Update labeler-review.yml
 2024-11-21 17:51:18 +01:00
Saphire Lattice
eebf06d9d6 Automatically add "Approved" to maintainer PRs (#33337) 
* Add an Approved labeler for maintainer PRs

* Be extra safe with conditions
 2024-11-20 12:03:52 +11:00
SlamBamActionman
75ec546550 Update Label workflows to use new labels (#33310) 
* Update labeler.yml

* Update labeler-needsreview.yml

* Update labeler-staging.yml

* Update labeler-stable.yml

* Update labeler-untriaged.yml

* Create labeler-size.yml

* Update labeler-size.yml

* Update labeler-size.yml

* Update conflict-labeler.yml

* Rename conflict-labeler.yml to labeler-conflict.yml
 2024-11-14 14:57:05 +01:00
Errant
b9685850fa Label workflow - staging (#33221) 2024-11-08 22:59:38 +01:00
Errant
41b84fc29d Label workflow - stable (#33220) 2024-11-08 22:59:27 +01:00
Vasilis
2282e3c352 Revert #28358 (#33090) 2024-10-31 19:51:44 +01:00
Vasilis
d446a3e8e9 Potencially fix approved labeler (#33083) 2024-10-31 16:05:42 +01:00
AJCM-git
f5e5646400 New workflow to apply the pr approved label (#28358) 
* New workflow to apply the pr approved label

* Maybe fix permissions
 2024-10-31 12:22:13 +01:00
Ed
ae3cbd6092 Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream 
# Conflicts:
#	Content.Server/Chat/Managers/ChatSanitizationManager.cs
#	Content.Server/Temperature/Systems/TemperatureSystem.cs
#	Content.Shared/Localizations/ContentLocalizationManager.cs
 2024-10-29 11:16:56 +03:00
Ed
dc47bb2283 Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
 2024-10-15 15:25:44 +03:00
lzk
9ceb971535 ping emisse for shuttle changes (#32768) 2024-10-14 14:06:32 +11:00
Jezithyr
570c166517 Disable Auto-Publish (#32627) 
disable auto publish
 2024-10-04 03:16:32 +02:00
Ed
1df3ed177b Merge remote-tracking branch 'upstream/master' into ed-27-09-2024-upstream 
# Conflicts:
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
 2024-09-27 10:22:05 +03:00
Ed
6b6a96e8d6 Create CP14Publish.yml 2024-09-25 00:08:42 +03:00
Pieter-Jan Briers
8322b1c2d1 New publish workflow for Robust.Cdn (#32222) 
This uses multiple API requests to directly send the publish to the CDN server, no more GitHub artifacts.

Faster, less moving parts.

Needs Robust.Cdn 2.2.0
 2024-09-18 15:28:09 +02:00
Ed
cc02a133e0 Merge remote-tracking branch 'upstream/master' into ed-17-09-2024-upstream2 
# Conflicts:
#	Content.Server/GameTicking/GameTicker.Spawning.cs
 2024-09-17 11:54:36 +03:00
Kara
7a6efeaba4 Properly credit contributors who were truncated by GitHub API (#31739) 
* Properly credit contributors who were truncated by GitHub's 500 email limit

* update list oops forgot my origin was so out of date

* another
 2024-09-09 13:31:27 -06:00
lzk
d5b9151680 Update PULL_REQUEST_TEMPLATE.md (#31046) 
* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md 2

* Update PULL_REQUEST_TEMPLATE.md 3

* Update PULL_REQUEST_TEMPLATE.md 3

* Update PULL_REQUEST_TEMPLATE.md 5

* slart suggestions

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* paste

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2024-09-08 18:57:39 +02:00
Ed
37a4068334 CLA license update (#429) 
* pupu

* Update LICENSE.TXT

* CLA

* CLA!

* Revert "CLA!"

This reverts commit f999e341a1.

* CLA2

* Update rsi.json

* CLA3

* Workbench sublicense
 2024-08-29 18:23:33 +03:00
Vasilis
c36b94316e Add PR guidelines checkbox to PR template (#30283) 
* Add PR guidelines checkbox to PR template

* Update PULL_REQUEST_TEMPLATE.md
 2024-08-02 16:02:24 +10:00
Ed
82d89a97f1 Create FUNDING.yml 2024-07-31 13:28:03 +03:00
Ed
fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
 2024-07-28 20:58:48 +03:00
deathride58
3a10ffa030 Makes the labeller automatically label PRs with shader changes (#30316) 
adds shader label to git labeller
 2024-07-28 13:46:22 +10:00
Ed
2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml
 2024-07-23 12:24:42 +03:00
lzk
cac867fa6d improve info about 🆑 symbol in pr template (#30204) 
* Improve PR template

* fix typo
 2024-07-22 12:56:48 +03:00
Ed
028c1ee478 Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream 2024-07-15 12:58:23 +03:00
Pieter-Jan Briers
c1915c9d73 Remove outdated steps from Test Packaging workflow (#30018) 
gen build info was removed in 5e800e0ece but I didn't realize this workflow also tested it. Gone now.
 2024-07-13 22:36:20 +02:00
Pieter-Jan Briers
5e800e0ece New CDN publish workflow (#30009) 
* LET'S SEE IF THIS WORKS

* I forgot the chmod +x

* I forgot the shebang
 2024-07-13 19:34:17 +02:00
Ed
0931c9e7d1 Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
 2024-07-12 12:53:42 +03:00
lzk
742290c606 Update map changes labeler (#29858) 
Update labeler.yml
 2024-07-09 23:35:31 +02:00
Ed
dbdb81381b Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml
 2024-06-30 11:18:30 +03:00
metalgearsloth
0546c9bf64 Revert "Weapon Reflection Movement Mechanic (#27219)" (#29326) 
* Revert "Weapon Reflection Movement Mechanic (#27219)"

This reverts commit b90373356e.

# Conflicts:
#	Content.Shared/Alert/AlertType.cs
#	Content.Shared/Weapons/Reflect/ReflectSystem.cs

* Add myself to codeowners

* Add myself to codeowners

* Also the alerts
 2024-06-22 22:16:08 -04:00
Vasilis
ae84889235 Don't add untriage lable if it has been labeled at issue creation (#29356) 2024-06-22 21:47:59 +02:00
Ed
3a910a7f7f Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
 2024-06-21 18:30:31 +03:00
Vasilis
81136648da Upgrade rsi-diff's changed files action | Make it only return rsi and png changes (#29185) 
It was brought up to me in https://github.com/space-wizards/space-station-14/pull/29179#issuecomment-2177140740 (and from a dm from them) that space bars can cause issues with the rsi bot.

Upon investigation its case we use "space-delimited" on the "get changes files" check. Which returns ALL changed files. Even if the change has nothing to do with png's or rsi's (example a downstream merging upstream)
 2024-06-19 10:27:12 +10:00
Ed
8ff09f552b Merge remote-tracking branch 'upstream/master' into ed-13-06-2024-upstream2 
# Conflicts:
#	Content.Client/Guidebook/GuidebookSystem.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Guidebook/GuideEntry.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/arenas.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/debug.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/marathon.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/reach.yml
#	Resources/Prototypes/Maps/saltern.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/lobbyscreens.yml
 2024-06-13 12:35:00 +03:00
Ed
5e78ac2c22 Revert "Ed 09 06 2024 upstream (#230)" 
This reverts commit 50470c3aaa.
 2024-06-11 15:20:47 +03:00
Ed
bb3c74d557 Revert "Revert "Ed 09 06 2024 upstream (#230)" (#233)" 
This reverts commit b89117f8e6.
 2024-06-11 15:19:52 +03:00
Ed
b89117f8e6 Revert "Ed 09 06 2024 upstream (#230)" (#233) 
This reverts commit 50470c3aaa.
 2024-06-11 15:19:27 +03:00