Vigers Ray
46d1ed8cc6
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/labeler.yml
# Content.Client/Lobby/LobbyUIController.cs
# Resources/Locale/en-US/_strings/movement/pulling.ftl
2024-12-09 23:32:58 +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
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
Vigers Ray
389ed704e1
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
# Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
# Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
# Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Resources/Audio/Ambience/Antag/attributions.yml
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
# Resources/Locale/en-US/_strings/shuttles/commands.ftl
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
# Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# RobustToolbox
2024-10-30 13:26:32 +03:00
Rinary
a65c01471a
Плюшки ( #568 )
...
* plushie lu + no PAPICH
* agata
* плюшевый милос-танка
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* locale
---------
Signed-off-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: pacable <igor.mamaev1@gmail.com>
2024-10-30 11:45:42 +03:00
Rinary
612f8ca9aa
Фикс всей локализации ( #496 )
...
* cargo product loc
* first cargo product translate
* second cargoproduct translate
* roadmap has optional localization
* upd
* 2024 roadmap translate
* full ru roadmap goals translate moved to russian loc
* translate some roadmap 2025
* roadmap fully translate
* holidays translate
* donation plinks rework
* translate categories
* translate planet prison objective
* translate evil twin objectives
* translate fugitive objectives
* fix planet prisoner dir
* upd
* no more planet prison dir
* partial toys translate
* fully translate toys
* lockbox loc fix
* fix Suntick loc
* fix tape loc
* borg modules translate
* translate borg tools and nanopaste
* upd
* boombox translate
* translate pda's and hand_teleporter
* reinforcement radio translate
* donation plinks translate
* barber items translate
* tape player translate
* ID cards translate
* computers translate
* translate corporate laws
* pepper spray translate
* flippo lighter translate
* magistrat's rubber stamp translate
* translate some ammunition
* clear no need desc
* translate SMGS
* fix
* Finaly guns translating
* translate clocks
* translate misc
* some cloaks translate
* fully cloaks translate
* belts translate
* translate all masks
* translate boots
* all backpacks translate
* glasses translate
* gloves translate
* bras translate
* fix rsi validator
* translate jumpskirt's
* jumpsuits translate
* security pilot's jumpsuit translate
* translate hardsuit helmets
* translate hood
* hats translate
* helmets translate
* men's underpants translate
* translate women's pants
* hardsuits translate
* fix pant desc
* translate armor
* translate coats
* translate captain's overcoat
* socks translate
* big boxes translate
* translate lockers
* power translate
* translate barber pole
* poster translate
* translate chairs
* translate vending_machines
* translate pacificator
* translate computers
* clowns ghost role translate
* translate eviltwin ghost role
* translate predator name
* another player species translate
* translate foliant
* translate borg chassis
* shuttle markers translate
* translate job spawners
* ghost roles spawners translate
* actions translate
* stacks translate
* some fixes
* uplink catalog fully translate
* return hypo on uplink
* sponsor uplink catalog translate start
* new sponsor uplink translation
* fully translate sponsor uplink catalog
* translate lockers
* translate kits
* translate syndicate boombox bundle
* predator organs translate
* body prototypes translate
* humanoid xeno organs translate
* predator body parts translate
* xenomorph body parts translate
* tajaran body parts translate
* translate disease
* species translate
* translate speech emotes
* upd
* translate frontier rules
* translate lust rules
* translate default rules
* crafting translate
* holy shit, last fixes
* no checks if you not changes prototypes
* fix
* fix linter
* fix sponsor uplink catalog
* second fix
* fix socks
* last fix
* xd
* fix
* upd locale, ALL En-US prototypes translated
* upd
* upd locale validator, checks for non lokalized strings in ru-RU
* some translations
* clear
* gaaaaaaaaaay pin
* upd
* upd
* fix
* fix linter
* translate toys
* translate
* upd
* fix
* upd
* fix
* fix linter
* upd
* fix
* better construction graph translation
* start reworking construction menu translation
* some new translations
* fix
* upd translations
* пу-пу-пу
* fix
* upd
* upd, sunrise strings in en-us
* upd
* translate voice-mask
* translate guns
* energy gun translate
* server info translate
* bar signs translate
* translate ui tabs
* translate reagent effect
* translate revenant-catalog
* translate categories
* general translate
* friends translate
* Sponsor uplink fixes|Translate
* some fixes
* translate Security, Hos, QM sponsor uplink
2024-10-30 10:04:15 +03:00
lzk
9ceb971535
ping emisse for shuttle changes ( #32768 )
2024-10-14 14:06:32 +11:00
Rinary
f6c53358f8
Правки в валидаторе локализаций ( #494 )
...
* upd
* upd
* fix path
* NO YAML PARSER ZAEBALA SHLUHA
* План, как видеть все пр-ы где изменяют локализацию
* new labeler
* no more ru symbols in ghost role component
* upd
2024-10-12 17:39:13 +03:00
Rinary
75ea945a2d
Валидатор локализации ( #491 )
...
* init
* fix capitulation
* fix path
* fix tags
* upd
* пустой коммит
* fix !type:
2024-10-11 19:38:18 +03:00
Rinary
69a89c1734
Валидатор Локализации ( #489 )
...
* init
* fix capitulation
* fix path
* fix tags
2024-10-11 19:19:07 +03:00
Rinary
d3094b7cb5
Исправления ( #488 )
...
* init
* fix en us
* translate Labels
* last fix
2024-10-11 17:11:41 +03:00
Jezithyr
570c166517
Disable Auto-Publish ( #32627 )
...
disable auto publish
2024-10-04 03:16:32 +02:00
Rinary
d6a4be4c2e
Upd issues ( #421 )
...
* upd feauture-request
* report issue upd
* disable wizards links
* fix build test debug
2024-09-30 16:22:11 +03:00
VigersRay
47cdabdaed
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Shared/StatusEffect/StatusEffectsSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/_strings/anomaly/inner_anomaly.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml
# Resources/ServerInfo/Guidebook/Service/FoodRecipes.xml
2024-09-19 16:09:00 +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
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +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
VigersRay
339f517a91
нет
2024-08-15 02:14:10 +03:00
VigersRay
c2101e5c47
Я ЕБАЛ
2024-08-08 08:22:38 +03:00
VigersRay
c0ee7e3cc9
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Client/Lobby/LobbyUIController.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs
# Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
# Content.Server/Administration/Systems/BwoinkSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs
# Content.Shared/Roles/JobRequirements.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml
# Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml
# Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml
# Resources/Prototypes/Loadouts/Jobs/Command/captain.yml
# Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml
# Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml
# Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml
# Resources/Prototypes/Loadouts/Jobs/Security/detective.yml
# Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/Jobs/Security/warden.yml
# Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
# Resources/Prototypes/Recipes/Lathes/medical.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/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json
# Resources/Textures/Structures/Power/apc.rsi/base.png
# Resources/Textures/Structures/Power/apc.rsi/broken.png
# Resources/Textures/Structures/Power/apc.rsi/display-charging.png
# Resources/Textures/Structures/Power/apc.rsi/display-full.png
# Resources/Textures/Structures/Power/apc.rsi/display-lack.png
# Resources/Textures/Structures/Power/apc.rsi/display-remote.png
# Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png
# Resources/Textures/Structures/Power/apc.rsi/frame.png
# Resources/Textures/Structures/Power/apc.rsi/static.png
2024-08-05 17:22:05 +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
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
