74 Commits

Author SHA1 Message Date
Ed
3abb4d6051 Update ContentLocalizationManager.cs 2025-05-23 13:44:02 +03:00
Ed
59e6435fe2 Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Construction/UI/ConstructionMenuPresenter.cs
#	Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
#	Resources/Prototypes/Procedural/vgroid.yml
2025-05-12 14:25:42 +03:00
Pieter-Jan Briers
ffe130b38d Battery (SMES/substation) interface (#36386)
* Add ENERGYWATTHOURS() loc function

Takes in joules (energy), displays as watt-hours.

* Add simple OnOffButton control

* Re-add Inset style class

This was sloppily removed at some point?? Whatever, I need it.

* Add helper functions for setting title/guidebook IDs on FancyWindow

Reagent dispenser uses these, more in the next commits.

* Add BuiPredictionState helper

This enables me to implement coarse prediction manually in the battery UI.

Basically it's a local buffer of predicted inputs that can easily be replayed against future BUI states from the server.

* Add input coalescing infrastructure

I ran into the following problem: Robust's Slider control absolutely *spams* input events, to such a degree that it actually causes issues for the networking layer if directly passed through. For something like a slider, we just need to send the most recent value.

There is no good way for us to handle this in the control itself, as it *really* needs to happen in PreEngine. For simplicity reasons (for BUIs) I came to the conclusion it's best if it's there, as it's *before* any new states from the server can be applied. We can't just do this in Update() or something on the control as the timing just doesn't line up.

I made a content system, BuiPreTickUpdateSystem, that runs in the ModRunLevel.PreEngine phase to achieve this. It runs a method on a new IBuiPreTickUpdate interface on all open BUIs. They can then implement their own coalescing logic.

In the simplest case, this coalescing logic can just be "save the last value, and if we have any new value since the last update, send an input event." This is what the new InputCoalescer<T> type is for.

Adding new coalescing logic should be possible in the future, of course. It's all just small helpers.

* Battery interface

This adds a proper interface to batteries (SMES/substation). Players can turn IO on and off, and they can change charge and discharge rate. There's also a ton of numbers and stuff. It looks great.

This actually enables charge and discharge rates to be changed for these devices. The settings for both have been set between 5kW and 150kW.

* Oops, forgot to remove these style class defs.
2025-04-27 21:08:34 +10:00
Ed
7941be4490 dungeon walls resprite, fix TOSTRING problem from C4viwlle 2025-04-26 13:29:23 +03:00
Ed
7802a61b4c fix lang problem 2025-04-19 11:56:38 +03:00
Ed
b40cbfb5d7 Automatic Open tests (#1142)
* auto eng obt

* Update CP14RoundEndSystem.CBT.cs

* Update CP14EdSystem.cs

* cbt cbt!

* Update CP14RoundEndSystem.CBT.cs
2025-04-15 23:09:49 +03:00
Ed
aef6eb155e back to ru cbt 2025-04-13 21:06:44 +03:00
Ed
6f665266c4 s (#1179) 2025-04-13 15:37:00 +03:00
Ed
1573d1ee81 ru 2025-04-01 11:16:33 +03:00
Ed
655cba7674 April 2025 fool (#1109)
* Новый геймплей кузнеца и алхимика (#1084)

* anvilvat

Vat is now anvil

* deleted layers

* я даун

* тесты скажите что не так

* fuck documentation

* finally ok

* Alloys

* test not give up

* fix tests mk2 and anvil rename

* anvilgril

* FUCK TABS

* cattle

* meow

* the чистка

* armor

* fuck

* Update tags.yml

* ДА КАК ЭТО Я ВООБЩЕ БЛЯТЬ МОГ СДЕЛАТЬ НАХУЙ

* garde

* yes

* сохранить забыл

* голова потекла

* упс

* b

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Viator's april fools (#1091)

* uno reverse

* comos!

* desery special

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* [April Fools] Mob Pumpkin King!!! (#1092)

* MobPumpkinKing

* generation

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* asdsasdd (#1110)

* wait what???

* some fixes

* Поправка локализации на завтра (#1108)

* локаль

* упс

* Create TOPSECRET.xml

* Update entry.yml

* Update TOPSECRET.xml

* ч

---------

Co-authored-by: Deserty0 <86846189+Deserty0@users.noreply.github.com>
Co-authored-by: Viator-MV <egor44148@gmail.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
2025-04-01 00:05:46 +03:00
Ed
4bca807cd9 back to ru cbt 2025-03-17 14:57:37 +03:00
Ed
ff98037854 English OBT + Bugfixes (#1029)
* ts

* Test - without spawning at all

* Update coffin.yml

* Update CP14UniqueLootSystem.cs
2025-03-15 20:12:38 +03:00
Ed
47ea85ba21 back to ru + fix (#1021) 2025-03-13 13:30:52 +03:00
Ed
dcacd8f8da bugfixes and ENG OBT preparation (#1015)
* bugfixes and OBT preparation

* Update CP14CargoSystem.cs
2025-03-12 20:14:50 +03:00
Ed
2225de9ce4 switch to ru CBT 2025-03-01 14:13:46 +03:00
Ed
b8c2d662b6 English OBT setup (#956)
* fix

* Update Dev.toml
2025-02-28 20:18:28 +03:00
Ed
07e0606ecf Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
2025-02-23 23:07:55 +03:00
Ed
36916b0952 returns ru CBT 2025-02-22 00:51:50 +03:00
Ed
1c433ed581 Eng OBT (#930)
* fuck sociopath and grass seel position

* Update PostMapInitTest.cs

* fix

* en obt
2025-02-21 20:29:37 +03:00
Kyle Tyo
1d360956a7 made requested changes. 2025-02-17 01:58:40 -05:00
Kyle Tyo
0fbacd7dcb Update ContentLocalizationManager.cs 2025-02-16 23:06:28 -05:00
Kyle Tyo
f6fda97b72 I'm gonna do something drastic I swear. 2025-02-16 15:40:30 -05:00
Kyle Tyo
5ecb623e45 Update ContentLocalizationManager.cs 2025-02-16 15:35:44 -05:00
Ed
7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml
2025-02-16 11:58:47 +03:00
pathetic meowmeow
524a2182b0 Round up playtime minutes (#34961) 2025-02-08 07:12:58 +01:00
KittenColony
9ed582d7e4 Revert "EN playtest toggle (#851)" (#860)
This reverts commit fa989c7a22.
2025-02-08 16:46:26 +13:00
KittenColony
fa989c7a22 EN playtest toggle (#851)
* EN locale

* whitelist disable / locale readyup
2025-02-08 16:33:38 +13:00
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
Stalen
24f79c3ecc Fix playtime formatting (#32974) 2024-10-28 19:00:00 +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