Revert "Upstream (#148)"

This reverts commit 9f00d4b9aa.

Resources/Prototypes/GameRules/events.yml

@@ -413,9 +413,9 @@
         prototype: InitialInfected
 
 - type: entity
-  noSpawn: true
-  parent: BaseNukeopsRule
   id: LoneOpsSpawn
+  parent: BaseGameRule
+  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 35
@@ -447,9 +447,9 @@
         prototype: Nukeops
 
 - type: entity
-  noSpawn: true
-  parent: BaseTraitorRule
   id: SleeperAgentsRule
+  parent: BaseGameRule
+  noSpawn: true
   components:
   - type: StationEvent
     earliestStart: 30
@@ -460,6 +460,7 @@
     startAudio:
       path: /Audio/Announcements/intercept.ogg
   - type: AlertLevelInterceptionRule
+  - type: TraitorRule
   - type: AntagSelection
     definitions:
     - prefRoles: [ Traitor ]

Resources/Prototypes/GameRules/midround.yml

@@ -35,19 +35,7 @@
   id: Thief
   components:
   - type: ThiefRule
-  - type: AntagObjectives
-    objectives:
-    - EscapeThiefShuttleObjective
-  - type: AntagRandomObjectives
-    sets:
-    - groups: ThiefBigObjectiveGroups
-      prob: 0.7
-      maxPicks: 1
-    - groups: ThiefObjectiveGroups
-      maxPicks: 10
-    maxDifficulty: 2.5
   - type: AntagSelection
-    agentName: thief-round-end-agent-name
     definitions:
     - prefRoles: [ Thief ]
       maxRange:

Resources/Prototypes/GameRules/roundstart.yml

@@ -64,9 +64,9 @@
     roundEndDelay: 10
 
 - type: entity
-  abstract: true
+  id: Nukeops
   parent: BaseGameRule
-  id: BaseNukeopsRule
+  noSpawn: true
   components:
   - type: GameRule
     minPlayers: 20 # Honk
@@ -75,16 +75,6 @@
     - operationPrefix
     - operationSuffix
   - type: NukeopsRule
-  - type: AntagSelection
-  - type: AntagLoadProfileRule
-
-- type: entity
-  noSpawn: true
-  parent: BaseNukeopsRule
-  id: Nukeops
-  components:
-  - type: GameRule
-    minPlayers: 20
   - type: LoadMapRule
     gameMap: NukieOutpost
   - type: AntagSelection
@@ -148,30 +138,16 @@
         prototype: Nukeops
 
 - type: entity
-  abstract: true
-  parent: BaseGameRule
-  id: BaseTraitorRule
-  components:
-  - type: TraitorRule
-  # TODO: codewords in yml
-  # TODO: uplink in yml
-  - type: AntagRandomObjectives
-    sets:
-    - groups: TraitorObjectiveGroups
-    maxDifficulty: 5
-  - type: AntagSelection
-    agentName: traitor-round-end-agent-name
-
-- type: entity
-  noSpawn: true
-  parent: BaseTraitorRule
   id: Traitor
+  parent: BaseGameRule
+  noSpawn: true
   components:
   - type: GameRule
     minPlayers: 5
     delay:
       min: 240
       max: 420
+  - type: TraitorRule
   - type: AntagSelection
     definitions:
     - prefRoles: [ Traitor ]