Merge remote-tracking branch 'refs/remotes/sunrise_public/master'

space-sunrise · Jan 20, 2025 · e3c6240 · e3c6240
2 parents acde3df + 23a3cc5
commit e3c6240
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
@@ -72,12 +72,11 @@
           - /Maps/_Sunrise/Nonstations/telecom_satelite.yml
         ruins: !type:GridSpawnGroup
           hide: false # Sunrise-Edit
-          nameGrid: false
-          minCount: 10
-          maxCount: 15
+          nameGrid: true
+          minCount: 3
+          maxCount: 6
           stationGrid: false
           paths:
-          - /Maps/Ruins/abandoned_outpost.yml
           - /Maps/Ruins/chunked_tcomms.yml
           - /Maps/Ruins/biodome_satellite.yml
           - /Maps/Ruins/derelict.yml
@@ -88,14 +87,31 @@
           - /Maps/Ruins/whiteship_ancient.yml
           - /Maps/Ruins/whiteship_bluespacejumper.yml
           - /Maps/Ruins/wrecklaimer.yml
+        abandoned: !type:GridSpawnGroup
+          minimumDistance: 500
+          maximumDistance: 550
+          hide: false
+          nameGrid: false
+          stationGrid: false
+          minCount: 5
+          maxCount: 5
+          paths:
+          - /Maps/Ruins/abandoned_outpost.yml
           - /Maps/_Sunrise/Ruins/abandoned_mining_outpost.yml
           - /Maps/_Sunrise/Ruins/abandoned_satelite.yml
-          - /Maps/_Sunrise/Ruins/victory_mine.yml
           - /Maps/_Sunrise/Ruins/abandoned_lab.yml
           - /Maps/_Sunrise/Ruins/abandoned_syndi_lab.yml
+        victory_mine: !type:GridSpawnGroup
+          minimumDistance: 1000
+          maximumDistance: 1050
+          hide: false
+          nameGrid: false
+          stationGrid: false
+          paths:
+          - /Maps/_Sunrise/Ruins/victory_mine.yml
         vgroid: !type:DungeonSpawnGroup
-          minimumDistance: 300
-          maximumDistance: 350
+          minimumDistance: 1000
+          maximumDistance: 1050
           nameDataset: NamesBorer
           stationGrid: false
           addComponents:

diff --git a/Resources/Prototypes/_Sunrise/AssaultOps/mind_roles.yml b/Resources/Prototypes/_Sunrise/AssaultOps/mind_roles.yml
@@ -4,8 +4,9 @@
   name: Assault Operative Role
   components:
   - type: MindRole
-    exclusiveAntag: true
     antagPrototype: AssaultOperative
+    exclusiveAntag: true
+    roleType: TeamAntagonist
   - type: AssaultOpsRole
 
 - type: entity
@@ -15,3 +16,5 @@
   components:
   - type: MindRole
     antagPrototype: AssaultCommander
+    exclusiveAntag: true
+    roleType: TeamAntagonist
diff --git a/Resources/Prototypes/_Sunrise/FleshCult/mind_roles.yml b/Resources/Prototypes/_Sunrise/FleshCult/mind_roles.yml
@@ -7,6 +7,7 @@
   - type: MindRole
     antagPrototype: FleshCultist
     exclusiveAntag: true
+    roleType: TeamAntagonist
   - type: FleshCultistRole
 
 - type: entity
@@ -18,4 +19,5 @@
   - type: MindRole
     antagPrototype: FleshCultistLeader
     exclusiveAntag: true
+    roleType: TeamAntagonist
   - type: FleshCultistRole
diff --git a/Resources/Prototypes/_Sunrise/Roles/MindRoles/mind_roles.yml b/Resources/Prototypes/_Sunrise/Roles/MindRoles/mind_roles.yml
@@ -61,5 +61,5 @@
   - type: MindRole
     antagPrototype: Vampire
     exclusiveAntag: true
-    roleType: TeamAntagonist
+    roleType: SoloAntagonist
   - type: VampireRole