Vigers Ray
d0f5e8d361
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# .github/workflows/validate-rgas.yml
# .github/workflows/validate-rsis.yml
# Content.Client/Changelog/ChangelogTab.xaml.cs
# Content.Client/Humanoid/HumanoidAppearanceSystem.cs
# Content.Client/Options/UI/OptionsMenu.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Client/UserInterface/Systems/Ghost/Widgets/GhostGui.xaml.cs
# Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
# Content.Server/Mindshield/MindShieldSystem.cs
# Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
# Content.Server/Standing/StandingStateSystem.cs
# Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs
# Content.Server/VendingMachines/VendingMachineSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Humanoid/HumanoidAppearanceComponent.cs
# Content.Shared/Humanoid/Markings/MarkingManager.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Content.Shared/Implants/Components/SubdermalImplantComponent.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
# Content.Shared/VendingMachines/VendingMachineComponent.cs
# Resources/Audio/Lobby/attributions.yml
# Resources/Locale/en-US/_strings/administration/commands/forceghost.ftl
# Resources/Locale/en-US/_strings/clothing/components/fire-protection-component.ftl
# Resources/Locale/en-US/_strings/components/storage-voice-control-component.ftl
# Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl
# Resources/Locale/en-US/_strings/reagents/meta/physical-desc.ftl
# Resources/Locale/en-US/lathe/lathe-categories.ftl
# Resources/Prototypes/Access/command.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml
# Resources/Prototypes/Catalog/thief_toolbox_sets.yml
# Resources/Prototypes/Datasets/Names/Operation_prefix.yml
# Resources/Prototypes/Datasets/Names/Operation_suffix.yml
# Resources/Prototypes/Datasets/Names/arachnid_first.yml
# Resources/Prototypes/Datasets/Names/arachnid_last.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/Names/clown.yml
# Resources/Prototypes/Datasets/Names/diona.yml
# Resources/Prototypes/Datasets/Names/fake_human_first.yml
# Resources/Prototypes/Datasets/Names/fake_human_last.yml
# Resources/Prototypes/Datasets/Names/first.yml
# Resources/Prototypes/Datasets/Names/first_female.yml
# Resources/Prototypes/Datasets/Names/first_male.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/Names/hologram.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Datasets/Names/military.yml
# Resources/Prototypes/Datasets/Names/moth_first_female.yml
# Resources/Prototypes/Datasets/Names/moth_first_male.yml
# Resources/Prototypes/Datasets/Names/moth_last.yml
# Resources/Prototypes/Datasets/Names/mushman_first.yml
# Resources/Prototypes/Datasets/Names/mushman_last.yml
# Resources/Prototypes/Datasets/Names/ninja.yml
# Resources/Prototypes/Datasets/Names/ninja_title.yml
# Resources/Prototypes/Datasets/Names/regalrat.yml
# Resources/Prototypes/Datasets/Names/reptilian_female.yml
# Resources/Prototypes/Datasets/Names/reptilian_male.yml
# Resources/Prototypes/Datasets/Names/revenant.yml
# Resources/Prototypes/Datasets/Names/skeleton_first.yml
# Resources/Prototypes/Datasets/Names/syndicate.yml
# Resources/Prototypes/Datasets/Names/vox.yml
# Resources/Prototypes/Datasets/Names/wizard_first.yml
# Resources/Prototypes/Datasets/Names/wizard_last.yml
# Resources/Prototypes/Datasets/adjectives.yml
# Resources/Prototypes/Datasets/corporations.yml
# Resources/Prototypes/Datasets/criminal_records.yml
# Resources/Prototypes/Datasets/rat_king_commands.yml
# Resources/Prototypes/Datasets/verbs.yml
# Resources/Prototypes/Entities/Clothing/Head/specific.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml
# Resources/Prototypes/Entities/Mobs/Player/human.yml
# Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Entities/Mobs/Species/vox.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Misc/paper.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Stations/nanotrasen.yml
# Resources/Prototypes/Entities/Structures/Furniture/carpets.yml
# Resources/Prototypes/Entities/Structures/Storage/Closets/wall_lockers.yml
# Resources/Prototypes/GameRules/roundstart.yml
# Resources/Prototypes/Procedural/salvage_loot.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Prototypes/Recipes/Lathes/biogen.yml
# Resources/Prototypes/Recipes/Lathes/categories.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
# Resources/Prototypes/Species/arachnid.yml
# Resources/Prototypes/Species/diona.yml
# Resources/Prototypes/Species/moth.yml
# Resources/Prototypes/ai_factions.yml
# Resources/Prototypes/game_presets.yml
# Resources/ServerInfo/Guidebook/Mobs/SlimePerson.xml
# Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml
# Resources/ServerInfo/Guidebook/Service/Botany.xml
# Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/science.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-left.png
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/inhand-right.png
# Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/synd.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/capcap.rsi/meta.json
# Resources/Textures/Interface/Misc/program_icons.rsi/meta.json
# Resources/Textures/Objects/Misc/Lights/lights.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/carrot.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chanterelle.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/eggplant.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/gatfruit.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/lemon.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/onion_red.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/potato.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/sugarcane.rsi/meta.json
# Resources/Textures/Objects/Specific/Hydroponics/tomato.rsi/meta.json
# Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi/meta.json
# Resources/Textures/Objects/Specific/Robotics/cyborg_parts.rsi/meta.json
# Resources/Textures/Objects/Tools/spray_painter.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/grenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/nukenade.rsi/meta.json
# Resources/migration.yml
# Tools/actions_changelogs_since_last_run.py
2025-03-25 11:30:01 +03:00
imcb
231847a36d
Fixes and refactoring to discord changelog script ( #33859 )
...
* Fixes and refactoring to discord changelog script
Upstreamed from https://github.com/impstation/imp-station-14/pull/1023
* Add some prints back in
2025-03-11 20:14:40 +01:00
Vigers Ray
3fc11027a9
ыыы
2025-02-19 00:12:10 +03:00
Vigers Ray
70b4a9615e
Отдельныйскриптдляудалениядублейивыносскрыптовлокализациивотдельнуюдиректорию
2025-02-12 18:36:28 +03:00
Vigers Ray
617d1697d6
Скрипт для обновления локалии теперь удаляет дубли
2025-02-11 10:05:42 +03:00
Vigers Ray
8f3d01efdc
ы
2025-02-10 05:27:02 +03:00
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
Perl404
7505a1709a
[LOCALE] Locale validator 09.02.2025 ( #1312 )
2025-02-09 20:25:30 +03:00
Vigers Ray
220c97cd95
полезные и не очень скрипты
2025-02-05 03:55:44 +03:00
Vigers Ray
0354baf6c0
фикс паблиша
2025-02-05 03:55:23 +03:00
Vigers Ray
a9be9f194f
ы
2025-02-05 03:11:10 +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
6ae0593dfa
ы
2025-02-05 02:30:58 +03:00
Vigers Ray
1902c9ac8f
ы
2025-02-05 02:20:20 +03:00
Vigers Ray
5652ab0746
ы
2025-02-05 02:14:49 +03:00
Vigers Ray
626f076072
ы
2025-02-05 02:12:07 +03:00
Vigers Ray
89a90478ba
ы
2025-02-05 02:10:07 +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
af33bd21ab
фикс yamlextractor
2025-01-11 06:45:07 +03:00
Rinary
b93c6f4e0e
Locale update ( #1060 )
...
* init
* some fixes
* fix validator
* translate implanters
2025-01-10 01:20:11 +03:00
haiwwkes
be1efa2a81
a ( #892 )
2024-12-21 18:15:24 +03:00
Vigers Ray
01a01cce62
Увеличил лимиты чейнжлога
2024-12-05 14:54:21 +03:00
Vigers Ray
08021056aa
чейнжлог
2024-11-13 05:40:31 +03:00
Rinary
ad190f1865
Хирургия ( #607 )
...
* Surgery
* translate strings
* ru translate
* second ru translate
* fix
* fix pizza icon
* пу-пу-пу
* fix damageeeee
* fix
* fix x2)
2024-11-13 04:05:51 +03:00
Rinary
a85433e877
Новый антагонист: Вампиры ( #560 )
...
* Initial Commit
* Unfinished
* Continuing, more abilities
* Remove necromicon healing
* oops
* Continuing
* Continuing
* Checkpoint incase i need to undo something
* Rewrite to use event per power, working passives
* refactor fixes
* so many fixes
* some fixes
* some fixes
* new textures, status icon
* vampire antag role, mind role
* проверку на дауна вызывали?(если Null, у сервера ступор головного фатала)
* fix 1
* fix 2
* fix fatal, fix build
* breafing audio
* fix icons style, store in action
* clear store things, add gamerule, mid round game rule
* some rework
* clear any store systems
* clear x2
* if you have 150 Blood Essence, you get mutation
* upd
* some changes
* simple mutation menu
* я вот сижу, в 12 ночи, пишу какую-то очередную хуйню, вместо приятного сна...
* upd
* normal mutations menu
* actions translate
* None type, base actions list
* passive abilities
* ability earning
* fix
* translate vampire preset
* translate vampire mutations menu
* mutations menu textures
* disable some
* ДРАНЫЙ БРИФ ФАТАЛКУ ПО ПРИКОЛУ БЕЕМ
* game preset
* mutation can infinity changed
* fix
* fully rework abilities update system
* gargantua info
* update ignore list
* fix gargantua passives
* vampire objectives
* new icons
* balance
* fix
* upd objectives
* fix metabolizer type, balance 2
* fix metabolizer type 2
* fix syntax
* clear translation
* xd
* update
* round end info
* fix
* drain objective fix
* fix
* fix syntax
* fix
* clear
---------
Co-authored-by: Rainfey <rainfey0+github@gmail.com>
2024-10-31 19:06:01 +03:00
Vigers Ray
4082ffc4bc
Анимации в лобби. Кастомный выбор фона в лобби. ( #562 )
...
* Анимации в лобби
* анимации сущностями
* прототипы анимаций
2024-10-30 20:14:26 +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
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
b0ae6571da
Больше шлюзов ( #474 )
...
* before yaml lintering
* linter fix
* rsi validator fixes (there is 1 more bug)
* fucking...
Signed-off-by: pacable <igor.mamaev1@gmail.com>
* hidroponics
* upd
* upd
* try fix
* fix
* try fix x2
* holy shit
* fix
* upd airlocks
* add standart hidroponics
* fix loc
* fix
* fix en us
---------
Signed-off-by: pacable <igor.mamaev1@gmail.com>
Co-authored-by: pxc1984 <igor.mamaev1@gmail.com>
2024-10-10 20:10:26 +03:00
Rinary
18abfd962a
Апстрим локализации ( #460 )
...
* init
* upd
* fix
* fix
2024-10-07 01:17:51 +03:00
Rinary
9236906937
Апстрим локализации ( #398 )
...
* fix all handhelds
* fix pai portable camera monitor
* fix hohohonkersVend access
* init
* anomaly translate
* upd
* КровоМат here
* upd
* fix
* linter moment
2024-09-26 21:41:00 +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
b55366cf9b
chmod +x publish_multi_request.py ( #32274 )
...
Fuck.
2024-09-18 16:09:25 +02: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
675a9197f2
Easy IconSmooth spriting ( #32210 )
...
* фыр
* Update IconSmoothingTemplate README.txt
2024-09-18 11:41:24 +10:00
Rinary
64f1aed90c
Большие изменения ( #345 )
...
* init
* мать масштаба тарабанил
* fix
* upd
* upd
* upd
* upd
* upd
* console spam fix
* hohohohohohohooooonkeeeeeeeeeeeeeerrrrrrrrrrrsssssssss........
* fix
* fix
* upd
* upd
* some fixes
* fix
* upd
* upd translation for steal obj
* teg translate
* upd
* fix locale + add advertisements
* translate configurator
* Fully translate
* upd
* Я манал это переводить, позже переведу
* upd en-US
* fix Linter
* upd
* fix
* upd
* fix
* fix
* fix
* Возврат ПНТ
* remove agent non silent equipment
* add acid to uplink
* carrySystem new popups
* fix
* fix
* fix disease locale
* add Disease Guide
* upd locale
* upd
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 4130d241fc47fb80924c0dd3b9c9a2db85af8a25, reversing
changes made to 30abf7341ecce404f61f64e2000ad327964fcb00.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 4e5a50d21c29be8482f31e49db253b1ed17a0ae4, reversing
changes made to 449cd7bfd50f29eb653e68ba60e3f0b9310f0443.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit a4679665ef441d4b63a92dc3c4e217e2cdedbc16, reversing
changes made to a80ef96cfbbc3cc737045e41a2f063a0910bf1ce.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 94f585756bb27d10a1be7fab1f340d79b7c0a213, reversing
changes made to 906d18a3f66eaed73f3a894d70971872904fad4e.
* Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit d0a7c6436ba5c175b0e00d69f495ba51f9aac645, reversing
changes made to e7933332274b336af1fc2a960264bc546c95d208.
# Conflicts:
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
* fix
* upd
* upd
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 042a3f112bbc32a622108475ac28081eb0bbbf9f.
# Conflicts:
# Content.Server/Dragon/DragonRiftSystem.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
# Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Server/_Sunrise/NPCSleep/NPCSleepSystem.cs
# Resources/Changelog/Changelog.yml
# Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
# Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Head/helmets.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml
# Resources/Prototypes/Loadouts/loadout_groups.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/core.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/Prototypes/Store/categories.yml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Security/Defusal.xml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/migration.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 2860e1d217a71be0c29684e020b2278c3f08685f.
# Conflicts:
# Resources/Changelog/Changelog.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 0dc7ea17e23d844ce93118db7812b844e36dda4f.
# Conflicts:
# Resources/Changelog/Changelog.yml
# Resources/Prototypes/Hydroponics/randomMutations.yml
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 439926b3c60e95cc2e701d84a032b17471a7c18e.
* Reapply "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into misc"
This reverts commit 14160ab99909bf6b6f996f415d9dcfd5d4addbba.
# Conflicts:
# Resources/Changelog/Changelog.yml
* fix
* upd
* upd uplink
* upd
* fix linter
2024-09-16 19:05:38 +03:00
VigersRay
aa38c32b65
upstream
2024-09-16 12:40:23 +03:00
pacable
5d4d8c0039
большой респрайт всего ( #368 )
...
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-09-16 11:06:09 +03:00
Myra
0df531970b
Make the pr link more visible in the changelog bot ( #32047 )
2024-09-12 00:15:06 +02: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
Rinary
74e733ef4f
Рефактор Локализации + Фиксы ( #339 )
...
* init
* fix
* upd scripts
* trying to rework syntax finder
* upd
* upd
* upd
* transate AI
* upd
* upd
* upd
* fix
* translate
* upd
* ай бля
* fix
* upd
* upd
* fix
2024-08-30 20:11:33 +03:00
Rinary
066eba13a0
Апстрим перевода ( #327 )
...
* перевод гайдбука воришки
* Ура, меня роняли в детстве
* ЯО dudes
* Бедность
* Злодей Британец
* Безмозглики
* Какие-то агенты
* Viva la revolución!!
* кто эти ваши антагонисты?
* он уже не слаймируется
* Капитан судна тут
* upd
* upd
* upd
* upd
2024-08-28 22:28:37 +03:00
Rinary
520aac8a6f
Опять Перевод/Фиксы ( #320 )
...
* init
* some upd
* upd
* upd
* fix
* Update southern.ftl
* fix
2024-08-28 18:15:49 +03:00
VigersRay
33c17836bb
Merge remote-tracking branch 'origin/master'
2024-08-22 06:29:57 +03:00
