juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,652 Commits 57 Branches 0 Tags
581ca2f5efefe8aeb53397af1f02bdf52012abea
Commit Graph

9378 Commits

Author SHA1 Message Date
Red
f6dd89ea7a d (#1351) 2025-06-01 21:55:20 +03:00
Red
5c5a473ec0 More merchant content (#1349) 
* energy crystals

* thaumaturgy trading
 2025-06-01 19:21:41 +03:00
Red
a3ae67a762 Trade reputation rework + Merchants back + Mining contract (#1347) 
* refactor unlocking

* fix contract debug crashing

* Update dev_map.yml

* bugfixes and content rebalance

* ore buy contract
 2025-06-01 15:10:36 +03:00
Red
a99f2fcd50 Remove random reaction system (#1345) 
* wow

* d
 2025-06-01 15:01:32 +03:00
Ed
f78b1e07c5 cs fix, demiplane fix 2025-05-30 13:28:08 +03:00
Ed
5e6d1d0b3a dungenore wawa 2025-05-29 22:14:14 +03:00
Red
7642f49b00 Merge branch 'master' into ed-27-05-2025-upstream-sync 2025-05-29 00:50:36 +03:00
Red
cde388f5dd Another Merchant gameplay attempt (#1308) 
* setup UI

* setup debug data

* graph control setup

* reputation trade component

* unlocking logic

* smoe real reputation costing

* remove sponsors part, add trading specific UI nodes

* port to default pricing system

* buy cooldown

* fuck off trading cabinets

* real good cooldown UI

* Cool unlock sound

* reputation earning

* cool purchare sound

* coin & sprite work

* delete old guidebooks

* cool purcharing VFX

* better ui

* victoria gardens

* Update migration.yml

* Update migration.yml

* cooldown removed

* contracts

* Update migration.yml

* remove CP14Material

* materials appraise

* food appraise

* auto economy pricing system

* alchemy reagents appraise

* coins resprite

* alchemy appraise 2

* modular weapon appraise

* selling platform

* Update PricingSystem.cs

* Update CP14TradingPlatformSystem.cs

* merchants returns + map update

* Update CP14StationEconomySystem.Price.cs
 2025-05-29 00:22:47 +03:00
Ed
d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml
 2025-05-27 12:21:14 +03:00
paige404
100603ece6 Sentient items no longer count as party members (#1317) 2025-05-26 13:29:33 +03:00
Red
40246e9b13 Merge branch 'master' into ed-12-05-2025-upstream 2025-05-23 12:58:11 +03:00
Red
0ce4771f3d Update CP14RoundEndSystem.CBT.cs 2025-05-22 14:53:46 +03:00
ScarKy0
0cb9e803e5 Tweak "Escape" objective to allow yellowtexting (#37680) 
init
 2025-05-21 20:25:07 -07:00
Wolfkey-SomeoneElseTookMyUsername
e72e25aba1 Add disposal signalers (#37535) 
* Add disposal signalers

* Sprite changes

* Some requested changes

* Requested changes + change spelling to be with two l's to be consistent with the remote signaller
 2025-05-21 22:18:57 -04:00
Tayrtahn
5a93099509 Update SharedBiomeSystem methods to use Entity<T> (#37698) 
* Fix warning in TryGetBiomeTile

* Overload TryGetBiomeTile

* Overload more methods, fix internal warnings

* Update TryGetEntity uses

* Update TryGetTile uses

* Cleanup TryGetDecals use

* Formatting

* Two more warnings while we're here
 2025-05-21 22:10:52 -04:00
Tayrtahn
6f89c2c455 Cleanup warnings in AtmosPipeAppearanceSystem (#37706) 
* Cleanup 2 warnings in AtmosPipeAppearanceSystem

* Let's use the Entity<T> version

* todo comment
 2025-05-21 21:06:06 -04:00
ScarKy0
572b20464c Tweak "Help a fellow traitor" objective to allow yellowtexting (#37679) 
init
 2025-05-21 16:45:34 -04:00
Ed
0f4decfa9b Update CP14RoundEndSystem.CBT.cs 2025-05-21 21:28:11 +03:00
Leon Friedrich
38d7949777 Add microwave-nukedisk interaction (#36114) 
* Add microwave-nukedisk interaction

* popup

* Fix UninitializedSaveTest
 2025-05-21 11:06:58 -07:00
Red
2d0d79ca41 Daily English CBT (#1286) 
* Update CP14RoundEndSystem.CBT.cs

* Update CP14RoundEndSystem.CBT.cs

* Update CP14RoundEndSystem.CBT.cs
 2025-05-21 21:06:44 +03:00
metalgearsloth
298f821bec Ore + entitytable fixes (#37675) 
* Ore + entitytable fixes

Iterate every dungeon not just last.

* Big shot

* Fixes
 2025-05-21 12:43:17 -04:00
metalgearsloth
e00c622d22 Use velocity along normal for shuttle impacts (#37667) 
* Use velocity along normal for shuttle impacts

Scrapes shouldn't have the same level of destruction as full-on ramming anymore. Also detecting scrapes should be a lot easier for future stuff.

* Update Content.Server/Shuttles/Systems/ShuttleSystem.Impact.cs
 2025-05-21 23:32:46 +10:00
Red
1d093c3919 Critical bugfixes (#1291) 
* fix modifier duplication

* fix scrap melting
 2025-05-21 00:30:16 +03:00
Tayrtahn
6f46698410 Cleanup warning CS0414 (#37648) 2025-05-20 23:14:10 +02:00
Red
7b7a837cf8 City Gate fix + Comoss update (#1289) 
* city gate fix

* Update comoss.yml

* fix

* Update migration.yml
 2025-05-20 22:36:43 +03:00
TheKittehJesus
2fc1384780 Proofreading changes [EN] (#1288) 
* First batch of text fixes

* Tweaks

* that the tavern

---------

Co-authored-by: TheKittehJesus <29379890+SamGithubAccount@users.noreply.github.com>
 2025-05-20 22:22:43 +03:00
TrixxedHeart
b682da9d9c Fixed Missing or Misconfigured Locale Keys (#37595) 
* Fixes and adds many localization keys from #34343
Open

* Fix comment, that is not how that works.

* Update Resources/Locale/en-US/components/screen-component.ftl

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Fixes cmd-parse-failure-int -> cmd-parse-failure-integer in OptionsUIController.cs, removes cmd-parse-failure-int from options-menu.ftl

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-05-20 13:07:52 +02:00
metalgearsloth
0d4f9640b5 CompFactory updates (#37559) 2025-05-20 01:08:55 -04:00
Tayrtahn
004e084b5a Cleanup 2 warnings in ReagentDispenserSystem (#37622) 
* Cleanup 2 warnings in ReagentDispenserSystem

* Eh, let's be specific
 2025-05-19 18:18:10 -04:00
āda
41a129e749 Pepper makes you cough (#36358) 2025-05-19 11:23:38 -07:00
Red
f4caea3c6c Garbage delete (#1284) 
* fuck this

* and this

* aaand this

* content fix

* Update base.yml

* Update physical.yml

* kill bob
 2025-05-19 14:53:00 +03:00
Red
b07fadf5b0 EntityLootTable deleted (#37604) 2025-05-19 19:53:29 +10:00
kosticia
791ce3a5cd remove ignition functional from welder component (#37586) 
* a

* webedit
 2025-05-19 11:49:59 +02:00
Alexsey Bezyuk
3472feefea Increase WorkbenchRadius (#1281) 2025-05-19 10:38:19 +03:00
Nemanja
964fa22b54 Fix research server test fail (#37562) 2025-05-18 13:04:19 -07:00
Ed
e70e64011f Update CP14BloodMoonCurseRule.cs 2025-05-18 16:59:39 +03:00
slarticodefast
643bdf547e Cleanup atmos air grenade code (#37568) 
cleanup
 2025-05-18 22:18:31 +10:00
Super
921c6dea30 A lone operative successfully nuking the station now actually ends the round. (#36498) 
LoneOpsSpawn is now of an indefinite duration -- it lasts until either the LoneOp dies or the nuke detonates. This means a few things.
 2025-05-18 21:34:33 +10:00
Simon
fc52165c9b Make Nukie and Wizard Comms Console not announce who it was sent by (#37567) 
* Make Nukie and Wizard Comms Console not announce who it was sent by.

* Add doc-comment to field
 2025-05-18 19:18:18 +10:00
metalgearsloth
fc5c63ac09 Add ImplicitRoofComponent (#36112) 
* Add ImplicitRoofComponent

So shuttles get marked as rooved.

* Early-out

So the new render doesn't suck up perf unnecessarily.
 2025-05-18 17:47:35 +10:00
ArtisticRoomba
95cc36c41d Atmos Air Grenades (#37531) 2025-05-17 21:32:51 -07:00
Nemanja
4bced26086 Make research clients grid-local (#36821) 
* Limit RD servers to the station grid

* the sluth
 2025-05-18 14:04:27 +10:00
Nemanja
0d878751fa Salvage Job Board (#37549) 
* Salvage Job Board

* More development

* Small boy

* Computer yaml (partial)

* UI

* Rank unlock logic

* Job label printing

* appraisal tool integration

* Jobs

* add board to QM locker

* boom!

* command desc

* mild rewording

* ackh, mein pr ist brohken
 2025-05-18 14:02:52 +10:00
Krunklehorn
abec27737e AutomaticAtmosSystem uses MassDataChangedEvent, clarifies TileMassMultiplier (#37548) 
* Initial commit, no tile changes, just mass

* Rename TileMassMultiplier to TileDensityMultiplier
 2025-05-17 21:57:50 -04: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
Ilya246
356dabb9c9 shuttle impacts port (#37422) 
* initial

* adjust densities and thruster hp

* Fix evil hack

* Last stuff

* review, cleanup

* admin RW

* minor cleanup

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2025-05-18 03:11:08 +10:00
metalgearsloth
4afccdd5db DungeonData rework (#37172) 
* DungeonData rework

Back to fields, serializes better, just make new layers dumby.

* wawawewa

* Fix this

* Fixes

* review

* thanks fork

* fix
 2025-05-18 03:10:30 +10:00
ScarKy0
28e3c3d8a7 Make SharpComponent work with Hands (#37543) 
* init

* review
 2025-05-17 17:27:20 +02:00
ScarKy0
af0e0598e8 TemperatureProtection now works directly on entities (#37544) 
* init

* review

* review
 2025-05-17 16:38:49 +02:00
Ed
23c9e11019 Blood moon part 2 (#1272) 
* som tweaks

* fixing all

* bloodlust spell

* atatat
 2025-05-17 14:12:49 +03:00