From 1eea192ba67eabe11e1a676c2cf9070e426aa41a Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Tue, 8 Oct 2024 21:50:42 +0200 Subject: [PATCH 1/3] Blackeye-Shadowkin --- .../Roles/Jobs/Justice/chief_justice.yml | 19 +++++++------- .../DeltaV/Roles/Jobs/Security/brigmedic.yml | 19 +++++++------- .../Entities/Mobs/Species/shadowkin.yml | 1 + .../Roles/Jobs/Security/prisonguard.yml | 19 +++++++------- .../Roles/Jobs/Wildcards/prisoner.yml | 21 ++++++++------- Resources/Prototypes/Roles/Antags/Thief.yml | 21 ++++++++------- .../Prototypes/Roles/Antags/revolutionary.yml | 19 +++++++------- Resources/Prototypes/Roles/Antags/traitor.yml | 19 +++++++------- .../Roles/Jobs/Cargo/quartermaster.yml | 19 +++++++------- .../Prototypes/Roles/Jobs/Command/captain.yml | 20 +++++++------- .../Roles/Jobs/Command/head_of_personnel.yml | 19 +++++++------- .../Roles/Jobs/Engineering/chief_engineer.yml | 19 +++++++------- .../Jobs/Medical/chief_medical_officer.yml | 19 +++++++------- .../Roles/Jobs/Security/detective.yml | 19 +++++++------- .../Roles/Jobs/Security/head_of_security.yml | 19 +++++++------- .../Roles/Jobs/Security/security_cadet.yml | 19 +++++++------- .../Roles/Jobs/Security/security_officer.yml | 19 +++++++------- .../Roles/Jobs/Security/senior_officer.yml | 19 +++++++------- .../Prototypes/Roles/Jobs/Security/warden.yml | 19 +++++++------- Resources/Prototypes/Species/shadowkin.yml | 4 +-- Resources/Prototypes/Traits/species.yml | 26 +++++++++---------- 21 files changed, 198 insertions(+), 180 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml index 7ff8aa6fb5e..8eabf20ebf2 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml @@ -16,15 +16,16 @@ - !type:CharacterOverallTimeRequirement min: 90000 # 25 hours - !type:CharacterWhitelistRequirement # whitelist requirement because I don't want any dingus judges - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye weight: 20 startingGear: CJGear icon: "JobIconChiefJustice" diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml index 9df58d6a48d..6c1058d59a0 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml @@ -10,15 +10,16 @@ - !type:DepartmentTimeRequirement department: Security min: 18000 # 4 hrs - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye startingGear: CorpsmanGear icon: "JobIconBrigmedic" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index 2a6473796ff..02616b368d0 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -219,6 +219,7 @@ eyeDamage: 1 durationMultiplier: 1.5 - type: Shadowkin + blackeyeSpawn: true - type: Psionic mindbreakingFeedback: shadowkin-blackeye manaGain: 0.25 diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml index 849999b249c..55fc97a1164 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Security/prisonguard.yml @@ -9,15 +9,16 @@ - !type:DepartmentTimeRequirement department: Security min: 7200 # 2hr floof - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye startingGear: PrisonGuardGear alwaysUseSpawner: true canBeAntag: false diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml index caeb8eaad58..92cb4880536 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml @@ -8,16 +8,17 @@ canBeAntag: false icon: "JobIconPrisoner" supervisors: job-supervisors-security - requirements: - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # requirements: + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye - type: startingGear id: PrisonerGear diff --git a/Resources/Prototypes/Roles/Antags/Thief.yml b/Resources/Prototypes/Roles/Antags/Thief.yml index d6af80a9ac1..8d95a3712fa 100644 --- a/Resources/Prototypes/Roles/Antags/Thief.yml +++ b/Resources/Prototypes/Roles/Antags/Thief.yml @@ -4,13 +4,14 @@ antagonist: true setPreference: true objective: roles-antag-thief-objective - requirements: - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye \ No newline at end of file + # requirements: + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml index 383ade36e95..c14e461d1d0 100644 --- a/Resources/Prototypes/Roles/Antags/revolutionary.yml +++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml @@ -10,15 +10,16 @@ - !type:CharacterDepartmentTimeRequirement # DeltaV - Command dept time requirement department: Command min: 14400 # Floofstation - 4 hours - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye - type: antag id: Rev diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index 8fe7a4c58b2..d6c14bda015 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -7,12 +7,13 @@ requirements: - !type:CharacterOverallTimeRequirement # DeltaV - Playtime requirement min: 14400 # Floofstation - 4 hours - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 5fb9a8e875f..ef0d14fb6ad 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -11,15 +11,16 @@ - !type:CharacterDepartmentTimeRequirement department: Logistics # DeltaV - Logistics Department replacing Cargo min: 14400 #Floofstation 4 hour - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 297c8bd455f..8e3c0eaab92 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -22,16 +22,16 @@ - !type:CharacterDepartmentTimeRequirement department: Command min: 14400 # Floofstation - 4 hour - - !type:CharacterWhitelistRequirement - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 0f8a2ec4586..aa15b260b05 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -8,15 +8,16 @@ - !type:CharacterDepartmentTimeRequirement # DeltaV - Civilian dept time requirement department: Civilian min: 14400 # Floofstation 4 hours - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye weight: 10 # DeltaV - Changed HoP weight from 20 to 10 due to them not being more important than other Heads startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 2109e359688..dc354b01f27 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -7,15 +7,16 @@ - !type:CharacterDepartmentTimeRequirement department: Engineering min: 14400 # Floofstation - 4 hour - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye # - !type:OverallPlaytimeRequirement # time: 72000 # DeltaV - 20 hours weight: 10 diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index e0f6077ce50..beeb096304f 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -10,15 +10,16 @@ - !type:CharacterDepartmentTimeRequirement department: Medical min: 14400 # Floofstation - 4 hour - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 008f91748b3..1ca232aa6e7 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -7,15 +7,16 @@ - !type:CharacterDepartmentTimeRequirement department: Security min: 14400 # Floofstation - 4 hour - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 913913aaf1a..f59ba3607ac 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -8,15 +8,16 @@ department: Command min: 14400 # Floofstation - 4 hour - !type:CharacterWhitelistRequirement - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 53d583b868a..fcfb739a74c 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -6,15 +6,16 @@ requirements: - !type:CharacterOverallTimeRequirement min: 3600 # Floofstation - 1 hour - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye # - !type:DepartmentTimeRequirement # DeltaV - Removes time limit # department: Security # time: 54000 #15 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 5190a667939..84e1f9e8505 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -7,15 +7,16 @@ - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # Floofstation - 1 hour - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml index 54ae3283e59..83cada78fbc 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml @@ -8,15 +8,16 @@ - !type:CharacterDepartmentTimeRequirement department: Security min: 3600 # Floofstation - 1 hour - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye startingGear: SeniorOfficerGear icon: "JobIconSeniorOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 5f5e17f236b..eea05ed9eee 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -7,15 +7,16 @@ - !type:CharacterPlaytimeRequirement # DeltaV - JobSecurityOfficer time requirement. Make them experienced in proper officer work. tracker: JobSecurityOfficer min: 3600 # Floofstation - 1 hour - - !type:CharacterLogicOrRequirement - requirements: - - !type:CharacterSpeciesRequirement - inverted: true - species: - - Shadowkin - - !type:CharacterTraitRequirement - traits: - - ShadowkinBlackeye + # - !type:CharacterLogicOrRequirement + # requirements: + # - !type:CharacterSpeciesRequirement + # inverted: true + # species: + # - Shadowkin + # - !type:CharacterTraitRequirement + # inverted: true + # traits: + # - ShadowkinBlackeye startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Species/shadowkin.yml b/Resources/Prototypes/Species/shadowkin.yml index 53f836d261f..7043397d8e7 100644 --- a/Resources/Prototypes/Species/shadowkin.yml +++ b/Resources/Prototypes/Species/shadowkin.yml @@ -1,10 +1,10 @@ - type: species id: Shadowkin name: species-name-shadowkin - roundStart: false + roundStart: true prototype: MobShadowkin sprites: MobShadowkinSprites - defaultSkinTone: "#323232" + defaultSkinTone: "#FFFFFF" markingLimits: MobShadowkinMarkingLimits dollPrototype: MobShadowkinDummy skinColoration: Hues diff --git a/Resources/Prototypes/Traits/species.yml b/Resources/Prototypes/Traits/species.yml index 17be3489fe1..d6d92fe912c 100644 --- a/Resources/Prototypes/Traits/species.yml +++ b/Resources/Prototypes/Traits/species.yml @@ -61,16 +61,16 @@ - Swashbuckler - Spearmaster -- type: trait - id: ShadowkinBlackeye - category: Mental - points: 4 - componentRemovals: - - Shadowkin - components: - - type: Shadowkin - blackeyeSpawn: true - requirements: - - !type:CharacterSpeciesRequirement - species: - - Shadowkin \ No newline at end of file +# - type: trait +# id: ShadowkinBlackeye +# category: Mental +# points: -4 +# componentRemovals: +# - Shadowkin +# components: +# - type: Shadowkin +# blackeyeSpawn: false +# requirements: +# - !type:CharacterSpeciesRequirement +# species: +# - Shadowkin \ No newline at end of file From 68278764b40313ff7f2dedd84a2f2f2819fbba56 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Tue, 8 Oct 2024 21:56:42 +0200 Subject: [PATCH 2/3] Some Forced Editions --- .../Mobs/Customization/Markings/shadowkin.yml | 2 +- .../Entities/Mobs/Species/shadowkin.yml | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/shadowkin.yml index 038da170b56..b38b2d6030a 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/shadowkin.yml @@ -44,7 +44,7 @@ id: TailShadowkinBigFluff bodyPart: Tail markingCategory: Tail - speciesRestriction: [Shadowkin] + speciesRestriction: [Shadowkin, Reptilian] sprites: - sprite: Mobs/Customization/Shadowkin/tails64x32.rsi state: shadowkin_big_fluff diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index 02616b368d0..1dda05958f5 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -220,16 +220,16 @@ durationMultiplier: 1.5 - type: Shadowkin blackeyeSpawn: true - - type: Psionic - mindbreakingFeedback: shadowkin-blackeye - manaGain: 0.25 - mana: 150 - maxMana: 250 - bypassManaCheck: true - removable: false - - type: InnatePsionicPowers - powersToAdd: - - ShadowkinPowers + # - type: Psionic + # mindbreakingFeedback: shadowkin-blackeye + # manaGain: 0.25 + # mana: 150 + # maxMana: 250 + # bypassManaCheck: true + # removable: false + # - type: InnatePsionicPowers + # powersToAdd: + # - ShadowkinPowers - type: LanguageKnowledge speaks: - TauCetiBasic From 01b4a34a56110a62316b9514a4b773c4f826613b Mon Sep 17 00:00:00 2001 From: FoxxoTrystan Date: Tue, 8 Oct 2024 23:56:51 +0200 Subject: [PATCH 3/3] fix blackeye --- .../Entities/Mobs/Species/shadowkin.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml index 1dda05958f5..02616b368d0 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/shadowkin.yml @@ -220,16 +220,16 @@ durationMultiplier: 1.5 - type: Shadowkin blackeyeSpawn: true - # - type: Psionic - # mindbreakingFeedback: shadowkin-blackeye - # manaGain: 0.25 - # mana: 150 - # maxMana: 250 - # bypassManaCheck: true - # removable: false - # - type: InnatePsionicPowers - # powersToAdd: - # - ShadowkinPowers + - type: Psionic + mindbreakingFeedback: shadowkin-blackeye + manaGain: 0.25 + mana: 150 + maxMana: 250 + bypassManaCheck: true + removable: false + - type: InnatePsionicPowers + powersToAdd: + - ShadowkinPowers - type: LanguageKnowledge speaks: - TauCetiBasic