juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

Browse Source 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/centcomm.yml
This commit is contained in:
Ed
2025-02-16 16:39:26 +03:00
parent d6a0ce95a1 8a685483e7
commit bc53ed4aa5
72 changed files with 915 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/Prototypes/GameRules/events.yml
View File

@@ -454,7 +454,7 @@
duration: 1
- type: RuleGrids
- type: LoadMapRule
mapPath: /Maps/Shuttles/ShuttleEvent/striker.yml
gridPath: /Maps/Shuttles/ShuttleEvent/striker.yml
- type: NukeopsRule
roundEndBehavior: Nothing
- type: AntagSelection