juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,043 Commits 57 Branches 0 Tags
8564d878c370f788cfbe9008a85537deb3b114b3
Commit Graph

84 Commits

Author SHA1 Message Date
Ed
3409e0f752 Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Overlays/StencilOverlay.cs
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SkinColor.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
 2025-09-15 13:50:49 +03: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
slarticodefast
0ba5d036a2 improve spawnpoint error logging (#40021) 2025-08-31 11:50:37 -07:00
Ed
7a8326d41e Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream 
# Conflicts:
#	Content.Server/Audio/ContentAudioSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.cs
#	Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
 2025-07-08 00:40:30 +03:00
Tayrtahn
75db49f9c0 Clean up all missing EntitySystem proxy method uses (#38353) 2025-06-26 16:50:49 -07:00
Ed
62cd6bfe9b Merge branch 'master' into ed-10-06-2025-upstream-sync 2025-06-15 21:44:16 +03:00
Red
b24ec5bc80 Bugfixes (#1432) 
* fix #1428

* CodTenAlt review

* fix map tests

* real this time

* fix #1429

* add wheat and cotton into victorian gardens trade faction

* Update PostMapInitTest.cs
 2025-06-15 21:25:58 +03:00
Red
422a0c5e10 Gods and religions (#1405) 
* basic religion vision

* block god interactions

* skill tree mob specify

* silvania setup??

* clustering shader optimization

* gods department & job

* random gods jobs

* Luxian god

* Update Nature.png

* Update sphere_of_light.yml

* god chat

* Update ChatSystem.cs

* OBSERVATION

* public observation and basic follower api

* shader tweaks

* improve shaders

* spawning and praying on altars

* altars ppvs override

* move pvs overridiation from altars to observers

* shader coloration

* spectral z mover

* god magic radius restricted

* guide how to believe in god

* sends messages to god when smoeone wanna become follower

* follower doAfter

* goodbye luxian, welcome lumera

* goodbye silvania, welcome merkas

* som polish and renamings

* gods fast travel

* Update altar.ftl

* some lumera sfx

* renouncing patrons!

* renounce followers

* followewr percentage calculation

* remove from player-facing

* fix

* Update sphere_of_light.yml

* Update base.yml
 2025-06-13 14:15:48 +03:00
Southbridge
755ce6f59b Decal Spawners (#37066) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-05-27 16:55:48 -07:00
Tayrtahn
f4efaaeb72 Convert TimedSpawnerComponent to use an Update loop (#37785) 
Convert TimedSpawnerComponent to use an Update loop
 2025-05-24 19:35:17 +02:00
Nemanja
07e21c6516 Fix artifact spawns parenting to players (#36745) 2025-04-20 11:00:49 +10:00
Errant
93c7bdc134 Mind Role Entities (#31318) 
* Mind Role Entities wip

* headrev count fix

* silicon stuff, cleanup

* exclusive antag config, cleanup

* jobroleadd overwerite

* logging stuff

* MindHasRole cleanup, admin log stuff

* last second cleanup

* ocd

* minor cleanup

* remove createdTime datafield

* now actually using the event replacement I made for role time tracking

* weh
 2024-10-10 10:48:56 +02:00
metalgearsloth
635e800220 Reapply "Fix spawnpref" (#32018) (#32058) 
This reverts commit 119dd610fa.
 2024-09-10 22:23:24 -06:00
Emisse
119dd610fa Revert "Fix spawnpref" (#32018) 2024-09-09 23:58:20 +02:00
metalgearsloth
1088113bf8 Fix spawnpref (#31892) 2024-09-09 13:39:15 -06:00
metalgearsloth
f0615ec3c8 Fixup playerspawn stuff (#31546) 
* Fixup playerspawn stuff

- Also removed arrivals forcing, this should just turn containerspawnpoint off.

* fix this one

* test fix

* really fix
 2024-08-29 15:27:47 +10:00
metalgearsloth
99a41a12ab Fix PostMapInit tests not considering job containerspawns (#31538) 
* Fix PostMapInit tests nto considering job containerspawns

* fix
 2024-08-28 12:42:06 +10:00
Nemanja
437c861622 Entity Tables (EntitySpawnEntry replacement) (#30579) 
* Entity table code

* entity table examples

* fix dat shit

* access

* tests tests tests

* sloth review
 2024-08-09 22:12:40 -04:00
Plykiya
1d2b7131ab Meteors now leave behind a bit of ore (#30419) 
* Meteors that leave behind asteroid ore

* bigger offset

* Bit more generic

* Better defaults

* hrm?

* I HATE CUSTOM SERIALIZERS

* More comments

* renamed a variable

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-31 19:55:02 -07:00
IgorAnt028
5eb6425c42 A small addition to the documentation (#30506) 
* Completion of documentation

Comments have been added to ConditionalSpawnerComponent and RandomSpawnerComponent

* Appear fix

Some fixes with word "appear"
 2024-07-31 19:09:51 +03:00
Leon Friedrich
adeed705e6 Add Job preference tests (#28625) 
* Misc Job related changes

* Add JobTest

* A

* Aa

* Lets not confuse the yaml linter

* fixes

* a
 2024-06-06 00:19:24 +10:00
deltanedas
a3a1538d32 move gamerule components to shared (#28572) 
* move MinMax to shared

* cleanup MinMax

* move other ticking components to shared just because

* remove unused prototype file

* update everything to use shared components

* test

* test 2

* test 3

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-04 21:53:24 +10:00
Leon Friedrich
6235fa1ac6 Content changes for entity categories PR (#27232) 
* Content changes for entity categories PR

* Poke tests

* Why are tests suddenly working?
 2024-06-02 14:08:15 +10:00
Leon Friedrich
0f6e1196d8 Use non-generic TryComp() for metadata & transform (#28133) 2024-05-20 22:40:35 -07:00
Nemanja
161fd6c83c Mega Antag Refactor (#25786) 
* Mega Antag Refactor

* last minute delta save

* more workshopping

* more shit

* ok tested this for once

* okkkkk sure

* generic delays for starting rules

* well darn

* nukies partially

* ouagh

* ballin' faded and smonkin wed

* obliterated the diff

* Spread my arms and soak up congratulations

* I've got plenty of love, but nothing to show for it

* but there’s too much sunlight
Shining on my laptop monitor, so I
Can’t see anything with any amount of clarity

* ok this junk

* OOK!

* fubar

* most of sloth's review

* oh boy

* eek

* hell yea!

* ASDFJASDJFvsakcvjkzjnhhhyh
 2024-04-25 11:31:45 +10:00
metalgearsloth
12766fe6e3 Loadouts redux (#25715) 
* Loadouts redux

* Loadout window mockup

* More workout

* rent

* validation

* Developments

* bcs

* More cleanup

* Rebuild working

* Fix model and loading

* obsession

* efcore

* We got a stew goin

* Cleanup

* Optional + SeniorEngineering fix

* Fixes

* Update science.yml

* add

add

* Automatic naming

* Update nukeops

* Coming together

* Right now

* stargate

* rejig the UI

* weh

* Loadouts tweaks

* Merge conflicts + ordering fix

* yerba mate

* chocolat

* More updates

* Add multi-selection support

* test

h

* fikss

* a

* add tech assistant and hazard suit

* huh

* Latest changes

* add medical loadouts

* and science

* finish security loadouts

* cargo

* service done

* added wildcards

* add command

* Move restrictions

* Finalising

* Fix existing work

* Localise next batch

* clothing fix

* Fix storage names

* review

* the scooping room

* Test fixes

* Xamlify

* Xamlify this too

* Update Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Security/detective.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* ben

* Margins

---------

Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
 2024-04-16 22:57:43 +10:00
Tayrtahn
1e43980482 Clean up YAML issues in animals.yml (#26696) 
* Cleaned up YAML issues in animals.yml

* Cleaned up TimedSpawnerComponent
 2024-04-04 17:26:21 +11:00
LordCarve
aafe815122 Obsolete Logger cleanup for EntitySystems (#25941) 
* Small obsolete Logger cleanup

* Fixed three EntitySystem logs that weren't doing it right.
 2024-03-10 01:15:13 +01:00
778b
87def406bc Added ContainerSpawnPoint check for integration test (#25446) 
* Added logic for ContainerSpawnPoint checks

* Improved with template function

* fixed nullable

* hehe

* hehe T?

* added type check before cast

* another nullable fix

* and another one

* return to old code (found typo)

* Code cleanup

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-02-26 00:54:44 +11:00
Krunklehorn
ed0f2aa221 Client customization late-join spawner priority for arrivals/cryostorage (#24586) 
* Initial commit, requires server restart to take effect

* Exposes callbacks directly instead, takes effect immediately

* Cleaned up control flow, swapped cvar for client customization

* Switched to int, dictionary of callbacks, migration

* Update Content.Shared/Preferences/SpawnPriorityPreference.cs

* krunkle stan

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-02-01 21:12:09 +11:00
Krunklehorn
00c83844ac Changed spawn priority to arrivals -> containers -> points. (#24476) 2024-01-24 17:48:58 -07:00
Ed
b3b64e6cf2 The glowing forest anomaly (#24351) 
* sans

* Papyrus

* add to game

* tweak stick

* fixes

* Update Resources/Prototypes/Entities/Objects/Misc/kudzu.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2024-01-20 17:31:12 -08:00
Nemanja
017450ef17 fix cryosleepers deleting the station (#24143) 
* fix cryogenic units deleting the station

* ship it
 2024-01-15 23:10:52 -05:00
Nemanja
736b9dd7df Cryogenic Sleep Units (#24096) 
* Cryogenic sleep units

* pause map support

* no more body deletion

* Cryogenic Storage Units

* boowomp

* no more emag, no more dropping present people
 2024-01-14 23:35:28 -07:00
DrSmugleaf
6fce623981 Change SpawnerSystem to use SpawnAtPosition instead of Spawn (#22800) 2023-12-20 23:39:57 -07:00
DrSmugleaf
dc3b6e31b2 Fix Client RoleSystem not inheriting SharedRoleSystem, network job component (#21436) 2023-11-07 14:44:53 -08:00
deltanedas
e911c9e516 Rename SmokeDissipateSpawnComponent to SpawnOnDespawnComponent (#20782) 2023-10-10 22:34:51 -08:00
metalgearsloth
3a196a1d09 Move TimedDespawn to engine (#20515) 2023-09-30 14:35:32 +10:00
DrSmugleaf
15c0211fb2 Refactor minds to be entities with components, make roles components (#19591) 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2023-08-28 16:53:24 -07:00
Visne
c7b21b631b Remove unused dependencies (#19490) 2023-08-24 09:55:15 -08:00
DrSmugleaf
a88e747a0b Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Tom Leys
bc097c7b4d Teleport noobs off Arrivals shuttle to spawn (#17189) 2023-08-22 20:46:50 +10:00
Tom Leys
13b4bc2c56 Build a leaner list during spawn selection (#18597) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-08-05 21:51:25 +10:00
metalgearsloth
b478d5326b Remove component.Initialize calls (#18230) 2023-07-26 22:37:52 +10:00
metalgearsloth
68480af109 Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
Nemanja
59349b1b9b Gamerule Entities, Take 2 (#15765) 2023-04-25 20:23:14 -04:00
metalgearsloth
d3552dae00 Revert "Gamerule Entities" (#15724) 2023-04-24 16:21:05 +10:00
Nemanja
39cc02b8f9 Gamerule Entities (#15513) 2023-04-24 15:20:51 +10:00
DrSmugleaf
cf19015086 Remove spawn point component references (#15222) 2023-04-09 09:52:52 +10:00
metalgearsloth
9932fe5c07 Arrivals tweaks (#14773) 
Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
 2023-03-23 12:37:43 +11:00