Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Despecialize Jobs And Events #515

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
- sprite: Mobs/Species/Human/parts.rsi
state: full

- type: entity # Part of PirateRadioSpawn
- type: entity
noSpawn: true
id: SpawnPointGhostSyndicateListener
name: ghost role spawn point
Expand All @@ -31,18 +31,6 @@
name: ghost-role-information-listeningop-name
description: ghost-role-information-listeningop-description
rules: ghost-role-information-listeningop-rules
requirements: # Worth considering these numbers for the goal of making sure someone willing to MRP takes this.
- !type:OverallPlaytimeRequirement
time: 259200 # 72 hours
- !type:DepartmentTimeRequirement
department: Security
time: 40000 # 11.1 hours
- !type:DepartmentTimeRequirement
department: Civilian
time: 40000 # 11.1 hours
- !type:DepartmentTimeRequirement
department: Command
time: 40000 # 11.1 hours
- type: GhostRoleMobSpawner
prototype: MobHumanSyndicateListener
- type: Sprite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
name: job-name-medical-borg
description: job-description-medical-borg
playTimeTracker: JobMedicalBorg
requirements:
- !type:OverallPlaytimeRequirement
time: 216000 #60 hrs
- !type:DepartmentTimeRequirement
department: Medical
time: 21600 #6 hrs
canBeAntag: false
icon: JobIconMedicalBorg
supervisors: job-supervisors-cmo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,6 @@
name: ghost-role-information-loneop-name
description: ghost-role-information-loneop-description
rules: ghost-role-information-loneop-rules
requirements:
- !type:OverallPlaytimeRequirement
time: 172800 # DeltaV - 48 hours
- !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement
department: Security
time: 36000 # DeltaV - 10 hours
- type: GhostRoleMobSpawner
prototype: MobHumanLoneNuclearOperative
- type: Sprite
Expand Down
84 changes: 42 additions & 42 deletions Resources/Prototypes/GameRules/events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
noSpawn: true
components:
- type: StationEvent
weight: 1 # DeltaV - was 5
weight: 1
duration: 1
earliestStart: 45
reoccurrenceDelay: 60
Expand All @@ -98,9 +98,9 @@
noSpawn: true
components:
- type: StationEvent
weight: 3 # DeltaV - was 10
weight: 3
duration: 1
earliestStart: 45 # DeltaV - was 30
earliestStart: 45
reoccurrenceDelay: 60
minimumPlayers: 40
- type: NinjaSpawnRule
Expand Down Expand Up @@ -227,15 +227,15 @@
maxDuration: 120
- type: PowerGridCheckRule

# - type: entity # DeltaV - Removes the random sentience.
VMSolidus marked this conversation as resolved.
Show resolved Hide resolved
# id: RandomSentience
# parent: BaseGameRule
# noSpawn: true
# components:
# - type: StationEvent
# weight: 10
# duration: 1
# - type: RandomSentienceRule
- type: entity
id: RandomSentience
parent: BaseGameRule
noSpawn: true
components:
- type: StationEvent
weight: 1
duration: 1
- type: RandomSentienceRule

- type: entity
parent: BaseGameRule
Expand Down Expand Up @@ -350,32 +350,32 @@
- id: MobGiantSpiderAngry
prob: 0.05

# - type: entity # DeltaV - Prevent normal spawning of MobClownSpider
# id: SpiderClownSpawn
# parent: BaseGameRule
# noSpawn: true
# components:
# - type: StationEvent
# startAnnouncement: true
# startDelay: 10
# earliestStart: 20
# minimumPlayers: 15
# weight: 1
# duration: 60
# - type: VentCrittersRule
# entries:
# - id: MobClownSpider
# prob: 0.05
- type: entity
id: SpiderClownSpawn
parent: BaseGameRule
noSpawn: true
components:
- type: StationEvent
startAnnouncement: true
startDelay: 10
earliestStart: 20
minimumPlayers: 15
weight: 1
duration: 60
- type: VentCrittersRule
entries:
- id: MobClownSpider
prob: 0.05

- type: entity
id: ZombieOutbreak
parent: BaseGameRule
noSpawn: true
components:
- type: StationEvent
earliestStart: 90 # DeltaV - was 50
earliestStart: 90 # EE - was 50
minimumPlayers: 15
weight: 2.5 # DeltaV - was 5
weight: 2.5 # EE - was 5
duration: 1
- type: ZombieRule
minStartDelay: 0 #let them know immediately
VMSolidus marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -413,18 +413,18 @@
sounds:
collection: Paracusia

#- type: entity # DeltaV - Why does this exist??
VMSolidus marked this conversation as resolved.
Show resolved Hide resolved
# id: ImmovableRodSpawn
# parent: BaseGameRule
# noSpawn: true
# components:
# - type: StationEvent
# startAnnouncement: true
# weight: 5
# duration: 1
# earliestStart: 45
# minimumPlayers: 20
# - type: ImmovableRodRule
- type: entity # DeltaV - Why does this exist??
id: ImmovableRodSpawn
parent: BaseGameRule
noSpawn: true
components:
- type: StationEvent
startAnnouncement: true
weight: 0.5
duration: 1
earliestStart: 45
minimumPlayers: 20
- type: ImmovableRodRule

- type: entity
noSpawn: true
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/Nyanotrasen/GameRules/events.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
earliestStart: 25
- type: MidRoundAntagRule

