diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index 49fed4053c..95a13cc2c7 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -19,9 +19,6 @@ name: ghost-role-information-rat-king-name description: ghost-role-information-rat-king-description rules: ghost-role-information-freeagent-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs # Sunrise-RoleTime raffle: settings: default - type: GhostRoleMobSpawner @@ -104,12 +101,6 @@ name: ghost-role-information-loneop-name description: ghost-role-information-loneop-description rules: ghost-role-information-rules-default-solo-antagonist - requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 54000 #15 hrs # Sunrise-RoleTime - - !type:OverallPlaytimeRequirement - time: 90000 #25 hrs # Sunrise-RoleTime raffle: settings: default - type: Sprite @@ -128,12 +119,6 @@ name: roles-antag-nuclear-operative-commander-name description: roles-antag-nuclear-operative-commander-objective rules: ghost-role-information-rules-default-team-antagonist - requirements: - - !type:OverallPlaytimeRequirement - time: 36000 # 10h # Sunrise-RoleTime - - !type:DepartmentTimeRequirement - department: Security - time: 18000 # 5h # Sunrise-RoleTime raffle: settings: default @@ -146,15 +131,6 @@ name: roles-antag-nuclear-operative-agent-name description: roles-antag-nuclear-operative-agent-objective rules: ghost-role-information-rules-default-team-antagonist - requirements: - - !type:OverallPlaytimeRequirement - time: 36000 # 10h # Sunrise-RoleTime - - !type:RoleTimeRequirement - role: JobChemist - time: 18000 # 5h # Sunrise-RoleTime - - !type:DepartmentTimeRequirement - department: Security - time: 18000 # 5h # Sunrise-RoleTime raffle: settings: default @@ -167,12 +143,6 @@ name: roles-antag-nuclear-operative-name description: roles-antag-nuclear-operative-objective rules: ghost-role-information-rules-default-team-antagonist - requirements: - - !type:OverallPlaytimeRequirement - time: 36000 # 10h # Sunrise-RoleTime - - !type:DepartmentTimeRequirement - department: Security - time: 7200 # 2h # Sunrise-RoleTime raffle: settings: default @@ -185,9 +155,6 @@ name: ghost-role-information-space-dragon-name description: ghost-role-information-space-dragon-description rules: ghost-role-information-space-dragon-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs # Sunrise-RoleTime raffle: settings: default - type: Sprite @@ -205,12 +172,6 @@ name: ghost-role-information-space-ninja-name description: ghost-role-information-space-ninja-description rules: ghost-role-information-antagonist-rules - requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 18000 #5 hrs # Sunrise-RoleTime - - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs # Sunrise-RoleTime raffle: settings: default - type: Sprite @@ -219,20 +180,3 @@ - state: green - sprite: Objects/Weapons/Melee/energykatana.rsi state: icon - -- type: entity - parent: MarkerBase - id: SpawnPointGhostTerminator - name: terminator spawn point - components: - - type: GhostRole - name: ghost-role-information-exterminator-name - description: ghost-role-information-exterminator-description - rules: ghost-role-information-exterminator-rules - - type: GhostRoleMobSpawner - prototype: MobHumanTerminator - - type: Sprite - layers: - - state: green - - sprite: Mobs/Species/Terminator/parts.rsi - state: full diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index a7d42224ca..580a70b701 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -36,7 +36,6 @@ speciesBlacklist: # Sunrise-edit - Diona - Vox - - Vulpkanin - Felinid parent: EventHumanoidMindShielded randomizeName: false @@ -78,7 +77,6 @@ speciesBlacklist: # Sunrise-edit - Diona - Vox - - Vulpkanin - Felinid parent: EventHumanoidMindShielded randomizeName: false @@ -115,7 +113,6 @@ speciesBlacklist: # Sunrise-edit - Diona - Vox - - Vulpkanin - Felinid parent: ERTLeader components: @@ -143,7 +140,6 @@ speciesBlacklist: # Sunrise-edit - Diona - Vox - - Vulpkanin - Felinid parent: ERTLeaderEVA components: @@ -218,7 +214,6 @@ speciesBlacklist: # Sunrise-edit - Diona - Vox - - Vulpkanin - Felinid parent: ERTChaplain components: @@ -257,7 +252,6 @@ speciesBlacklist: # Sunrise-edit - Diona - Vox - - Vulpkanin - Felinid parent: ERTLeader components: diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 6017b0f7ec..0eecf4e3a8 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -322,19 +322,6 @@ lightBreakChancePerSecond: 0.0003 doorToggleChancePerSecond: 0.001 -- type: entity - parent: BaseGameRule - id: TerminatorSpawn - categories: [ HideSpawnMenu ] - components: - - type: StationEvent - weight: 8 - duration: 1 - earliestStart: 30 - minimumPlayers: 20 - - type: LateJoinSpawnRule - prototype: SpawnPointGhostTerminator - - type: entity id: VentClog parent: BaseStationEventLongDelay diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/ghost_roles.yml index d0a7075584..414f7ce553 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/ghost_roles.yml @@ -21,3 +21,23 @@ - state: green - sprite: _Sunrise/Mobs/Pets/dogbook.rsi state: dogbook + + +- type: entity + parent: MarkerBase + id: SpawnPointGhostTerminator + name: terminator spawn point + components: + - type: GhostRole + name: ghost-role-information-exterminator-name + description: ghost-role-information-exterminator-description + rules: ghost-role-information-exterminator-rules + raffle: + settings: default + - type: GhostRoleMobSpawner + prototype: MobHumanTerminator + - type: Sprite + layers: + - state: green + - sprite: Mobs/Species/Terminator/parts.rsi + state: full diff --git a/Resources/Prototypes/_Sunrise/GameRules/events.yml b/Resources/Prototypes/_Sunrise/GameRules/events.yml index 6a5899abfe..762044bfba 100644 --- a/Resources/Prototypes/_Sunrise/GameRules/events.yml +++ b/Resources/Prototypes/_Sunrise/GameRules/events.yml @@ -42,3 +42,17 @@ duration: null - type: LateJoinSpawnRule prototype: SpawnPointEvilTwin + + +- type: entity + parent: BaseGameRule + id: TerminatorSpawn + categories: [ HideSpawnMenu ] + components: + - type: StationEvent + weight: 10 + earliestStart: 30 + minimumPlayers: 20 + duration: null + - type: LateJoinSpawnRule + prototype: SpawnPointGhostTerminator