Commit graph

214 commits

Author SHA1 Message Date
Dmitry
ab0d589756 merge remote wizden/master 2026-09-20 03:32:36 +07:00
_Svist_
a4341832aa
Fix space racism (#46083)
pr
2026-09-19 14:33:27 +00:00
Dmitry
73ffef2ac0 merge remote wizden/master 2026-09-17 23:33:06 +07:00
Whatstone
a023e5784c
Cleanup: Remove byte order markers from most files (#45796) 2026-09-17 23:23:54 +10:00
Princess Cheeseballs
2c6ffecf62
Move GameTicker to Shared (#45834)
* Scope creep my ass

* why was this shit not pushed????

* gone...

* fix that

* review plus buildd

* asfsafsafsafsafas

* grug

* burber

* I'll fix this later

* shrimply die

* also this

* it's snerf or snuthin

* assaads

* round snend

* aaaa

* fix this shit for real

* actually, don't start GameRules until MapInit now that I think aboot it.

* forgot u

* don't actually need this part nullable

* Deffer comp removal

* one liner

* do that too

* chungus

* Honestly makes more sense here, plus WHY are we doing all that shit on "GameRuleAdded" rather than GameRuleStarted(?)

* deferred removal :V

* aaaaaaaaaaaaaaa

* whhop

* Whoop

* better

* landmine that I placed for myself then forgot about lmao

* cleanup

* FUCKING `!`

* gotovo

* amogus

* please don't check by metadata I beg

* waawsasfdfsasfa

* sfafsasfafsas

* fdsaasffsasfa

* code

* fix

* fasasffasfasfsad

* chungaas

* I may be stupid

* gra

* graaaaaaaaaaaaaaaaa

* comment

* gra

* clearing is not predicted and would require major refactors, so don't cache on client.

* lame shit :P

* last holes

* nukeopsfsafsasafsfafsa

* why  was that shit public bruh

* bubrbgwahrghfaka

* dynamic

* revert change that did nothing lmao
2026-09-16 19:34:19 +00:00
Zekins
a125f350d5
TTS Extended (#3681) 2026-08-04 18:04:02 +07:00
Dmitry
816b7825ba merge remote wizden/master 2026-07-19 16:10:56 +07:00
Dmitry
40573ca2e4 fix 2026-07-19 14:17:14 +07:00
mq
09eb5d525e
Randomized Markings (take two) (#38528)
* preliminary porting

* weighting

* cleaning up after myself

* literally forgot to include this. oops

* apply more defaults and fix oversight that guaranteed humans would always be bald

* skincoloration

* did not actually mean to include vox in there oops!

* bugfix & performance

* macrocosm edits

* my yaml slop

* clean up some stuff i missed

* OOPS!

* ah fuck that should be further down shouldnt it

* yo mama

* req changes

* req changes 2

* yo mama

* my joker moment

* fixes

* move shit to engine

* wtf how did you get in there!!!

* array

* my dante's hell cosplay

* schmoovin

* adding portfiend cologne

* yep

* god dammit

* oops again

* uno mas

* req changes

Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>

* fix clamping logic

* test fix

---------

Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
2026-07-18 23:45:01 -04:00
Dmitry
cf0741df48 merge remote wizden/master 2026-07-15 01:46:23 +07:00
Falcon
0cb5a6d64f
fix: MemberwiseEquals on HumanoidProfileEditor now compares Voice (#44468) 2026-07-05 16:52:15 +00:00
Errant
73d674beca
Make default Job priority available in a cvar (#44120)
* cvar for job priority

* add captain to dev build serverconfig

* new characters created via the UI will now also read the cvar

* removed a testing change
2026-07-03 21:02:15 +00:00
Vladislav Suchkov
3a0aad1ff5
Add randomizer lock buttons to character editor screen (#44363)
* init

* tweak lightness

* add randomize helpers, refactor to use

* wip

* wip

* wip

* wip

* docs, cleanup

* review partial

* review wip (doesnt build)

* wip (now working, but found a bug)

* touchups

* less ambiguity

* Tweak the UI, make LockButton a BoxContainer

---------

Co-authored-by: AJCM-git <ajcm_mail@disroot.org>
2026-07-02 19:56:34 -04:00
Dmitry
740623bf13 fix tts t3 2026-07-03 01:47:00 +07:00
Dmitry
9ca71ff554 TTS fix t1 2026-07-02 12:50:30 +07:00
Dmitry
f8bc2e5786 merge remote wizden/master 2026-07-02 09:39:38 +07:00
Falcon
9805fe3956
Refactor voice to separate it from sex (#40593)
* feat: separate sex from voice

* wip: tried to make it use voice collection directly

* fix: yaml

* fix: migrations

* fix: ensure valid now validates correctly

* fix: unisex mobs wouldn't have voice

* chore: fix RT version

* refactor: clean up code into subfunctions

* refactor: swap name and protoId in voice

also rename sounds to voice

* chore: add comment

* fix: fallback sounds for non-humanoid characters

* fix: tests

* fix: tests

* refactor: change requests

* refactor: convert sheepers

* refactor: move Voice to SpeciesPrototype

* chore: add tests

* fix: test IoC error

* refactor: use null coalesing in ConvertProfiles

* refactor: move vocal sex association to speciesPrototype

* style: remove space from new()

* refactor: use name from emoteSoundsPrototype for UI

* refactor: no more null Voice on profile

* refactor: make DefaultVoice a static readonly property

* fix: add default voice to HumanoidProfileComponent

* chore: remove repeated vocal component from species yaml

It's inherited from BaseSpeciesMob

* style: correct comments for refactor

* fix: add missing locale for FemaleVulpkanin

* refactor: simplify logic based off surounding code

* test: add test to make sure that sexes are properly enumerated for the voices

* fix: add back urist sounds

* style: clarify comments again

* style: last thing im changing before I sleep

* refactor: battling programming semantics

* refactor: Name on EmoteSoundsPrototype.cs to VoiceSelectorName for clarity

* revert: isDirty change

* Fix HumanoidProfileTest.EnsureValidLoading.
    The profile's voice wasnt being updated, thus the voiceChanged event was never raised and that meant that the voice component had old EmoteSounds

* oops

* refactor: do the easy change requests

* refactor: use an array for indexing sex conversion for performance

* fix master

* mistakes were made

* chore: redo migrations

---------

Co-authored-by: AJCM-git <ajcm_mail@disroot.org>
2026-06-30 23:46:27 -04:00
Dmitry
110a8b5324 merge remote wizden/master 2026-05-21 15:29:28 +07:00
Atakku
b8519626ee
Fixed MaxLimit not being properly ignored when set to 0 (#41852)
* Fixed the issue

* Remove stray line
2026-05-18 21:16:17 +00:00
Zekins
438b5c8dda
Исправление Импорта (#3556) 2026-04-07 10:13:05 +07:00
Zekins3366
8f89358b4c spf 2026-02-01 04:35:15 +07:00
Dmitry
b7ea1a4028 comment bruh 2026-01-29 02:25:30 +07:00
Dmitry
c05780c5d3 merge remote wizden/master 2026-01-29 02:18:13 +07:00
pathetic meowmeow
4e9a456591
Drop ICharacterProfile/ICharacterAppearance interfaces (#42661) 2026-01-26 20:15:44 +00:00
Dmitry
994f743d2c repair TTS
2
2026-01-24 00:41:36 +07:00
Dmitry
17ca2dfc3e merge remote wizden/master 2026-01-22 01:52:20 +07:00
pathetic meowmeow
8cf744ec55
Visual nubody (humanoid appearance refactor) (#42476)
* initial visual nubody

* oops overlay

* im so pheeming rn

* conversion...

* tests

* comeback of the underwear

* oops eyes

* blabbl

* zeds

* yaml linted

* search and visible count constraints

* reordering

* preserve previously selected markings colors

* fix test

* some ui niceties

* ordering

* make DB changes backwards-compatible/downgrade-friendly

* fix things again

* fix migration

* vulpkanin markings limit increase

* wrapping

* code cleanup and more code cleanup and more code cleanup and more code cleanup and

* fix slop ports

* better sampling API

* make filter work + use the method i made for its intended purpose

* fix test fails real quick

* magic mirror cleanup, remove TODO

* don't 0-init the organ profile data

* remove deltastates

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2026-01-20 07:07:53 +00:00
Dmitry
6187a5a7bd merge remote stable wizden 2026-01-08 10:32:52 +07:00
Pieter-Jan Briers
787330f5c6
v269.0.0 RT update - .NET 10 (#41855)
* Make ServerPackaging automatically get extra server assemblies

* Make the switch

* Use Content.Server.deps.json instead

* Remove debug

* Rewrite

Now recursively fetches dependencies from Content.Server

Only copies dependencies not covered by Robust

This removes the need to manually specify most of the dependencies, even the content ones!

Also look at runtime key properly to figure out the proper dll name.

This actually removes some assemblies that were duplicated between the main directory and assemblies (various Microsoft.Extensions stuff)

* Fix test compile errors when updating dependencies

Ran across this while updating dependencies on the RT .NET 10 update. Should be fine to merge immediately.

* More .NET 10 prep

* Convert to SLNX

Hell yeah

* slnx now has size-2 indents

* Update SLNX with new RT system

* Remove reference to RT test in toolshed test

* Remove accidental usage of transitive RT dependencies

* Move Robust project references to RobustApi

* Update solution file

* Fix warnings in pow3r

* Fix nullable warnings in integration tests

idk where these came from

* gitignore binlog files

* Fix transitive dependency warnings in Content.Benchmarks

* Update slnx

* Okay, the Robust API thing didn't pan out. New plan.

It apparently broke clean builds, as the dependencies aren't in the project asset list or something anymore. I tried to fix this, but it seems impossible to do without relying on .NET SDK internals, as there's no point in the NuGet graph walk process that seems cleanly extensible.

Instead let's just do the much dumber thing: a bunch of .props files for content to import. Hooray!

This also means that I have to go through and *explicitly* disable transitive dependencies everywhere in RT. This thankfully isn't too hard.

* Update RT to 269.0.0

* One last solution update

* Fix more data definition issues

* Update RT to 269.0.1

* Fix it again

---------

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2025-12-22 01:24:24 +00:00
Dmitry
4f4b71e8de merge remote wizden stable 2025-12-22 00:33:29 +07:00
Pieter-Jan Briers
b4fa6f4a07
Fix loadout entity names not being exported/imported (#41891)
Fix entity names not being saved in loadouts.

Just missing a [DataField]
2025-12-18 09:13:35 +00:00
slarticodefast
4484f0f351
Fix prototypes so they pass analyzer checks (again) (AGAIN) (#41882)
fix
2025-12-17 18:15:49 +00:00
Dmitry
da0796d7d3 merge remote stable upstream 2025-11-10 21:59:58 +07:00
Atakku
abd9aec8bd
Implemented parenting and minimum default for loadout groups (#40861)
* Implemented parenting and minimum default for loadouts

* Fix a mistake

* Apply suggestion from @iaada

Co-authored-by: āda <ss.adasts@gmail.com>

* Implement @iaada's suggestion to rename MinDefault to DefaultSelected

* happy little accidents

* Moved Parents and Abstract fields to under ID, added inheritdoc

---------

Co-authored-by: āda <ss.adasts@gmail.com>
2025-10-27 22:33:56 +00:00
Dmitry
9d6fa7e57d upstream - merge remote "stable" 2025-10-13 20:59:28 +07:00
Absotively
096f998c3f
Fix species default skin tones (#40707)
fix so that all default Urist entities don't spawn with the same default human skin tone (cursed skin tone Urist McSlime)

(cherry picked from commit 8d9564c23856c342bc3a35834c462e659f5ebd5b)

Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
2025-10-05 20:53:58 +00:00
Dmitry
f01a60f5c7 upstream 9.1 2025-09-17 06:41:33 +07:00
Dmitry
5a40c9b8e5 Merge remote-tracking branch 'source/stable' into Upstream9 2025-09-12 11:17:32 +07:00
Errant
90662bc6ee
Merge branch 'master' into fix-conflict-40263 2025-09-10 19:52:34 +02:00
Princess Cheeseballs
fc36a7a7c8
[HOTFIX] Fix Loadout Validations (#40189)
p0 bugfix

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-10 19:31:12 +02:00
Pieter-Jan Briers
0c97520276
Fix usages of TryIndex() (#39124)
* Fix usages of TryIndex()

Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115)

This then resulted in TryIndex() getting modified to log errors (94f98073b0), which is incorrect as it causes false-positive errors in proper uses of the API: external data validation. (#39098)

This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.

Fixes #39115

Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.

* fix tests

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-09-09 18:17:56 +02:00
Centronias
c709d4d55c
Add CVar for disabling loadout item role timers (#36775) 2025-09-03 13:04:44 +02:00
Dmitry
57307b718c upstream master sync 2025-08-11 18:16:45 +07:00
Krosus777
e307fd69b0
HumanoidCharacterProfileFix (#39333) 2025-08-02 17:14:16 +02:00
Dmitry
60c835f02c master 21.7 syns 2025-07-21 00:27:46 +07:00
Tayrtahn
c565b44965
Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814)
* The easy ones

* For certain values of easy

* Easy test

* Hair

* Fix sandbox violations

* Sort usings
2025-07-07 21:57:05 +02:00
Dmitry
76f0d2d12b upstream syns 2025-06-19 15:45:02 +07:00
qrwas
f8cf4dc829
Add group for loadouts (#36951)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-06-16 02:36:06 -07:00
Dmitry
a6ecbc3410 Merge remote-tracking branch 'upstream/master' 2025-05-24 22:35:13 +07:00
YotaXP
e404e45ffc
Persist construction menu favorites server-side (#35867)
* Persist construction menu favorites to player profile

* Use `ProtoId`s for construction favorites

* Validate construction favorites updates from the client

* Actually await the async database call
2025-05-17 13:37:19 -04:00