Ed
b8b17f7b8a
Merge remote-tracking branch 'upstream/stable' into ed-25-08-2025-upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Explosion/EntitySystems/TriggerSystem.cs
# Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Content.Shared/Nutrition/Components/FoodComponent.cs
# Content.Shared/Speech/ListenEvent.cs
# Resources/Prototypes/Entities/Effects/admin_triggers.yml
2025-08-25 16:22:32 +03:00
slarticodefast
2743dcf67f
Move mind role components to shared ( #39606 )
2025-08-13 12:51:46 +02:00
Ed
b581f5d132
Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync
...
# Conflicts:
# .github/workflows/check-trailing-whitespace.yml
# Content.IntegrationTests/Tests/Access/AccessReaderTest.cs
# Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
# Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Shared/Light/Components/SunShadowCycleComponent.cs
# Resources/Prototypes/Damage/modifier_sets.yml
# Resources/Prototypes/Maps/Pools/default.yml
2025-06-23 16:37:22 +03:00
Tayrtahn
e909ffa933
Forbid string literals for NpcFactionSystem methods ( #38140 )
...
* Add ForbidLiteral attribute to NpcFactionSystem methods
* Cleanup resulting warnings
2025-06-08 00:39:18 +02:00
Ed
59e6435fe2
Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
# Content.Shared/Damage/Systems/SharedStaminaSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
# Resources/Prototypes/Procedural/vgroid.yml
2025-05-12 14:25:42 +03:00
Kyle Tyo
88eda89faa
MapManager warning cleanup on tests ( #36940 )
...
lets see if this works.
2025-04-28 12:52:25 +02:00
Ed
9d6e023bd0
Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2
...
# Conflicts:
# Content.Client/Administration/AdminNameOverlay.cs
# Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
# Content.Client/Guidebook/Controls/GuideReagentReaction.xaml
# Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
# Content.Client/SubFloor/SubFloorHideSystem.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
# Content.Server/Antag/AntagSelectionSystem.cs
# Content.Server/Cloning/CloningSystem.cs
# Content.Server/GameTicking/Rules/Components/ParadoxCloneRuleComponent.cs
# Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs
# Content.Server/Roles/ParadoxCloneRoleComponent.cs
# Content.Shared.Database/LogType.cs
# Content.Shared/CCVar/CCVars.Interface.cs
# Content.Shared/Cloning/CloningEvents.cs
# Content.Shared/Cloning/CloningSettingsPrototype.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
# Content.Shared/Light/Components/SunShadowCycleComponent.cs
# Content.Shared/Storage/StorageComponent.cs
# Resources/Changelog/Admin.yml
# Resources/Changelog/Changelog.yml
# Resources/Credits/GitHub.txt
# Resources/Locale/en-US/paradox-clone/role.ftl
# Resources/Maps/bagel.yml
# Resources/Maps/loop.yml
# Resources/Prototypes/Chemistry/mixing_types.yml
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Effects/puddle.yml
# Resources/Prototypes/Entities/Mobs/Player/clone.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
# Resources/Prototypes/Entities/Objects/Devices/pda.yml
# Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Maps/Pools/default.yml
# Resources/Prototypes/Objectives/paradoxClone.yml
# Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
# Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi/equipped-EYES-arachnid.png
2025-03-31 12:41:37 +03:00
Tayrtahn
ae07c5d841
Allow NukeOps test to function with multiple RuleGrids ( #36049 )
2025-03-24 19:59:13 +01:00
Tayrtahn
af36b3983c
Make NukeOpsTest list RuleGrids on failure ( #35873 )
2025-03-16 12:20:13 -04:00
Ed
dc47bb2283
Merge remote-tracking branch 'upstream/stable' into ed-15-10-2024-upstream
...
# Conflicts:
# Content.Server/Station/Systems/StationSpawningSystem.cs
2024-10-15 15:25:44 +03: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
Ed
d9336781f1
Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream
...
# Conflicts:
# Content.Shared/Inventory/InventorySystem.Equip.cs
# Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
2024-08-12 14:40:15 +03:00
slarticodefast
da0b8d4731
remove UntrackedMapBoundUserInterface ( #30752 )
2024-08-09 15:24:49 +10:00
Ed
3187006641
disable NukeOps test
2024-07-23 14:19:28 +03:00
Errant
bf1450fdc8
Fix replayghost spawning location ( #30252 )
...
Fix replayghost spawn
2024-07-22 20:32:30 +01:00
IProduceWidgets
c7ff647cb3
Nukie Outpost is no longer a station map ( #30090 )
...
* I dunno, break shit I guess.
* Actually fix some shit for once.
* test flakey or me flakey?
* Test were not flakey, they just didnt make any sense anymore.
* more stationy tests
* undo abuncha shit I can set in yml instead
* forgor an assert
* unneeded usings
* 1984
* I made github angy
* yoink
* the end is never the end is never the end is never the end is never the end is never the end is never the
* Im going to commit sudoku
2024-07-21 01:26:30 -06:00
Tayrtahn
340332cf5b
Fix nukeops ending early if an operative dies at base ( #29642 )
...
Fix nukeops ending early if an operative died at base
2024-07-01 18:23:36 -04: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
Leon Friedrich
7bd1b45f2b
Use dummy sessions in NukeOpsTest ( #28549 )
...
* Add dummy sessions
* Update NukeOpsTest
* Fix PvsBenchmark
2024-06-05 18:37:22 +10:00
deltanedas
16b3fb1204
LoadMapRule grid storage rework ( #28210 )
...
*
2024-06-03 20:04:19 -04:00
Leon Friedrich
27e63f5919
Make tests automatically reset modified cvars ( #28219 )
...
* Make tests automatically reset modified cvars
* Fix bad return
* A
* Try Fix tests
* clarify comment
* update eng
2024-05-31 12:44:35 +10:00
deltanedas
492ccc93d0
fix antag selection being evil ( #28197 )
...
* fix antag selection being evil
* fix test
* untroll the other tests
* remove role timer troll
* Allow tests to modify antag preferences
* Fix antag selection
* Misc test fixes
* Add AntagPreferenceTest
* Fix lazy mistakes
* Test cleanup
* Try stop players in lobbies from being assigned mid-round antags
* ranting
* I am going insane
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com >
2024-05-26 01:14:29 -04: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
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
