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

59 Commits

Author SHA1 Message Date
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
Tayrtahn
6f46698410 Cleanup warning CS0414 (#37648) 2025-05-20 23:14:10 +02:00
metalgearsloth
0d4f9640b5 CompFactory updates (#37559) 2025-05-20 01:08:55 -04: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
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
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
Princess Cheeseballs
61adee05f6 [HOTFIX] Movement Rewrite Hotfix Shuttles now respect their friction values (#37154) 
* Shuttles now use their proper friction values

* Documentation

* Shuttles now use their proper friction values

* Documentation

* What the instrumentsystem doin

* what the instrumentsystem doing 2
 2025-05-13 22:14:18 +10:00
Ed
bc53ed4aa5 Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/centcomm.yml
 2025-02-16 16:39:26 +03:00
ElectroJr
6242567aff Refactor map loading & saving 2024-12-23 02:42:17 +13:00
Ed
677e5194d6 Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync 
# Conflicts:
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/Traits/TraitSystem.cs
#	Content.Shared/CCVar/CCVars.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/box.yml
#	Resources/Maps/core.yml
 2024-11-23 01:48:24 +03:00
MilenVolf
2002de9bb0 Localize planet dataset names (#33398) 
* Localize planet names (borer)

* DatasetPrototype -> LocalizedDatasetPrototype

* Apply requested changes
 2024-11-20 11:57:43 +11:00
Ed
ca656b3c10 Merge remote-tracking branch 'upstream/master' into ed-29-08-2024 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Maps/reach.yml
 2024-08-29 14:32:09 +03:00
Mervill
c6d291968f Replace obsolete code in shuttle systems. (#31408) 
* Format DockingSystem.Shuttle

* arrivals system

* docking system

* shuttle console system

* emergency shuttle system

* shuttle system

* thruster system

* Fix compile error

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2024-08-26 17:48:37 +02:00
Ed
dd580c68c9 Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Resources/Prototypes/Accents/word_replacements.yml
 2024-08-05 15:28:42 +03:00
Simon
0ef5f668e2 Fix warnings in ShuttleSystem.GridFill.cs (#30253) 
* Fix warnings in ShuttleSystem.GridFill.cs

* remove the thingie

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-08-05 14:09:42 +10:00
Ed
fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
 2024-07-28 20:58:48 +03:00
metalgearsloth
093054f7e3 Move vgroid much closer (#29943) 
* Move vgroid much closer

General feedback is map spam + it takes too long to get to. This is somewhat "close" (considering 1/4 of the distance is the vgroid itself) but without a jetpack / shuttle it's going to be an endeavour.

* Decrease max

* Tweaks

* godzilla

* Update Content.Server/Shuttles/Components/GridSpawnComponent.cs
 2024-07-28 13:14:18 +10:00
Ed
f42546e0c6 Some round beginning preparation (#317) 
* gamepresets filter

* addgamerule cp14 filter

* shuttle dropping

* long time FTL

* FTL map tweaks

* Update ShuttleSystem.FasterThanLight.cs

* handle player ship spawning (not tested yet)

* typo

* test elemental shit (ship)

* player spawn handling (real this time)

* FTL map gravity

* clean up 1

* clean up 2

* instant FTL

* Update CP14ExpeditionSystem.cs
 2024-07-08 17:39:04 +03:00
metalgearsloth
a2f99cc69e VGRoid support (#27659) 
* Dungeon spawn support for grid spawns

* Recursive dungeons working

* Mask approach working

* zack

* More work

* Fix recursive dungeons

* Heap of work

* weh

* the cud

* rar

* Job

* weh

* weh

* weh

* Master merges

* orch

* weh

* vgroid most of the work

* Tweaks

* Tweaks

* weh

* do do do do do do

* Basic layout

* Ore spawning working

* Big breaking changes

* Mob gen working

* weh

* Finalising

* emo

* More finalising

* reverty

* Reduce distance
 2024-07-03 22:23:11 +10:00
metalgearsloth
b6cf2ce524 Add FTL arrival visuals (#29402) 
* Add FTL arrival visuals

* weh

* Update Content.Shared/Shuttles/Components/FTLComponent.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2024-07-01 16:11:30 +10:00
metalgearsloth
b8a2decb4b Fix shuttle audio clipping (#27527) 
Changed engine to use grid local-center and very high maxdistance / refdistance values so it's seamless.
 2024-05-29 17:32:20 +10:00
no
5c69031d11 Admin log shuttle gibbing + Make shuttle gibbing and immovable rods drop organs and correctly put player in ghost (#27114) 
* Add admin log when someone gets gibbed by a shuttle

* Make shuttle gibbing work properly again

* Fix immovable rod gibbing, no longer puts you into nullspace

* Update Content.Server/ImmovableRod/ImmovableRodSystem.cs

* Update Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-04-20 16:27:38 +10:00
Pieter-Jan Briers
3b791459c7 Refactor FTL time tracking code to fix a UI bug (#26538) 
The FTL UI on the shuttle console would reset the FTL progress bar every time you open it. This is because the server only sends "time until completion", not a start/end time. The FTL code now uses a separate start/end time so the exact same progress bar can be preserved.

For convenience, I made a StartEndTime record struct that stores the actual tuple. This is now used by the code and has some helpers.
 2024-03-30 12:40:55 +11:00
Tayrtahn
964c6d54ca Code cleanup: Purge obsoleted SharedPhysicsSystem methods (#26287) 
Updated calls to SharedPhysicsSystem methods
 2024-03-25 17:37:25 +11:00
metalgearsloth
c5486873db Shuttle console + FTL rework (#24430) 
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup
 2024-03-03 18:39:19 +11:00
Nemanja
ce0a51fc29 Predict doors and airlocks (#25419) 
* predict doors and airlocks

* prying, too

* ack

* eek
 2024-02-23 10:01:31 +11:00
Pieter-Jan Briers
68ce53ae17 Random spontaneous cleanup PR (#25131) 
* Use new Subs.CVar helper

Removes manual config OnValueChanged calls, removes need to remember to manually unsubscribe.

This both reduces boilerplate and fixes many issues where subscriptions weren't removed on entity system shutdown.

* Fix a bunch of warnings

* More warning fixes

* Use new DateTime serializer to get rid of ISerializationHooks in changelog code.

* Get rid of some more ISerializationHooks for enums

* And a little more

* Apply suggestions from code review

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
 2024-02-13 16:48:39 -05:00
metalgearsloth
a7388e5c05 Add trade stations (#23863) 
* puters

* Start on fulfillment

* weh

* Smol update

* FTL sound fixes or smth iunno

* Add consoles

* More tweaks

* Make it unanchorable

* final wehs

* weh

* Fix 1 test

* Shrimply bump the distance

* cat
 2024-01-19 13:02:28 +11:00
metalgearsloth
342b08418e Fix planet command being ran on existing maps (#21775) 2023-12-11 19:51:02 +11:00
metalgearsloth
269c93245d Unrevert audio (#21330) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
 2023-11-27 22:12:34 +11:00
metalgearsloth
ee3e3583bd Add map names to stuff (#21760) 
- Station map
- FTL map
 2023-11-21 21:35:37 -07:00
metalgearsloth
5b8f3c48c4 Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed Content audio (#20862) 2023-10-29 14:58:23 +11:00
metalgearsloth
d99d85500c Fix shuttle throwing (#20884) 
The original PR had a lot of strange and unperformant code.
 2023-10-10 23:07:21 -04:00
Varen
8590d32760 FTL on a spaced tile yeets instead of gibs (#19883) 
* -Changes gibbing on FTL when on a spaced tile to yeeting on FTL if you're not buckled and on a space tile.

* -Throw relative to local shuttle position instead, fine for most cases and more performant
-Use throw code to throw.

* Blanks removal

woops

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2023-09-06 22:13:31 -04:00
metalgearsloth
d40f478fc6 Remove some erroneous compadd subs (#19576) 2023-08-27 16:08:29 +10:00
metalgearsloth
735626654a Remove FixtureId (#19280) 2023-08-23 18:55:58 +10:00
Kevin Zheng
ba589dbf65 Add station anchors (#18697) 2023-08-05 19:24:24 +10:00
Tom Leys
a196756124 Split Door Bolt functionality out of AirlockDoor (#16354) 2023-05-31 10:23:35 -04:00
metalgearsloth
57858f802f Shuttle drone improvements (#16931) 2023-05-31 11:13:02 +10:00
metalgearsloth
af5eaec932 Fix Centcomm (#16772) 2023-05-24 21:28:44 +10:00
metalgearsloth
1192a723e6 Shuttle flattening (#16416) 2023-05-19 17:26:28 +10:00
Leon Friedrich
2bd5fb3736 Remove obsolete Fixture.Body references (#16259) 2023-05-09 17:21:26 +10:00
Leon Friedrich
110060678f Disable GridFillComponent on some tests (#15757) 2023-04-25 09:48:29 +10:00
metalgearsloth
844c56c016 Fix thruster postmapinit (#15623) 2023-04-21 20:04:20 +10:00
metalgearsloth
448165ffda Escape pods (#14809) 
* Namespace adjustments for days

* pod

* thanks rider

* Fix the oop launch

* Fixes

* Fix stuff

* eeeeeeeee

* Fix

* access

* map

* forgor

* thing

* Genericise escape pod fill
 2023-03-23 19:54:41 -06:00
metalgearsloth
bf79d76666 Content update for ECS physics (#13291) 2023-01-15 15:38:59 +11:00
metalgearsloth
5018c80152 Don't give maps shuttlecomponent (#13384) 2023-01-09 14:10:30 +11:00
metalgearsloth
6c76061887 Content changes for mapgrid kill (#12567) 2022-11-22 13:12:04 +11:00
metalgearsloth
c0abea8047 Content side for removing IMap / IMapGrid comps (#12357) 2022-11-04 10:12:25 +11:00