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

Erm.... No More Foreigner Trait Head Roles !!!!!!!!! #1670

Merged
merged 10 commits into from
Jan 27, 2025
Merged

Erm.... No More Foreigner Trait Head Roles !!!!!!!!! #1670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
43ed22a
No more foreigner trait head roles!!!!
Jan 27, 2025
c3bf3a3
Fixing merge conflicts
Jan 27, 2025
18b168d
Fixing merge conflicts (again)
Jan 27, 2025
d473467
Merge branch 'master' into erm.-command-fuckery
SixplyDev Jan 27, 2025
81127b6
Roles Changed & Reviewed
Jan 27, 2025
4bf0a5a
Merge branch 'erm.-command-fuckery' of https://github.com/SixplyDev/e…
Jan 27, 2025
db6ab08
Woe, five day blinding stew be upon ye
Jan 27, 2025
07481a7
I nearly forgot HoP
Jan 27, 2025
bc845bd
I forgot the admin assistant too
Jan 27, 2025
925a78d
Mystagogue Fix
SixplyDev Jan 27, 2025
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
5 changes: 5 additions & 0 deletions Resources/Prototypes/DeltaV/Roles/Jobs/Command/administrative_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
- !type:CharacterDepartmentTimeRequirement
department: Epistemics
min: 10800 # 3 hours
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
startingGear: AdminAssistantGear
icon: "JobIconAdminAssitant"
supervisors: job-supervisors-command
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 18000 # 4 hrs
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
- Muted
- Blindness
- Pacifist
- BrittleBoneDisease
SixplyDev marked this conversation as resolved.
Show resolved Hide resolved
startingGear: CorpsmanGear
icon: "JobIconBrigmedic"
supervisors: job-supervisors-hos
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
description: job-description-qm
playTimeTracker: JobQuartermaster
antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
requirements:
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
weight: 10
startingGear: QuartermasterGear
icon: "JobIconQuarterMaster"
Expand Down
7 changes: 7 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Command/captain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
name: job-name-captain
description: job-description-captain
playTimeTracker: JobCaptain
requirements:
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
- Pacifist
weight: 20
startingGear: CaptainGear
icon: "JobIconCaptain"
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
name: job-name-hop
description: job-description-hop
playTimeTracker: JobHeadOfPersonnel
requirements:
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads
startingGear: HoPGear
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
name: job-name-ce
description: job-description-ce
playTimeTracker: JobChiefEngineer
requirements:
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
weight: 10
startingGear: ChiefEngineerGear
icon: "JobIconChiefEngineer"
Expand Down
6 changes: 6 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
description: job-description-cmo
playTimeTracker: JobChiefMedicalOfficer
antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff
requirements:
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
weight: 10
startingGear: CMOGear
icon: "JobIconChiefMedicalOfficer"
Expand Down
7 changes: 6 additions & 1 deletion Resources/Prototypes/Roles/Jobs/Science/research_director.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@
- !type:CharacterTraitRequirement
traits:
- AnomalousPositronics
- !type:CharacterTraitRequirement
inverted: true
traits:
- ShadowkinBlackeye
- !type:CharacterTraitRequirement
inverted: true
traits:
- ShadowkinBlackeye
- Foreigner
- ForeignerLight
weight: 10
startingGear: ResearchDirectorGear
icon: "JobIconResearchDirector"
Expand Down
116 changes: 63 additions & 53 deletions Resources/Prototypes/Roles/Jobs/Security/detective.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,65 @@
- type: job
id: Detective
name: job-name-detective
description: job-description-detective
playTimeTracker: JobDetective
requirements:
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 36000 # DeltaV - 10 hours
startingGear: DetectiveGear
icon: "JobIconDetective"
supervisors: job-supervisors-hos
canBeAntag: false
access:
- Security
#- Brig # Delta V: Removed
- Maintenance
- Service
- Detective
- External
- Cryogenics
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant ]
afterLoadoutSpecial:
- !type:ModifyEnvirosuitSpecial
charges: 6
- !type:ModifyEnvirohelmSpecial
powerCell: PowerCellHigh

- type: startingGear
- type: job
id: Detective
name: job-name-detective
description: job-description-detective
playTimeTracker: JobDetective
requirements:
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 36000 # DeltaV - 10 hours
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
- Muted
- Blindness
- Pacifist
- BrittleBoneDisease
startingGear: DetectiveGear
SixplyDev marked this conversation as resolved.
Show resolved Hide resolved
icon: "JobIconDetective"
supervisors: job-supervisors-hos
canBeAntag: false
access:
- Security
#- Brig # Delta V: Removed
- Maintenance
- Service
- Detective
- External
- Cryogenics
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant ]
afterLoadoutSpecial:
- !type:ModifyEnvirosuitSpecial
charges: 6
- !type:ModifyEnvirohelmSpecial
powerCell: PowerCellHigh

