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.

Sign up for GitHub

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

Vault ghoul ban 2 #687

Merged
merged 24 commits into from
Nov 14, 2024
Merged

Vault ghoul ban 2 #687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
44f06fd
Update overseer.yml
ReginaeSpence Nov 14, 2024
44d6746
Update vaultdoctor.yml
ReginaeSpence Nov 14, 2024
aeab2df
Update vaultdweller.yml
ReginaeSpence Nov 14, 2024
c96a598
Update vaultengineer.yml
ReginaeSpence Nov 14, 2024
d24be46
Update vaultsecurity.yml
ReginaeSpence Nov 14, 2024
4ea14e3
Update overseer.yml
ReginaeSpence Nov 14, 2024
baf83ac
Update vaultdoctor.yml
ReginaeSpence Nov 14, 2024
1046503
Update vaultdweller.yml
ReginaeSpence Nov 14, 2024
3527aa9
Update vaultsecurity.yml
ReginaeSpence Nov 14, 2024
8dca93b
Update vaultengineer.yml
ReginaeSpence Nov 14, 2024
3f18c7e
Update overseer.yml
ReginaeSpence Nov 14, 2024
b241d4e
Update vaultdoctor.yml
ReginaeSpence Nov 14, 2024
578664a
Update vaultdweller.yml
ReginaeSpence Nov 14, 2024
46f2293
Update vaultengineer.yml
ReginaeSpence Nov 14, 2024
51f695d
Update vaultsecurity.yml
ReginaeSpence Nov 14, 2024
c8fca45
Update vaultsecurity.yml
ReginaeSpence Nov 14, 2024
5188b28
Update vaultdoctor.yml
ReginaeSpence Nov 14, 2024
3d564e7
Update vaultsecurity.yml
ReginaeSpence Nov 14, 2024
b685554
Update vaultengineer.yml
ReginaeSpence Nov 14, 2024
fe20630
Update overseer.yml
ReginaeSpence Nov 14, 2024
de7f222
Update vaultdweller.yml
ReginaeSpence Nov 14, 2024
1057490
Update vaultsecurity.yml
ReginaeSpence Nov 14, 2024
d798769
Update overseer.yml
ReginaeSpence Nov 14, 2024
2ee7d33
Update vaultengineer.yml
ReginaeSpence Nov 14, 2024
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
14 changes: 6 additions & 8 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/overseer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
name: job-name-overseer
description: job-description-overseer
requirements:
- !type:CharacterDepartmentTimeRequirement
department: Vault
min: 36000 # 10 hours
- !type:CharacterSpeciesRequirement
species:
- Human
- !type:CharacterDepartmentTimeRequirement
department: Vault
min: 36000 # 10 hours
playTimeTracker: Overseer
weight: 20
startingGear: OverseerGear
Expand All @@ -23,11 +26,6 @@
- type: NpcFactionMember
factions:
- Vault
jobBlockForSpecies:
- !type:JobBlockForSpecie
nameSpecie: Ghoul
- !type:JobBlockForSpecie
nameSpecie: GhoulGlowing

- type: startingGear
id: OverseerGear
Expand Down
10 changes: 5 additions & 5 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultdoctor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
id: VaultDoctor
name: job-name-vault-doctor
description: job-description-vault-doctor
requirements:
- !type:CharacterSpeciesRequirement
species:
- Human
playTimeTracker: VaultDoctor
startingGear: VaultDoctorGear
alwaysUseSpawner: true
Expand All @@ -17,11 +21,7 @@
factions:
- Vault
- type: CPRTraining
jobBlockForSpecies:
- !type:JobBlockForSpecie
nameSpecie: Ghoul
- !type:JobBlockForSpecie
nameSpecie: GhoulGlowing


- type: startingGear
id: VaultDoctorGear
Expand Down
9 changes: 4 additions & 5 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultdweller.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
id: VaultDweller
name: job-name-vault-dweller
description: job-description-vault-dweller
requirements:
- !type:CharacterSpeciesRequirement
species:
- Human
playTimeTracker: VaultDweller
startingGear: VaultDwellerGear
alwaysUseSpawner: true
Expand All @@ -15,11 +19,6 @@
- type: NpcFactionMember
factions:
- Vault
jobBlockForSpecies:
- !type:JobBlockForSpecie
nameSpecie: Ghoul
- !type:JobBlockForSpecie
nameSpecie: GhoulGlowing

- type: startingGear
id: VaultDwellerGear
Expand Down
9 changes: 4 additions & 5 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultengineer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
id: VaultEngineer
name: job-name-vault-engineer
description: job-description-vault-engineer
requirements:
- !type:CharacterSpeciesRequirement
species:
- Human
playTimeTracker: VaultEngineer
startingGear: VaultEngineerGear
alwaysUseSpawner: true
Expand All @@ -16,11 +20,6 @@
- type: NpcFactionMember
factions:
- Vault
jobBlockForSpecies:
- !type:JobBlockForSpecie
nameSpecie: Ghoul
- !type:JobBlockForSpecie
nameSpecie: GhoulGlowing

- type: startingGear
id: VaultEngineerGear
Expand Down
14 changes: 6 additions & 8 deletions Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultsecurity.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
description: job-description-vault-security
playTimeTracker: VaultSecurity
requirements:
- !type:CharacterDepartmentTimeRequirement
department: Vault
min: 7200 # 2 hours
- !type:CharacterSpeciesRequirement
species:
- Human
- !type:CharacterDepartmentTimeRequirement
department: Vault
min: 7200 # 2 hours
startingGear: VaultSecurityGear
alwaysUseSpawner: true
icon: "JobIconSecurityOfficer"
Expand All @@ -21,11 +24,6 @@
- type: NpcFactionMember
factions:
- Vault
jobBlockForSpecies:
- !type:JobBlockForSpecie
nameSpecie: Ghoul
- !type:JobBlockForSpecie
nameSpecie: GhoulGlowing

- type: startingGear
id: VaultSecurityGear
Expand Down
Loading