Merge pull request #245 from FoxxoTrystan/blackeye-shadowkin

Blackeye-Shadowkin
Fansana · Oct 9, 2024 · d78c6ad · d78c6ad
2 parents 5929841 + 01b4a34
commit d78c6ad
Show file tree

Hide file tree

Showing 22 changed files with 199 additions and 181 deletions.
diff --git 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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
+  # requirements:
+  # - !type:CharacterLogicOrRequirement
+  #     requirements:
+  #       - !type:CharacterSpeciesRequirement
+  #         inverted: true
+  #         species:
+  #           - Shadowkin
+  #       - !type:CharacterTraitRequirement
+  #         inverted: true
+  #         traits:
+  #           - ShadowkinBlackeye
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"