- type: startingGear
id: DetectiveGear
subGear:
- DetectivePlasmamanGear
equipment:
jumpsuit: ClothingUniformJumpsuitDetective
back: ClothingBackpackSecurity
shoes: ClothingShoesBootsCombatFilled
eyes: ClothingEyesGlassesSunglasses
head: ClothingHeadHatFedoraBrown
outerClothing: ClothingOuterVestDetective
id: DetectivePDA
ears: ClothingHeadsetSecurity
belt: ClothingBeltHolsterFilled
innerClothingSkirt: ClothingUniformJumpskirtDetective
satchel: ClothingBackpackSatchelSecurity
duffelbag: ClothingBackpackDuffelSecurity

- type: startingGear
id: DetectivePlasmamanGear
parent: BasePlasmamanSecurityGear
equipment:
jumpsuit: ClothingUniformEnvirosuitDetective
head: ClothingHeadEnvirohelmDetective
gloves: ClothingHandsGlovesEnviroglovesWhite
- DetectivePlasmamanGear

equipment:
jumpsuit: ClothingUniformJumpsuitDetective
back: ClothingBackpackSecurity
shoes: ClothingShoesBootsCombatFilled
eyes: ClothingEyesGlassesSunglasses
head: ClothingHeadHatFedoraBrown
outerClothing: ClothingOuterVestDetective
id: DetectivePDA
ears: ClothingHeadsetSecurity
belt: ClothingBeltHolsterFilled
innerClothingSkirt: ClothingUniformJumpskirtDetective
satchel: ClothingBackpackSatchelSecurity
duffelbag: ClothingBackpackDuffelSecurity

- type: startingGear
id: DetectivePlasmamanGear
parent: BasePlasmamanSecurityGear
equipment:
jumpsuit: ClothingUniformEnvirosuitDetective
head: ClothingHeadEnvirohelmDetective
gloves: ClothingHandsGlovesEnviroglovesWhite
10 changes: 10 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
name: job-name-hos
description: job-description-hos
playTimeTracker: JobHeadOfSecurity
requirements:
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
- Muted
- Blindness
- Pacifist
- BrittleBoneDisease
SixplyDev marked this conversation as resolved.
Show resolved Hide resolved
weight: 10
startingGear: HoSGear
icon: "JobIconHeadOfSecurity"
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
name: job-name-cadet
description: job-description-cadet
playTimeTracker: JobSecurityCadet
requirements:
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
- Muted
- Blindness
- Pacifist
- BrittleBoneDisease
SixplyDev marked this conversation as resolved.
Show resolved Hide resolved
startingGear: SecurityCadetGear
icon: "JobIconSecurityCadet"
supervisors: job-supervisors-security
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 36000 # 10 hours
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
- Muted
- Blindness
- Pacifist
- BrittleBoneDisease
SixplyDev marked this conversation as resolved.
Show resolved Hide resolved
startingGear: SecurityOfficerGear
icon: "JobIconSecurityOfficer"
supervisors: job-supervisors-hos
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 216000 # 60 hrs
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
- Muted
- Blindness
- Pacifist
- BrittleBoneDisease
SixplyDev marked this conversation as resolved.
Show resolved Hide resolved
startingGear: SeniorOfficerGear
icon: "JobIconSeniorOfficer"
supervisors: job-supervisors-hos
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/warden.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,15 @@
tracker: JobDetective
min: 14400 # DeltaV - 4 hours
- !type:CharacterWhitelistRequirement
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
- Muted
- Blindness
- Pacifist
- BrittleBoneDisease
SixplyDev marked this conversation as resolved.
Show resolved Hide resolved
startingGear: WardenGear
icon: "JobIconWarden"
supervisors: job-supervisors-hos
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/_Goobstation/Roles/Jobs/Command/blueshield_officer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 54000 # 15 hours
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
- Muted
- Blindness
- Pacifist
- BrittleBoneDisease
weight: 20
startingGear: BlueshieldOfficerGear
icon: "JobIconBlueshield"
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
- !type:CharacterDepartmentTimeRequirement
department: Security
min: 54000 # 15 hours
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
weight: 20
startingGear: MagistrateGear
icon: "JobIconMagistrate"
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
- !type:CharacterDepartmentTimeRequirement
department: Command
min: 54000 # 15 hours
- !type:CharacterTraitRequirement
inverted: true
traits:
- Foreigner
- ForeignerLight
weight: 20
startingGear: NanotrasenRepresentativeGear
icon: "JobIconNanotrasenRepresentative"
Expand Down
Loading