VigersRay
31b2d24e30
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/MagicMirror/MagicMirrorComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/migration.yml
2024-07-31 03:54:09 +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
lzk
cac867fa6d
improve info about 🆑 symbol in pr template ( #30204 )
...
* Improve PR template
* fix typo
2024-07-22 12:56:48 +03:00
VigersRay
9b6a3b293c
Ну типа
2024-07-14 13:25:30 +03:00
VigersRay
5aaf638614
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Tools/gen_build_info.py
2024-07-14 12:24:06 +03:00
Pieter-Jan Briers
c1915c9d73
Remove outdated steps from Test Packaging workflow ( #30018 )
...
gen build info was removed in 5e800e0ece
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
VigersRay
bee5d0410f
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/LobbyUIController.cs
# Resources/Locale/en-US/chemistry/components/mixing-component.ftl
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Recipes/Crafting/crates.yml
# Resources/ServerInfo/Guidebook/Mobs/Diona.xml
# Resources/ServerInfo/Guidebook/Mobs/Species.xml
# Resources/ServerInfo/Guidebook/Science/Science.xml
# Resources/ServerInfo/Guidebook/Science/Technologies.xml
# Resources/Textures/Objects/Weapons/Melee/fireaxeflaming.rsi/icon.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/base.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/broadcasting.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/build.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/panel.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/speaker.png
# Resources/Textures/Structures/Wallmounts/intercom.rsi/unshaded.png
# Resources/Textures/Tiles/attributions.yml
# Resources/migration.yml
2024-07-11 14:05:37 +03:00
lzk
742290c606
Update map changes labeler ( #29858 )
...
Update labeler.yml
2024-07-09 23:35:31 +02:00
VigersRay
43e304e7cb
Обнова вики через воркфлоу
2024-07-01 20:06:06 +03:00
VigersRay
8fedc6f64a
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Options/UI/Tabs/AudioTab.xaml
# Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/SoundCollections/NukeMusic.yml
# Resources/Prototypes/lobbyscreens.yml
# Resources/migration.yml
2024-06-23 21:07:25 +03:00
metalgearsloth
0546c9bf64
Revert "Weapon Reflection Movement Mechanic ( #27219 )" ( #29326 )
...
* Revert "Weapon Reflection Movement Mechanic (#27219 )"
This reverts commit b90373356e
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
VigersRay
5245c5ddcb
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs
# Content.Shared/Preferences/Loadouts/RoleLoadout.cs
# Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
# Resources/Prototypes/InventoryTemplates/arachnid_inventory_template.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
# Resources/Prototypes/Loadouts/role_loadouts.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
# Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
# Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png
# Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png
# Resources/migration.yml
2024-06-21 05:04:06 +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
VigersRay
045e59b27f
disable publish.yml
2024-06-15 07:13:23 +03:00
VigersRay
dee924d570
Да здраствует GayBot
2024-06-15 07:09:09 +03:00
Vigers Ray
1e72ab8054
Пустой коммит ( #124 )
2024-06-14 23:22:10 +03:00
Vigers Ray
69fe4621b7
Update test_changelog.yml
2024-06-14 23:21:45 +03:00
Vigers Ray
db98137af4
Create test_changelog.yml
2024-06-14 23:21:31 +03:00
Vigers Ray
da02480279
Update automatic_changelog.yml
2024-06-14 22:52:49 +03:00
Rinary
35a35919fb
Ping for all PRs ( #110 )
2024-06-14 18:54:51 +03:00
Vigers Ray
9067d12008
Пустой коммит ( #122 )
2024-06-14 18:49:56 +03:00
VigersRay
d901eea937
Автообновление чейнжлога больше не вызывает воркфлоу
2024-06-14 18:45:56 +03:00
VigersRay
31dd47ae40
Фикс авточейнжлога
2024-06-14 18:38:37 +03:00
VigersRay
58e1a04290
Вариант с сохранением файла
2024-06-13 10:57:29 +03:00
VigersRay
2fa7ff57ad
Экранирование тела PR в авточейнжлоге
2024-06-13 10:51:41 +03:00
VigersRay
118a02056f
remove discord_changelog.yml
2024-06-13 03:52:18 +03:00
Vigers Ray
7538d7d063
Update update_changelog.yml
2024-06-13 03:25:46 +03:00
Vigers Ray
369d7269fc
Update update_changelog.yml
2024-06-13 02:01:25 +03:00
Vigers Ray
caf6248ae8
Update update_changelog.yml
2024-06-13 01:53:50 +03:00
Vigers Ray
0894bb3429
Update discord_changelog.yml
2024-06-13 01:51:23 +03:00
Vigers Ray
ba6867df55
Update discord_changelog.yml
2024-06-13 01:49:51 +03:00
Vigers Ray
8c2f4dec4c
Update discord_changelog.yml
2024-06-13 01:47:03 +03:00
Vigers Ray
711d8c6b28
Update discord_changelog.yml
2024-06-13 01:43:06 +03:00
Vigers Ray
2c75a5de18
Create discord_changelog.yml
2024-06-13 01:41:51 +03:00
Vigers Ray
d7f8ab716f
Update PULL_REQUEST_TEMPLATE.md
2024-06-12 23:46:23 +03:00
VigersRay
64e3a54caa
Ну с богом
2024-06-12 21:56:57 +03:00
VigersRay
a2683c03b5
Revert "фикс авточейнжлога"
...
This reverts commit 9b46b120e1
2024-06-12 21:45:52 +03:00
Vigers Ray
9b46b120e1
фикс авточейнжлога
2024-06-12 16:20:16 +03:00
Vigers Ray
9f6c404414
Правки update_changelog.yml
2024-06-12 16:08:03 +03:00
Vigers Ray
f7137f9068
фикс update_changelog.yml
2024-06-12 14:50:25 +03:00
Vigers Ray
0e00eb09d5
Create update_changelog.yml ( #64 )
2024-06-12 14:39:00 +03:00
Vigers Ray
a91550b12b
Merge remote-tracking branch 'origin/master'
2024-06-12 12:38:24 +03:00
Vigers Ray
a36d20c7c7
поддержка CLA в validate-rsis.yml
2024-06-12 12:35:15 +03:00
Babaev
760759b58c
Update PULL_REQUEST_TEMPLATE.md ( #63 )
2024-06-12 12:24:34 +03:00
Vigers Ray
df60cccba6
Update PULL_REQUEST_TEMPLATE.md ( #56 )
2024-06-10 20:22:43 +03:00
Rinary
986ced835f
Изменение шаблона пулл реквеста ( #48 )
...
* Vulpkanin Lang Fix
* PR TEMPLATE CHANGE
* No more english text
* Update PULL_REQUEST_TEMPLATE.md
* Update PULL_REQUEST_TEMPLATE.md
---------
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-06-09 00:34:25 +03:00
VigersRay
bdbda626b1
Вынес валидатор в Tools чтобы добавить CLA
2024-06-07 11:59:58 +03:00
Chief-Engineer
fea2bc9422
Update rules ( #28452 )
2024-06-05 19:59:22 -04:00
