Vigers Ray
|
4c2742b365
|
Merge remote-tracking branch 'space-wizards/master'
|
2025-02-10 04:33:51 +03:00 |
|
Pieter-Jan Briers
|
360794eb3a
|
Publishing workflow for Vulture Test server (#35009)
* Publishing workflow for Vulture Test server
* Remove dep install from workflow
Not necessary since changelogs don't happen
|
2025-02-09 20:48:10 +01:00 |
|
Vigers Ray
|
ad05977eba
|
ы
|
2025-02-05 18:42:02 +03:00 |
|
Vigers Ray
|
68b6999a15
|
ы
|
2025-02-05 02:44:42 +03:00 |
|
Vigers Ray
|
d4f7edec2c
|
ы
|
2025-02-05 02:43:01 +03:00 |
|
Vigers Ray
|
0b263f2df9
|
ы
|
2025-02-05 02:41:24 +03:00 |
|
Vigers Ray
|
1902c9ac8f
|
ы
|
2025-02-05 02:20:20 +03:00 |
|
Vigers Ray
|
89a90478ba
|
ы
|
2025-02-05 02:10:07 +03:00 |
|
Vigers Ray
|
519dd00108
|
ы
|
2025-02-05 02:04:28 +03:00 |
|
Vigers Ray
|
6132b73682
|
ы
|
2025-02-05 02:00:22 +03:00 |
|
Vigers Ray
|
74761b9309
|
Попытка не пытка
|
2025-02-05 01:39:11 +03:00 |
|
Vigers Ray
|
bcab36d8f5
|
Обновил update-wiki.yml на .NET 9
|
2025-01-18 04:07:25 +03:00 |
|
Vigers Ray
|
5c219f5105
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Connection/ConnectionManager.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/Roles/GhostRoleSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Resources/Locale/en-US/_strings/administration/antag.ftl
# Resources/Locale/en-US/_strings/advertisements/vending/pride.ftl
# Resources/Locale/en-US/_strings/mind/role-types.ftl
# Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
# Resources/Prototypes/Entities/Mobs/Player/dragon.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
|
2025-01-14 18:46:45 +03:00 |
|
Pieter-Jan Briers
|
3da354304d
|
Update submodule, .NET 9 (#34320)
|
2025-01-11 21:22:47 +01:00 |
|
Vigers Ray
|
95e80be571
|
s
|
2025-01-11 20:37:13 +03:00 |
|
Vigers Ray
|
4280be641d
|
ура
|
2025-01-11 09:27:30 +03:00 |
|
Vigers Ray
|
c2368f1966
|
s
|
2025-01-11 09:17:23 +03:00 |
|
Vigers Ray
|
5aafdefe33
|
s
|
2025-01-11 09:12:08 +03:00 |
|
Vigers Ray
|
eded10475b
|
ы
|
2025-01-11 09:11:01 +03:00 |
|
Vigers Ray
|
9353cad4a8
|
s
|
2025-01-11 09:07:04 +03:00 |
|
Vigers Ray
|
b0ef250ef8
|
ы
|
2025-01-11 09:06:53 +03:00 |
|
Vigers Ray
|
5bf020a995
|
ы
|
2025-01-11 08:43:52 +03:00 |
|
Vigers Ray
|
adb11ab3ce
|
ы
|
2025-01-11 08:22:39 +03:00 |
|
Vigers Ray
|
4e5b09f164
|
ы
|
2025-01-11 08:06:32 +03:00 |
|
Vigers Ray
|
123ad663fd
|
хмм
|
2025-01-11 07:57:11 +03:00 |
|
Vigers Ray
|
8b8639843e
|
ринари бля х2
|
2025-01-11 06:07:49 +03:00 |
|
Vigers Ray
|
993235f936
|
ринари бля
|
2025-01-11 05:54:33 +03:00 |
|
Vigers Ray
|
f2052d2094
|
Отрубил автолокаль вне основного репо
|
2025-01-11 05:49:23 +03:00 |
|
Rinary
|
b93c6f4e0e
|
Locale update (#1060)
* init
* some fixes
* fix validator
* translate implanters
|
2025-01-10 01:20:11 +03:00 |
|
Vigers Ray
|
0619ac9206
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
# .github/workflows/build-test-debug.yml
# Content.Client/Atmos/Consoles/AtmosAlarmEntryContainer.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Nutrition/EntitySystems/HungerSystem.cs
# Resources/Locale/en-US/_strings/atmos/gases.ftl
# Resources/Locale/en-US/_strings/components/atmos-monitoring-component.ftl
# Resources/Locale/en-US/_strings/tools/components/tool-component.ftl
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Research/industrial.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/Prototypes/ai_factions.yml
# Resources/toolshedEngineCommandPerms.yml
|
2024-12-21 18:51:37 +03:00 |
|
slarticodefast
|
984b29082d
|
Update PR size labeler line counts (#33915)
new numbers
|
2024-12-18 00:40:49 +01:00 |
|
Vigers Ray
|
1902038dd4
|
Update update-wiki.yml
|
2024-12-18 02:35:10 +03: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 |
|
Vigers Ray
|
aca6e6c473
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# Resources/Textures/Tiles/plating_burnt.png
# Resources/Textures/Tiles/steel_burnt.png
|
2024-11-29 00:28:18 +03: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 |
|
Vigers Ray
|
a55a740ba3
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
|
2024-11-22 06:44:44 +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 |
|
Vigers Ray
|
8d0ab85920
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Silicons/Laws/SiliconLawSystem.cs
# Resources/Locale/en-US/_strings/clothing/components/magboots-component.ftl
# Resources/Locale/en-US/_strings/singularity/components/generator-component.ftl
# Resources/Prototypes/Datasets/Names/borer.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
# Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml
# Resources/Prototypes/Recipes/Construction/Graphs/utilities/wallmount_substation.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
# Resources/migration.yml
|
2024-11-20 17:50:33 +03: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 |
|
Vigers Ray
|
fba2af74b3
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
# .github/labeler.yml
# .github/workflows/labeler-needsreview.yml
# .github/workflows/labeler-untriaged.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_parts.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/endoskeleton.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Recipes/Construction/Graphs/machines/cyborg.yml
# Resources/Prototypes/tags.yml
# Resources/ServerInfo/Guidebook/Science/Cyborgs.xml
# Resources/migration.yml
|
2024-11-15 14:52:30 +03: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 |
|
Vigers Ray
|
1b7bbaa986
|
фикс build-test-debug.yml
|
2024-11-13 12:23:25 +03:00 |
|
Vigers Ray
|
38889342ad
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
# Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
# Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
# Content.Shared/Weapons/Ranged/Components/GunComponent.cs
# Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs
# Resources/Audio/Machines/attributions.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Recipes/Lathes/medical.yml
# Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Thieves.xml
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/color.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/color.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/combat_knife.rsi/meta.json
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-left.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/inhand-right.png
# Resources/Textures/Objects/Weapons/Melee/survival_knife.rsi/meta.json
|
2024-11-13 04:35:52 +03: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 |
|
Vigers Ray
|
052584b7fe
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
|
2024-11-01 00:48:22 +03:00 |
|
Vasilis
|
2282e3c352
|
Revert #28358 (#33090)
|
2024-10-31 19:51:44 +01:00 |
|
Vigers Ray
|
b9a24ac10e
|
Merge remote-tracking branch 'refs/remotes/wizards/master'
|
2024-10-31 19:27:54 +03: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 |
|