Revert "Gamerule Entities" (#15724)

Resources/Prototypes/Entities/Markers/Spawners/Conditional/traitordm.yml

@@ -0,0 +1,16 @@
+- type: entity
+  name: PDA Redemption Machine Spawner
+  id: TraitorDMRedemptionMachineSpawner
+  parent: MarkerBase
+  components:
+    - type: Sprite
+      layers:
+        - state: blue
+        - sprite: Structures/Machines/traitordm.rsi
+          state: redemption
+    - type: ConditionalSpawner
+      prototypes:
+        - TraitorDMRedemptionMachine
+      chance: 1.0
+      gameRules:
+        - TraitorDeathMatch

Resources/Prototypes/Entities/Structures/Machines/traitordm.yml

@@ -0,0 +1,28 @@
+- type: entity
+  id: TraitorDMRedemptionMachine
+  parent: BaseMachinePowered
+  name: traitor deathmatch pda redemption machine
+  description: Put someone else's PDA into this to get telecrystals.
+  components:
+  - type: Sprite
+    layers:
+      - sprite: Structures/Machines/traitordm.rsi
+        state: redemption
+      - sprite: Structures/Machines/traitordm.rsi
+        state: redemption-unshaded
+        shader: unshaded
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+    - shape:
+        !type:PhysShapeAabb
+        bounds: "-0.25,-0.25,0.25,0.25"
+      density: 190
+      mask:
+      - MachineMask
+      layer:
+      - MachineLayer
+  - type: TraitorDeathMatchRedemption
+  placement:
+    mode: AlignTileAny

Resources/Prototypes/GameRules/events.yml

@@ -1,116 +1,97 @@
-- type: entity
+- type: gameRule
   id: AnomalySpawn
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: AnomalySpawn
     weight: 10
     startAfter: 30
-    duration: 35
-  - type: AnomalySpawnRule
+    endAfter: 35
 
-- type: entity
+- type: gameRule
   id: BluespaceArtifact
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: BluespaceArtifact
     weight: 5
     startAfter: 30
-    duration: 35
-  - type: BluespaceArtifactRule
+    endAfter: 35
 
-- type: entity
-  id: BluespaceLocker
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+- type: gameRule
+  id: BluespaceLockerLink
+  config:
+    !type:StationEventRuleConfiguration
+    id: BluespaceLockerLink
     weight: 0
     reoccurrenceDelay: 5
     earliestStart: 1
-    duration: 1
-  - type: BluespaceLockerRule
+    endAfter: 1
 
-- type: entity
+- type: gameRule
   id: BreakerFlip
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: BreakerFlip
     weight: 10
-    duration: 1
+    endAfter: 1
     minimumPlayers: 15
-  - type: BreakerFlipRule
 
-- type: entity
+- type: gameRule
   id: BureaucraticError
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: BureaucraticError
     startAnnouncement: station-event-bureaucratic-error-announcement
     minimumPlayers: 25
     weight: 5
-    duration: 1
-  - type: BureaucraticErrorRule
+    endAfter: 1
 
-- type: entity
+- type: gameRule
   id: DiseaseOutbreak
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
     startAnnouncement: station-event-disease-outbreak-announcement
     startAudio:
       path: /Audio/Announcements/outbreak7.ogg
       params:
         volume: -4
+    id: DiseaseOutbreak
     weight: 5
-    duration: 1
+    endAfter: 1
     earliestStart: 15
-  - type: DiseaseOutbreakRule
 
-- type: entity
+- type: gameRule
   id: Dragon
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: Dragon
     weight: 10
-    duration: 2
+    endAfter: 2
     earliestStart: 15
     minimumPlayers: 15
-  - type: DragonRule
 
-- type: entity
+- type: gameRule
   id: RevenantSpawn
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: RevenantSpawn
     weight: 5
-    duration: 1
+    endAfter: 1
     earliestStart: 45
     minimumPlayers: 20
-  - type: RevenantSpawnRule
 
-- type: entity
+- type: gameRule
   id: FalseAlarm
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: FalseAlarm
     weight: 15
-    duration: 1
-  - type: FalseAlarmRule
+    endAfter: 1
 
-- type: entity
+- type: gameRule
   id: GasLeak
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: GasLeak
     startAnnouncement: station-event-gas-leak-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
@@ -119,27 +100,23 @@
     minimumPlayers: 5
     weight: 5
     startAfter: 20
-  - type: GasLeakRule
 
-- type: entity
+- type: gameRule
   id: KudzuGrowth
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: KudzuGrowth
     earliestStart: 15
     minimumPlayers: 15
     weight: 5
     startAfter: 50
-    duration: 240
-  - type: KudzuGrowthRule
+    endAfter: 240
 
-- type: entity
+- type: gameRule
   id: MeteorSwarm
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: MeteorSwarm
     earliestStart: 30
     weight: 5
     minimumPlayers: 20
@@ -150,26 +127,22 @@
       params:
         volume: -4
     startAfter: 30
-  - type: MeteorSwarmRule
 
-- type: entity
+- type: gameRule
   id: MouseMigration
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: MouseMigration
     earliestStart: 30
     minimumPlayers: 35
     weight: 5
-    duration: 50
-  - type: MouseMigrationRule
+    endAfter: 50
 
-- type: entity
+- type: gameRule
   id: PowerGridCheck
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: PowerGridCheck
     weight: 10
     startAnnouncement: station-event-power-grid-check-start-announcement
     endAnnouncement: station-event-power-grid-check-end-announcement
@@ -178,36 +151,28 @@
       params:
        volume: -4
     startAfter: 12
-    duration: 60
-    maxDuration: 120
-  - type: PowerGridCheckRule
 
-- type: entity
+- type: gameRule
   id: RandomSentience
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: RandomSentience
     weight: 10
-    duration: 1
+    endAfter: 1
     startAudio:
       path: /Audio/Announcements/attention.ogg
-  - type: RandomSentienceRule
 
-- type: entity
+- type: gameRule
   id: SolarFlare
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config: !type:SolarFlareEventRuleConfiguration
+    id: SolarFlare
     weight: 10
     startAnnouncement: station-event-solar-flare-start-announcement
     endAnnouncement: station-event-solar-flare-end-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
-    duration: 120
-    maxDuration: 240
-  - type: SolarFlareRule
+    minEndAfter: 120
+    maxEndAfter: 240
     onlyJamHeadsets: true
     affectedChannels:
     - Common
@@ -215,12 +180,11 @@
     lightBreakChancePerSecond: 0.0003
     doorToggleChancePerSecond: 0.001
 
-- type: entity
+- type: gameRule
   id: VentClog
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: VentClog
     startAnnouncement: station-event-vent-clog-start-announcement
     startAudio:
       path: /Audio/Announcements/attention.ogg
@@ -228,55 +192,44 @@
     minimumPlayers: 15
     weight: 5
     startAfter: 50
-    duration: 60
-  - type: VentClogRule
+    endAfter: 60
 
-- type: entity
+- type: gameRule
   id: VentCritters
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
     id: VentCritters
     earliestStart: 15
     minimumPlayers: 15
     weight: 5
-    duration: 60
-  - type: VentCrittersRule
+    endAfter: 60
 
-- type: entity
+- type: gameRule
   id: SpiderSpawn
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: SpiderSpawn
     earliestStart: 20
     minimumPlayers: 15
     weight: 5
-    duration: 60
-  - type: SpiderSpawnRule
+    endAfter: 60
 
-- type: entity
+- type: gameRule
   id: ZombieOutbreak
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: Zombie
     earliestStart: 50
     weight: 2.5
-    duration: 1
-  - type: ZombieRule
+    endAfter: 1
 
-- type: entity
+- type: gameRule
   id: LoneOpsSpawn
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: StationEvent
+  config:
+    !type:StationEventRuleConfiguration
+    id: LoneOpsSpawn
     earliestStart: 55
     weight: 5
     minimumPlayers: 10
     reoccurrenceDelay: 25
-    duration: 1
-  - type: LoneOpsSpawnRule
-  - type: NukeopsRule
+    endAfter: 1

Resources/Prototypes/GameRules/roundstart.yml

@@ -1,88 +1,80 @@
-- type: entity
-  id: BaseGameRule
-  abstract: true
-  noSpawn: true
-  components:
-  - type: GameRule
-
-- type: entity
+- type: gameRule
   id: DeathMatch
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: DeathMatchRule
+  config:
+    !type:GenericGameRuleConfiguration
+    id: DeathMatch
 
-- type: entity
+- type: gameRule
   id: InactivityTimeRestart
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: InactivityRule
+  config:
+    !type:InactivityGameRuleConfiguration
     inactivityMaxTime: 600
     roundEndDelay: 10
 
-- type: entity
+- type: gameRule
   id: MaxTimeRestart
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: MaxTimeRestartRule
+  config:
+    !type:MaxTimeRestartRuleConfiguration
     roundMaxTime: 300
     roundEndDelay: 10
 
-- type: entity
+- type: gameRule
   id: Nukeops
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: NukeopsRule
+  config:
+    !type:NukeopsRuleConfiguration
+    id: Nukeops
 
-- type: entity
+- type: gameRule
   id: Pirates
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: PiratesRule
+  config:
+    !type:GenericGameRuleConfiguration
+    id: Pirates
 
-- type: entity
+- type: gameRule
+  id: Suspicion
+  config:
+    !type:GenericGameRuleConfiguration
+    id: Suspicion
+
+- type: gameRule
   id: Traitor
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: TraitorRule
+  config:
+    !type:GenericGameRuleConfiguration
+    id: Traitor
 
-- type: entity
+- type: gameRule
+  id: TraitorDeathMatch
+  config:
+    !type:GenericGameRuleConfiguration
+    id: TraitorDeathMatch
+
+- type: gameRule
   id: Sandbox
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: SandboxRule
+  config:
+    !type:GenericGameRuleConfiguration
+    id: Sandbox
 
-- type: entity
+- type: gameRule
   id: Secret
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: SecretRule
+  config:
+    !type:GenericGameRuleConfiguration
+    id: Secret
 
-- type: entity
+- type: gameRule
   id: Zombie
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: ZombieRule
+  config:
+    !type:GenericGameRuleConfiguration
+    id: Zombie
 
 # event schedulers
-- type: entity
+- type: gameRule
   id: BasicStationEventScheduler
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: BasicStationEventScheduler
+  config:
+    !type:GenericGameRuleConfiguration
+    id: BasicStationEventScheduler
 
-- type: entity
+- type: gameRule
   id: RampingStationEventScheduler
-  parent: BaseGameRule
-  noSpawn: true
-  components:
-  - type: RampingStationEventScheduler
+  config:
+    !type:GenericGameRuleConfiguration
+    id: RampingStationEventScheduler

Resources/Prototypes/Roles/Antags/Suspicion/suspicion_innocent.yml

@@ -0,0 +1,6 @@
+- type: antag
+  id: SuspicionInnocent
+  name: roles-antag-suspicion-innocent-name
+  antagonist: false
+  setPreference: false
+  objective: roles-antag-suspicion-innocent-objective

Resources/Prototypes/Roles/Antags/Suspicion/suspicion_traitor.yml

@@ -0,0 +1,6 @@
+- type: antag
+  id: SuspicionTraitor
+  name: roles-antag-suspicion-suspect-name
+  antagonist: true
+  setPreference: true
+  objective: roles-antag-suspicion-suspect-objective

Resources/Prototypes/game_presets.yml

@@ -52,6 +52,16 @@
     - Traitor
     - BasicStationEventScheduler
 
+- type: gamePreset
+  id: Suspicion
+  alias:
+    - suspicion
+    - sus
+  name: suspicion-title
+  description: suspicion-description
+  rules:
+    - Suspicion
+
 - type: gamePreset
   id: Deathmatch
   alias:
@@ -62,6 +72,17 @@
   rules:
     - DeathMatch
 
+- type: gamePreset
+  id: TraitorDeathMatch
+  alias:
+    - traitordm
+    - traitordeathmatch
+  name: traitor-death-match-title
+  description: traitor-death-match-description
+  rules:
+    - TraitorDeathMatch
+    - MaxTimeRestart
+
 - type: gamePreset
   id: Nukeops
   alias: