Commit Graph

36 Commits

Author SHA1 Message Date
Ed
2201bb70dd end OBT 2025-01-26 00:10:08 +03:00
Ed
72279cee6b english OBT 2025-01-25 19:51:24 +03:00
Ed
4e59cff88e Update ContentLocalizationManager.cs 2025-01-19 00:41:26 +03:00
Ed
3221056384 fix eng loc 2025-01-19 00:40:54 +03:00
Ed
b5f70616c3 New lobby art (#748)
* lobby

* back to rus
2025-01-12 22:39:33 +03:00
Ed
3cce07be5a switch to eng 2025-01-12 17:10:27 +03:00
Ed
6331379213 swap to RU 2024-12-22 15:45:16 +03:00
Nim
868699a219 More beer, wine and ale (#686)
* more beer

* ru

* comoss fix update, loc change to eng

* Update dwarf.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
2024-12-18 17:37:06 +03:00
Ed
80be633aa1 Update ContentLocalizationManager.cs 2024-12-07 20:55:30 +03:00
Ed
2d54561a31 Update ContentLocalizationManager.cs 2024-12-07 12:41:51 +03:00
Ed
d67f7619c4 Edgefication (#590)
* bloat

* bloat 2

* bloat 3

* final bloat

* Update icon.ico

* Create integration_test_run.bat

* Arggh

* Disable some tests

* revert roomfill clearexisting changes
2024-11-18 14:40:52 +03:00
Ed
53df2848c4 Demiplan polishing v4 (#530)
* Wizden PR copy

* sync

* Update DungeonJob.PostGenBiome.cs

* Update DungeonJob.PostGenBiome.cs

* some rebalance

* required exits and enters!

* room fill fix

* snakes nerf

* enable En-US localization for playtest

* guidebook update

* hotfix!!!

* anchoring deletion

* trying fix caves

* Update RoomFillSystem.cs

* disable locations for test

* Update CP14SpawnRandomDemiplaneJob.cs

* Update required_layers.yml

* Revert "Update required_layers.yml"

This reverts commit 2dd33db282.

* finally

* Update ContentLocalizationManager.cs

* Update spawners.yml

* Update test.yml

* fix
2024-11-03 14:40:21 +03:00
Ed
51f4ec84d5 Demiplan polishing v3 (#529)
* Wizden PR copy

* sync

* Update DungeonJob.PostGenBiome.cs

* Update DungeonJob.PostGenBiome.cs

* some rebalance

* required exits and enters!

* room fill fix

* snakes nerf

* enable En-US localization for playtest

* guidebook update

* hotfix!!!
2024-11-02 17:46:19 +03: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
Stalen
0468c0f6bb Fix playtime formatting (#32974) 2024-10-28 19:00:37 +01:00
Ed
4425b77c90 Return RU lang 2024-10-14 11:39:12 +03:00
Ed
648505dc15 Switch to ENG language 2024-10-13 15:02:57 +03:00
Ed
468e3c9f69 Some issues (#452)
* possible UI theming fix

* gob blood

* filter guidebooks by Culture settings

* deleted lobby track
2024-09-23 18:34:04 +03:00
Ed
1f4b7f68bf Playtest polishing (#383)
* fix predicting sharpening

* finish shadow step

* tweak ice dagger

* shadow grab test

* fireball spell

* ice shards spell

* battle royale crates

* loot tables

* remove expedition ship

* dev update

* br map update

* spells tweak

* tips update

* some fixes

* biome forest spawner

* give keys to orgs

* mobs and aura spawners

* expedition update: goal, new ship, new map

* fix doors layers

* add new map proto

* translate keys

* Update crates.yml

* Update PostMapInitTest.cs

* fix spawning on expedition ship

* Fuck you, Randy. Remove nails

* fix lock systems

* localize tips

* some tweaks

* update ship, remove shrooms.

* fixes

* Update StationSystem.cs

* Revert "Update StationSystem.cs"

This reverts commit f632241324.

* Update expedition_test.yml
2024-08-05 15:22:14 +03:00
Ed
c8a90a74c0 Update ContentLocalizationManager.cs 2024-07-19 11:20:34 +03:00
Ed
dec6a1c2ca Ru localization update (#335)
* Update entities.ftl

* Update ContentLocalizationManager.cs

* Update ContentLocalizationManager.cs

* Update entities.ftl
2024-07-18 23:40:06 +03:00
Ed
e87994ae40 Localization clean up + temp eng switch (#325)
* Update ContentLocalizationManager.cs

* Update battle_royale_temp.yml

* Update basic-effect-reagent.ftl
2024-07-12 08:34:08 +03:00
Ed
04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
2024-06-17 14:20:38 +03:00
icekot8
a2affe3d00 add 👷 JobCondition system for reagents (#29023)
* hell 💀

* you're right

i'm dumb

* use the beautiful protoid and or in localization 🥩

* 🙏
2024-06-15 17:36:25 -04:00
Ed
70df945fe1 Elf species (#205)
* add elves names

* fix

* fix dwarf clothing preview

* elf!

* add marking locales

* fuck ss14 species

* Update SpeciesPrototype.cs
2024-06-03 23:50:05 +03:00
Ed
26957472ac localize eng name species generation 2024-06-02 15:32:55 +03:00
Ed
9520f63aa1 Merge remote-tracking branch 'space-station-14/master' into 29-04-2024-upstream
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
2024-04-29 16:28:04 +03:00
KrasnoshchekovPavel
199e05fb34 fixed formatting of floating point numbers during localization (#27441) 2024-04-28 21:52:35 -07:00
Froffy025
0601075e79 enTranslationHelp (#115)
* enTranslationHelp

* Update tiles.ftl

* Update human-facial-hair.ftl
2024-04-26 23:40:11 +03:00
Ed
4cd8fd6a07 hide all roles, add Adventure role, localization 2024-03-28 23:02:54 +03:00
Nemanja
766192f4b5 Use nav beacon locations for announcements (#26437)
* use nav beacon locations for announcements

* :thumbs_up:
2024-03-28 16:53:18 +11:00
Nemanja
cb98613450 fix chem guidebooks not displaying all damages (#19509) 2023-08-24 21:14:53 -05:00
Nemanja
b9fb66f005 Chem guidebook (#17123)
* im good at atomizing. welcome to half-finished chem guides.

* wagh

* e

* save work

* aa

* woweee UI

* finishing the last of it

* don't actually update the engine :(

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-06-04 15:45:02 -05:00
Visne
c6d3e4f3bd Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
metalgearsloth
007b079330 Fix some comp dirty / appearance warnings (#13193)
* Fix some comp dirty / appearance warnings

* also dis
2022-12-27 17:58:53 +01:00
Kara
7ad867fa0f Slight localization func cleanup (#11380) 2022-10-18 19:51:18 -07:00