#- type: entity
# noSpawn: true
# parent: BaseMidRoundAntag
# id: RatKingSpawn
# components:
# - type: MidRoundAntagRule
# spawner: SpawnPointGhostRatKing
- type: entity
noSpawn: true
parent: BaseMidRoundAntag
id: RatKingSpawn
components:
- type: MidRoundAntagRule
spawner: SpawnPointGhostRatKing

- type: entity
noSpawn: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,15 @@
name: job-name-mantis
description: job-description-mantis
playTimeTracker: JobForensicMantis
requirements:
- !type:OverallPlaytimeRequirement
time: 18000
- !type:DepartmentTimeRequirement
department: Epistemics # DeltaV - Epistemics Department replacing Science
time: 3600
startingGear: ForensicMantisGear
icon: "JobIconForensicMantis"
supervisors: job-supervisors-rd
antagAdvantage: 5 # DeltaV - From 4 to 5
VMSolidus marked this conversation as resolved.
Show resolved Hide resolved
canBeAntag: true # DeltaV - Mantis is no longer a Detective
# whitelistRequired: true
antagAdvantage: 5
canBeAntag: true
access:
- Research
- Maintenance
- Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
- Mantis
special:
- !type:AddComponentSpecial
components:
Expand All @@ -34,11 +27,10 @@
head: ClothingHeadHatFezMantis
id: ForensicMantisPDA
eyes: ClothingEyesGlassesSunglasses
ears: ClothingHeadsetScience # DeltaV - Mantis is part of Epistemics
ears: ClothingHeadsetScience
gloves: ClothingHandsGlovesColorWhite
outerClothing: ClothingOuterCoatMantis
belt: ClothingBeltMantis
# pocket2: ForensicScanner # DeltaV - Mantis is no longer a Detective
innerClothingSkirt: ClothingUniformSkirtMantis
satchel: ClothingBackpackSatchelMantisFilled
duffelbag: ClothingBackpackDuffelMantisFilled
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,14 @@
name: job-name-guard
description: job-description-guard
playTimeTracker: JobPrisonGuard
requirements:
- !type:OverallPlaytimeRequirement
time: 18000
- !type:DepartmentTimeRequirement
department: Security
time: 14400
startingGear: PrisonGuardGear
alwaysUseSpawner: true
canBeAntag: false
icon: "JobIconPrisonGuard"
supervisors: job-supervisors-warden
setPreference: true
# whitelistRequired: true
access:
- Security
#- Brig #Delta V: Removed brig access
- Maintenance
special:
- !type:AddImplantSpecial
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
name: job-name-martialartist
description: job-description-martialartist
playTimeTracker: JobMartialArtist
requirements:
- !type:OverallPlaytimeRequirement
time: 7200 #2 hours
startingGear: MartialArtistGear
icon: "JobIconMartialArtist"
supervisors: job-supervisors-hop
setPreference: true
# whitelistRequired: true
access:
- Maintenance
- Theatre # DeltaV - Add Theatre access
- Boxer # DeltaV - Add Boxer access
- Theatre
- Boxer
special:
- !type:AddComponentSpecial
components:
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/Roles/Antags/ninja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@
antagonist: true
setPreference: false
objective: roles-antag-space-ninja-objective
requirements:
- !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
time: 259200 # DeltaV - 72 hours
22 changes: 0 additions & 22 deletions Resources/Prototypes/Roles/Antags/nukeops.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,17 @@
antagonist: true
setPreference: true
objective: roles-antag-nuclear-operative-objective
requirements:
- !type:OverallPlaytimeRequirement
time: 108000 # DeltaV - 30 hours
- !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement
department: Security
time: 36000 # DeltaV - 10 hours

- type: antag
id: NukeopsMedic
name: roles-antag-nuclear-operative-agent-name
antagonist: true
setPreference: true
objective: roles-antag-nuclear-operative-agent-objective
requirements:
- !type:OverallPlaytimeRequirement
time: 108000 # DeltaV - 30 hours
- !type:DepartmentTimeRequirement # DeltaV - Medical dept time requirement
department: Medical
time: 36000 # DeltaV - 10 hours

- type: antag
id: NukeopsCommander
name: roles-antag-nuclear-operative-commander-name
antagonist: true
setPreference: true
objective: roles-antag-nuclear-operative-commander-objective
requirements:
- !type:OverallPlaytimeRequirement
time: 216000 # DeltaV - 60 hours
- !type:DepartmentTimeRequirement # DeltaV - Security dept time requirement
department: Security
time: 36000 # DeltaV - 10 hours
- !type:DepartmentTimeRequirement # DeltaV - Command dept time requirement
department: Command
time: 36000 # DeltaV - 10 hours
- !type:WhitelistRequirement # DeltaV - Whitelist requirement
6 changes: 0 additions & 6 deletions Resources/Prototypes/Roles/Antags/revolutionary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
antagonist: true
setPreference: true
objective: roles-antag-rev-head-objective
requirements:
- !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
time: 172800 # DeltaV - 48 hours
- !type:DepartmentTimeRequirement # DeltaV - Command dept time requirement
department: Command
time: 36000 # DeltaV - 10 hours

- type: antag
id: Rev
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/Roles/Antags/traitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,3 @@
antagonist: true
setPreference: true
objective: roles-antag-syndicate-agent-objective
requirements:
- !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
time: 86400 # DeltaV - 24 hours
3 changes: 0 additions & 3 deletions Resources/Prototypes/Roles/Antags/zombie.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
antagonist: true
setPreference: true
objective: roles-antag-initial-infected-objective
requirements:
- !type:OverallPlaytimeRequirement # DeltaV - Playtime requirement
time: 43200 # DeltaV - 12 hours

- type: antag
id: Zombie
Expand Down
Loading
Loading