tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,023 Commits 3 Branches 5 Tags
d1661c1bf7f75c2a0759c08ed6b901b7b6f3388c
Commit Graph

100 Commits

Author SHA1 Message Date
slarticodefast
5e294dcecc Revert 39040 FTL Fixes (#41540) 
Revert "FTL Fixes (#39040)"

This reverts commit 52a9f9b576.
 2025-11-23 05:14:12 -08:00
Nemanja
52a9f9b576 FTL Fixes (#39040) 
* FTL fixes

* one. space.

* change this too
 2025-10-14 22:58:55 +00:00
Princess Cheeseballs
e85bc1bb8c Stunnable New Status and Cleanup (#38618) 
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
 2025-07-21 19:22:11 +02:00
Pieter-Jan Briers
e99fc501a6 Revert biome rework (#38724) 
* Revert "Fix world generation (#38713)"

This reverts commit 10fa6ff4af.

* Revert "Biome rework (#37735)"

This reverts commit fe7b96147c.
 2025-07-03 20:48:04 +02:00
metalgearsloth
fe7b96147c Biome rework (#37735) 
* DungeonData rework

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

* wawawewa

* Fix this

* Fixes

* Port the work over

* wawawewa

* zoom

* Kinda workin

* Adjust wawa

* Unloading work

* Ore + entitytable fixes

Iterate every dungeon not just last.

* Big shot

* wawawewa

* Fixes

* true

* Fixes

# Conflicts:
#	Content.Server/Procedural/DungeonJob/DungeonJob.cs

* wawawewa

* Fixes

* Fix

* Lot of work

* wawawewa

* Fixing

* eh?

* a

* Fix a heap of stuff

* Better ignored check

* Reserve tile changes

* biome

* changes

* wawawewa

* Fixes & snow

* Shadow fixes

* wawawewa

* smol

* Add layer API

* More work

* wawawewa

* Preloads and running again

* wawawewa

* Modified

* Replacements and command

* Runtime support

* werk

* Fix expeds + dungeon alltiles

* reh

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2025-07-03 00:36:06 -04:00
TemporalOroboros
d4876be6f0 Kills TurfHelpers (#37939) 
* Create TurfSystem equivalent for and obsolete TurfHelpers.GetTileRef

* Fix EntitySystem uses of TurfHelpers.GetTileRef

* Fix EntitySystem uses of TurfHelpers.TryGetTileRef

* Fix construction condition uses of TurfHelpers.GetTileRef

* Fix last use of TurfHelpers.IsBlockedTurf

* Create TurfSystem equivalent to and obsolete TurfHelpers.GetContentTileDefinition

* Fix uses of TurfHelpers.GetContentTileDefinition(TileRef)

* Fix uses of TurfHelpers.GetContentTileDefinition(Tile)

* Create TurfSystem equivalent to and obsolete TurfHelpers.IsSpace

* Fix EntitySystem uses of TurfHelpers.IsSpace(Tile)

* Fix EntitySystem uses of TurfHelpers.IsSpace(TileRef)

* Fix remaining uses of TurfHelpers.IsSpace

* Fix uses of TurfHelpers.GetEntitiesInTile

* Delete TurfHelpers.cs

* Add GetEntitiesInTile lookup methods

* Convert some GetEntitiesInTile methods to LookupSystem extension methods

* Use new GetEntitiesInTile methods

* Recycle spiderweb hashset

* Recycle floor tile hashset
 2025-06-21 11:23:19 -04:00
Tayrtahn
d28c64f76a Fix some misc warnings (#37858) 
Fix misc warnings
 2025-05-27 19:54: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
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
Aaron
56feab4e0b Add PreventFTLComponent and changed FTL check (#34077) 
* Add PreventFTLComponent and changed FTL check

* Remove component body.

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-18 20:14:44 -04:00
metalgearsloth
dfa5ccf625 Fix shuttle arrival visualizer (#35772) 
* Fix shuttle arrival visualizer

It was at a fixed spot but if the target is rotating it wasn't handled.

* hew

* Fixes
 2025-04-15 00:34:18 +10:00
Gansu
9236e9e5b9 Fix for arrivals deleting nuke (#33659) 
Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing
Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked

Co-authored-by: aa5g21 <aa5g21@soton.ac.uk>
 2024-11-30 13:48:04 +11:00
MilenVolf
aa80a88cc4 Allow shuttles on planets to make FTL jump (#33507) 
This check conflicts with an attempt to FTL from the planet before expedition ends
 2024-11-24 11:11:47 +03:00
Plykiya
295e63193c Two additional checks to prevent FTLing stations (#32558) 
Add two additional checks to prevent FTLing
 2024-10-04 12:55:36 +10:00
Leon Friedrich
974c08596b Fix AudioSystem nullability checks for engine PR (#32233) 2024-09-18 11:43:30 +10:00
metalgearsloth
2a58fa1ef8 Reapply "FTL + AI fixes (#31952)" (#31968) (#32094) 
* Reapply "FTL + AI fixes (#31952)" (#31968)

This reverts commit c46a4ab876.

* Update
 2024-09-12 14:08:54 +10:00
Pieter-Jan Briers
5a6a3371dc Extend shuttle dock time if the shuttle doesn't dock at evac. (#31496) 
* Extend shuttle dock time if the shuttle doesn't dock at evac.

If the shuttle can't dock at evac for *some reason*, it will instead try to dock at another port on the station. And if that fails it goes somewhere random on the station.

Because of the chaos and confusion caused by this, many people will frequently not get to the shuttle in time under these circumstances. This sucks for everybody.

To alleviate this, the shuttle launch timer will now be extended if the station doesn't dock at its ideal spot. The default values (controlled via CVar) are 1.667x and 2x respectively for "wrong dock" and "no dock at all" scenarios.

The code around here was a mess, so I fixed that too. "CallEmergencyShuttle" has been renamed to "DockEmergencyShuttle", the overload that did the actual docking has been renamed to DockSingleEmergencyShuttle. Code has been split into separate dock -> announce methods so we can calculate shuttle delay in between the case of multiple stations.

Also made the "shuttle couldn't find a dock" text announce the time until it launches and fix the shuttle timers not triggering for it.

* Minor review

---------
 2024-09-09 20:10:28 +02:00
slarticodefast
c46a4ab876 Revert "FTL + AI fixes (#31952)" (#31968) 2024-09-08 17:50:23 +02:00
metalgearsloth
f7a87b5f32 FTL + AI fixes (#31952) 2024-09-08 18:12:23 +10:00
PopGamer46
c2ccf2bc0f Fixes shuttles not being able to FTL onto/near station (#31569) 
fixes FTL
 2024-08-28 23:22:21 +10:00
IProduceWidgets
af65af836a Centcom & FTLDestination cleanup (#30226) 
* centcomm name and ftlcomp

* networking microopstimization

* go sleep.

* map names and arrivals
 2024-08-27 13:28:26 +02: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
metalgearsloth
60b34b57f3 Fix dungeon spawn + ftl overlap (#31413) 
* Fix dungeon spawn + ftl overlap

* Better fixes
 2024-08-25 14:48:29 +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
DrSmugleaf
eed560bf3e Make FTL constants in ShuttleSystem into cvars (#27706) 
* Make FTL constants in ShuttleSystem into cvars

* Fix tests
 2024-05-11 00:00:15 -07: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
Leon Friedrich
12bb476a2d Add evac shuttle test. (#27152) 
* Add evac shuttle test.

* Fix typo in comment
 2024-04-20 15:57:55 +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
Tayrtahn
ae3d745430 Code Cleanup: Purge obsolete MapManager methods (#26279) 
* GetGrid

* GridExists

* TryGetGrid
 2024-03-22 18:08:40 +11:00
metalgearsloth
574c625d12 Fix shuttle disabling on ftl (#25859) 
Branch moment.
 2024-03-05 21:08:44 +11:00
metalgearsloth
bbb78807c4 Fix docking fallback (#25854) 
Only thing that even triggers it atm is escape pods.
 2024-03-05 18:07:17 +11:00
metalgearsloth
c23b3d804e Fix exped FTL (#25823) 
Also fixed some other stuff I noticed.
 2024-03-04 17:24:24 +11:00
metalgearsloth
21a95960f0 Fix FTL docks not opening (#25808) 2024-03-04 02:00:52 +11:00
metalgearsloth
92872e546a Fix FTLToDock (#25803) 
* Fix FTLToDock

- Removed Enabled coz unneeded really.
- Fixed SetCoordinates call that got dumped at some point oop.

* Fix this docking check
 2024-03-03 21:14:16 +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
metalgearsloth
a9502be29e Revert "Fix chat bubbles (#25643)" (#25645) 
* Revert "Fix chat bubbles (#25643)"

This reverts commit 23d2c4d924.

* Revert "Fixes obsolete Transform warnings in Content. (#25256)"

This reverts commit f284b43ff6.
 2024-02-28 00:51:20 +11:00
TemporalOroboros
f284b43ff6 Fixes obsolete Transform warnings in Content. (#25256) 
* Fix TransformComponent.MapPosition warnings in Content.Client

* Fix TransformComponent.MapPosition warnings in Content.IntegrationTests

* Fix TransformComponent.MapPosition warnings in Content.Shared

* Fix TransformComponent.MapPosition warnings in Content.Server

* Fix TransformComponent.WorldPosition warnings in Content.Shared

* Fix TransformComponent.WorldPosition warnings in Content.Client
Excepts ClickableComponent b/c that needs to be ECS'd entirely later

* Fix TransformComponent.WorldPosition warnings in Content.Server

* Fix TransformComponent.WorldRotation warnings in Content.*

* Fix TransformComponent.MapPosition warnings I missed

* Fix TransformComponent.WorldMatrix warnings in Content.*

* Fix TransformComponent.InvWorldMatrix warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotationMatrixWithInv warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotationMatrix warnings in Content.*

* Fix TransformComponent.GetWorldPositionRotation warnings in Content.*

* Fix TransformComponent.Anchored.set warnings in Content.*

* Fix TransformComponent.Coordinates.set warnings in Content.*

* Fix TransformComponent.LocalPosition.set warnings in Content.*

* Fix TransformComponent.AttachToGridOrMap warnings in Content.*

* Fix TransformComponent.AttachParent warnings in Content.*

* Preempt TransformComponent.LocalRotation.set warnings in Content.Shared

* Preempt TransformComponent.LocalRotation.set warnings in Content.Client

* Preempt TransformComponent.LocalRotation.set warnings in Content.IntegrationTests

* Preempt TransformComponent.LocalRotation.set warnings in Content.Server

* Fix/Preempt the remaining obsolete TransformComponent properties/methods in Content.*

* ECS ClickableComponent

* Fix obsolete SharedTransformSystem methods in Content.*

* Fix ExplosionOverlay `SharedTransformSystem` dependency

* Maybe fix null eye position breaking tests

* MGS requested changes
 2024-02-27 12:06:20 +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
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
7d3fe676dd Remove obsolete ftl call (#24187) 
Nothing burger
 2024-01-17 23:01:40 +11:00
metalgearsloth
3a166e1423 Reduce shuttle smimsh allocations (#22952) 2023-12-31 03:12:52 +11:00
Leon Friedrich
9a3342d972 Remove uses of TransformComponent.ChildEntities (#22442) 
* Make output of ChildEnumerator non-nullable

* Remove uses of ChildEntities

* poke tests

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-12-17 03:09:50 +11:00
metalgearsloth
342b08418e Fix planet command being ran on existing maps (#21775) 2023-12-11 19:51:02 +11:00
metalgearsloth
b2aefdef37 Set FTL sounds as grid audio (#21951) 2023-11-29 10:19:23 +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
73a33c455a Fix FTL arrival deleting ghosts (#21778) 2023-11-19 14:37:53 -08:00
metalgearsloth
5b8f3c48c4 Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00