Commit Graph

8 Commits

Author SHA1 Message Date
Ed
0d345c33b9 Update dev_map.yml (#361)
* Update dev_map.yml

* Disable FTL test

* DisableEvacTest
2024-07-28 20:56:05 +03:00
Ed
dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream
# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml
2024-05-13 18:32:59 +03: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
Ed
057556b605 Merge remote-tracking branch 'space-station-14/master' into ed-26-04-2024-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs
2024-04-26 00:33:04 +03:00
Leon Friedrich
91aa16f08a Add NukeOps Test (#27207)
* Add NukeOps Test

* Update EvacShuttleTest to also check mapinit

* Update RuleMaxTimeRestartTest

* Fix cvar cleanup

* A

* Revert some changes

* comments

* Add MappingTests

* Finally fix the test

* A
2024-04-24 15:38:43 +10:00
Ed
23df20c0fe Update EvacShuttleTest.cs 2024-04-22 20:10:01 +03:00
Leon Friedrich
c4f050259d Try fix random shuttle test failures (#27186) 2024-04-21 08:03:55 +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