fix mindshield shits

FFATroop · Mar 2, 2024 · 525cce3 · 525cce3
1 parent 9cc1126
commit 525cce3
Show file tree

Hide file tree

Showing 23 changed files with 48 additions and 28 deletions.
diff --git a/Resources/Prototypes/TS/Entities/StatusEffect/job.yml b/Resources/Prototypes/TS/Entities/StatusEffect/job.yml
@@ -3,68 +3,68 @@
   parent: JobIcon
   id: JobIconMarine
   icon:
-    sprite: TS/Interface/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Marine
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconJobMarineMedic
   icon:
-    sprite: TS/Interface/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MarineMedic
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMarineEngineer
   icon:
-    sprite: TS/Interface/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MarineEngineer
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMarinePilot
   icon:
-    sprite: TS/Interface/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MarinePilot
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMechPilot
   icon:
-    sprite: TS/Interface/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MechPilot
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMilitaryBorg
   icon:
-    sprite: TS/Interface/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MilitaryBorg
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconRoboPlatoonCommander
   icon:
-    sprite: TS/Interface/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: RoboPlatoonCommander
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconMechPlatoonCommander
   icon:
-    sprite: TS/Interface/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: MechPlatoonCommander
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconPlatoonCommander
   icon:
-    sprite: TS/Interface/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: PlatoonCommander
 
 - type: statusIcon
   parent: JobIcon
   id: JobIconCompanyCommander
   icon:
-    sprite: TS/Interface/job_icons.rsi
+    sprite: /Textures/Interface/Misc/job_icons.rsi
     state: CompanyCommander
diff --git a/Resources/Prototypes/TS/Roles/Combat/company_commander.yml b/Resources/Prototypes/TS/Roles/Combat/company_commander.yml
@@ -31,8 +31,6 @@
   - !type:AddComponentSpecial
     components:
     - type: MarineSpecial
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: CompanyCommanderGear

diff --git a/Resources/Prototypes/TS/Roles/Combat/marine.yml b/Resources/Prototypes/TS/Roles/Combat/marine.yml
@@ -20,8 +20,6 @@
   - !type:AddComponentSpecial
     components:
     - type: MarineSpecial
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: MarineBaseGear

diff --git a/Resources/Prototypes/TS/Roles/Combat/marine_engineer.yml b/Resources/Prototypes/TS/Roles/Combat/marine_engineer.yml
@@ -25,8 +25,6 @@
   - !type:AddComponentSpecial
     components:
     - type: MarineSpecial
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: MarineEngineerGear

diff --git a/Resources/Prototypes/TS/Roles/Combat/marine_medic.yml b/Resources/Prototypes/TS/Roles/Combat/marine_medic.yml
@@ -25,8 +25,6 @@
   - !type:AddComponentSpecial
     components:
     - type: MarineSpecial
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: MarineMedicGear

diff --git a/Resources/Prototypes/TS/Roles/Combat/marine_pilot.yml b/Resources/Prototypes/TS/Roles/Combat/marine_pilot.yml
@@ -26,8 +26,6 @@
   - !type:AddComponentSpecial
     components:
     - type: MarineSpecial
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: MarinePilotGear

diff --git a/Resources/Prototypes/TS/Roles/Combat/mech_pilot.yml b/Resources/Prototypes/TS/Roles/Combat/mech_pilot.yml
@@ -23,8 +23,6 @@
   - !type:AddComponentSpecial
     components:
     - type: MarineSpecial
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: MechPilotGear

diff --git a/Resources/Prototypes/TS/Roles/Combat/mech_platoon_commander.yml b/Resources/Prototypes/TS/Roles/Combat/mech_platoon_commander.yml
@@ -33,8 +33,6 @@
   - !type:AddComponentSpecial
     components:
     - type: MarineSpecial
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: MechPlatoonCommanderGear

diff --git a/Resources/Prototypes/TS/Roles/Combat/platoon_commander.yml b/Resources/Prototypes/TS/Roles/Combat/platoon_commander.yml
@@ -31,8 +31,6 @@
   - !type:AddComponentSpecial
     components:
     - type: MarineSpecial
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: PlatoonCommanderGear

diff --git a/Resources/Prototypes/TS/Roles/Combat/robo_platoon_commander.yml b/Resources/Prototypes/TS/Roles/Combat/robo_platoon_commander.yml
@@ -32,8 +32,6 @@
   - !type:AddComponentSpecial
     components:
     - type: MarineSpecial
-  - !type:AddImplantSpecial
-    implants: [ MindShieldImplant ]
 
 - type: startingGear
   id: RoboPlatoonCommanderGear

diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/CompanyCommander.png b/Resources/Textures/Interface/Misc/job_icons.rsi/CompanyCommander.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Marine.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Marine.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MarineEngineer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MarineEngineer.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MarineMedic.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MarineMedic.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MarinePilot.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MarinePilot.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MechPilot.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MechPilot.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MechPlatoonCommander.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MechPlatoonCommander.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MilitaryBorg.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MilitaryBorg.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/PlatoonCommander.png b/Resources/Textures/Interface/Misc/job_icons.rsi/PlatoonCommander.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/RoboPlatoonCommander.png b/Resources/Textures/Interface/Misc/job_icons.rsi/RoboPlatoonCommander.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -185,6 +185,37 @@
         },
         {
             "name": "Visitor"
+        },
+
+		{
+            "name": "CompanyCommander"
+        },
+        {
+            "name": "PlatoonCommander"
+        },
+		{
+            "name": "RoboPlatoonCommander"
+        },
+        {
+            "name": "MechPlatoonCommander"
+        },
+        {
+            "name": "Marine"
+        },
+		{
+            "name": "MarineMedic"
+        },
+		{
+            "name": "MarineEngineer"
+        },
+		{
+            "name": "MarinePilot"
+        },
+        {
+            "name": "MilitaryBorg"
+        },
+		{
+            "name": "MechPilot"
         }
     ]
 }
diff --git a/Resources/Textures/TS/Interface/job_icons.rsi/MindShield.png b/Resources/Textures/TS/Interface/job_icons.rsi/MindShield.png
diff --git a/Resources/Textures/TS/Interface/job_icons.rsi/meta.json b/Resources/Textures/TS/Interface/job_icons.rsi/meta.json
@@ -7,6 +7,13 @@
         "y": 8
     },
     "states": [
+	    {
+            "name": "MindShield",
+            "delays":
+            [
+                [0.5,0.5]
+            ]
+        },
         {
             "name": "CompanyCommander"
         },