From 0050dd870ca352d07f46a5c7c4649dedfe36e0bb Mon Sep 17 00:00:00 2001 From: BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com> Date: Mon, 3 Mar 2025 10:31:59 +0100 Subject: [PATCH 1/2] Finally made it so IPCs cant have eye traits blah blah blah WHAT IT SAYS ON THE TITLE --- .../Generic/mindormachine.yml | 18 ++++++++++ Resources/Prototypes/Traits/disabilities.yml | 21 ++++++++++++ Resources/Prototypes/Traits/physical.yml | 34 +++++++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/mindormachine.yml b/Resources/Prototypes/CharacterItemGroups/Generic/mindormachine.yml index 1a15991da55..bf7148b46a5 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/mindormachine.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/mindormachine.yml @@ -43,3 +43,21 @@ id: DermalArmor - type: trait id: CyberEyes + - type: trait + id: NaniteAutoRepairBots + - type: trait + id: BionicLeg + - type: trait + id: FlareShieldingModule + - type: trait + id: SecurityEyesModule + - type: trait + id: MedicalEyesModule + - type: trait + id: DiagnosticEyesModule + - type: trait + id: OmniEyesModule + - type: trait + id: LightAmplificationModule + - type: trait + id: ThermographicVisionModule diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml index 85c6d72cbf8..2f5e41cafc0 100644 --- a/Resources/Prototypes/Traits/disabilities.yml +++ b/Resources/Prototypes/Traits/disabilities.yml @@ -14,6 +14,13 @@ - Photophobia - Nearsighted - CyberEyes + - FlareShieldingModule + - SecurityEyesModule + - MedicalEyesModule + - DiagnosticEyesModule + - OmniEyesModule + - LightAmplificationModule + - ThermographicVisionModule functions: - !type:TraitAddComponent components: @@ -34,6 +41,13 @@ traits: - Blindness - CyberEyes + - FlareShieldingModule + - SecurityEyesModule + - MedicalEyesModule + - DiagnosticEyesModule + - OmniEyesModule + - LightAmplificationModule + - ThermographicVisionModule functions: - !type:TraitAddComponent components: @@ -288,6 +302,13 @@ traits: - Blindness - CyberEyes + - FlareShieldingModule + - SecurityEyesModule + - MedicalEyesModule + - DiagnosticEyesModule + - OmniEyesModule + - LightAmplificationModule + - ThermographicVisionModule functions: - !type:TraitReplaceComponent components: diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index 926ed5c3b78..41a6b534774 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -594,6 +594,10 @@ inverted: true jobs: - Prisoner # Bionics should be "Confiscated" from long term prisoners. + - !type:CharacterSpeciesRequirement + inverted: true + species: + - IPC - !type:CharacterTraitRequirement inverted: true traits: @@ -899,6 +903,12 @@ - !type:CharacterSpeciesRequirement species: - IPC + - !type:CharacterTraitRequirement + inverted: true + traits: + - Photophobia + - Blindness + - Nearsighted - !type:CharacterItemGroupRequirement group: TraitsMind functions: @@ -926,6 +936,9 @@ inverted: true traits: - OmniEyesModule + - Photophobia + - Blindness + - Nearsighted - !type:CharacterItemGroupRequirement group: TraitsMind functions: @@ -952,6 +965,9 @@ traits: - DiagnosticEyesModule - OmniEyesModule + - Photophobia + - Blindness + - Nearsighted - !type:CharacterItemGroupRequirement group: TraitsMind functions: @@ -981,6 +997,9 @@ traits: - MedicalEyesModule - OmniEyesModule + - Photophobia + - Blindness + - Nearsighted - !type:CharacterItemGroupRequirement group: TraitsMind functions: @@ -1010,6 +1029,9 @@ - !type:CharacterTraitRequirement inverted: true traits: + - Photophobia + - Blindness + - Nearsighted - MedicalEyesModule - DiagnosticEyesModule - SecurityEyesModule @@ -1042,6 +1064,12 @@ - !type:CharacterSpeciesRequirement species: - IPC + - !type:CharacterTraitRequirement + inverted: true + traits: + - Photophobia + - Blindness + - Nearsighted - !type:CharacterItemGroupRequirement group: TraitsMind functions: @@ -1061,6 +1089,12 @@ - !type:CharacterSpeciesRequirement species: - IPC + - !type:CharacterTraitRequirement + inverted: true + traits: + - Photophobia + - Blindness + - Nearsighted - !type:CharacterItemGroupRequirement group: TraitsMind functions: From db0fcdf409125b2b3014d171fc374dbfe920a7da Mon Sep 17 00:00:00 2001 From: BloodfiendishOperator <141253729+Diggy0@users.noreply.github.com> Date: Mon, 3 Mar 2025 19:37:12 +0100 Subject: [PATCH 2/2] Comically minor fix teeny tiny fix for my bionic leg thingy. --- Resources/Locale/en-US/traits/traits.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 5c144d6cc77..9f36b5fb7ad 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -551,7 +551,7 @@ trait-name-NaniteAutoRepairBots = Nanite Auto-Repair Bots trait-description-NaniteAutoRepairBots = Your chassis has been outfitted with Nanite Repair Drones. Whenever your sensors detect that you've recieved structural damage, the NRDs will activate to bring you back to operational standards. -trait-name-BionicLeg = Bionic Leg +trait-name-BionicLeg = Bionic Legs trait-description-BionicLeg = One or more of your limbs have been replaced with an expensive, state of the art bionic. It could be either one made of highly realistic synthflesh, or a more obvious metal limb. This limb provides enhanced speed to it's user, allowing you to run away from situations faster or get to a place faster.