Feat sprite porting

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -110,7 +110,7 @@
         - !type:DoActsBehavior
           acts: ["Destruction"]
     - type: Sprite
-      sprite: Structures/Doors/Airlocks/Standard/firelock.rsi
+      sprite: _Maid/Structures/Doors/Airlocks/Standard/firelock.rsi # Maid
       snapCardinals: true
       layers:
         - state: closed

Resources/Prototypes/Recipes/Lathes/circuitry.yml

@@ -32,7 +32,7 @@
 - type: latheRecipe
   parent: [ BaseCheapElectronicsRecipe, BaseCircuitryRecipeCategory ]
   id: FirelockElectronics
-  icon: { sprite: Structures/Doors/Airlocks/Standard/firelock.rsi, state: closed } # Goobstation
+  icon: { sprite: _Maid/Structures/Doors/Airlocks/Standard/firelock.rsi, state: closed } # Goobstation # Maid
   result: FirelockElectronics
 
 - type: latheRecipe

Resources/Prototypes/_Goobstation/Entities/Objects/Misc/identification_cards.yml

@@ -63,7 +63,12 @@
   - type: Sprite
     sprite: Objects/Misc/id_cards.rsi
     layers:
-    - state: ert_security
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: IdCard
     jobTitle: job-name-hecu
     jobIcon: JobIconNanotrasen
@@ -84,7 +89,11 @@
   - type: Sprite
     layers:
     - state: centcom
-    - state: idcentcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: Item
     heldPrefix:
   - type: PresetIdCard
@@ -102,7 +111,11 @@
   - type: Sprite
     layers:
     - state: centcom
-    - state: idcentcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: Item
     heldPrefix:
   - type: PresetIdCard
@@ -120,7 +133,11 @@
   - type: Sprite
     layers:
     - state: centcom
-    - state: idcentcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: Item
     heldPrefix:
   - type: PresetIdCard
@@ -194,7 +211,12 @@
   - type: Sprite
     sprite: Objects/Misc/id_cards.rsi
     layers:
-    - state: ert_security
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: PresetIdCard
     job: NavyCaptain
 
@@ -208,7 +230,12 @@
   - type: Sprite
     sprite: Objects/Misc/id_cards.rsi
     layers:
-    - state: ert_security
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: PresetIdCard
     job: NavyOfficer
 
@@ -222,7 +249,12 @@
   - type: Sprite
     sprite: Objects/Misc/id_cards.rsi
     layers:
-    - state: ert_security
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: PresetIdCard
     job: SpecialOperationsOfficer
 
@@ -236,7 +268,12 @@
   - type: Sprite
     sprite: Objects/Misc/id_cards.rsi
     layers:
-    - state: ert_security
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: PresetIdCard
     job: Inspector
 
@@ -250,7 +287,12 @@
   - type: Sprite
     sprite: Objects/Misc/id_cards.rsi
     layers:
-    - state: ert_security
+    - state: centcom
+    - state: departmenthead
+      color: "#1B67A5"
+    - state: subdepartment
+      color: "#1B67A5"
+    - state: cc
   - type: IdCard
     jobTitle: job-name-diplomat
     jobIcon: JobIconNanotrasen

Resources/Textures/Clothing/Belt/emt.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "New sprites drawn by JoeHammad1844, old sprites drawn by Ubaser.",
+  "copyright": "Drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Hands/Gloves/Color/yellow.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Hands/Gloves/janitor.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Drawn by Ubaser, recolored by InfinityRedPanda.",
+  "copyright": "Drawn by Ubaser.",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Hands/Gloves/latex.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Hands/Gloves/nitrile.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Inhand sprites by SeamLesss (Github)",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by discord:SOL(Артур)#8162. Vox states by Flareguy for Space Station 14",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide",
   "size": {
     "x": 32,
     "y": 32
@@ -17,17 +17,9 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by discord:SOL(Артур)#8162. Vox states by Flareguy for Space Station 14",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide",
   "size": {
     "x": 32,
     "y": 32
@@ -17,17 +17,9 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by discord:SOL(Артур)#8162. Vox states by Flareguy for Space Station 14",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide",
   "size": {
     "x": 32,
     "y": 32
@@ -17,17 +17,9 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by discord:SOL(Артур)#8162. Vox states by Flareguy for Space Station 14",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide",
   "size": {
     "x": 32,
     "y": 32
@@ -17,17 +17,9 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Created by discord:SOL(Артур)#8162. Vox states by Flareguy for Space Station 14",
+  "copyright": "Taken from paradisestation at commit https://github.com/ParadiseSS13/Paradise/commit/f09526480788c2e18fff8c16c4318fd6b4272c10 inhands by peptide",
   "size": {
     "x": 32,
     "y": 32
@@ -17,17 +17,9 @@
       "name": "off-equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "off-equipped-HELMET-vox",
-      "directions": 4
-    },
     {
       "name": "on-equipped-HELMET",
       "directions": 4
-    },
-    {
-      "name": "on-equipped-HELMET-vox",
-      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, texture edited by TeaMaki (On github TeaMakiNL), Inhands by onesch",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
   "size": {
     "x": 32,
     "y": 32
@@ -13,14 +13,6 @@
     {
       "name": "equipped-HELMET",
       "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser. vox state by Flareguy",
+  "copyright": "Taken from paradise station at commit https://github.com/ParadiseSS13/Paradise/commit/e5e584804b4b0b373a6a69d23afb73fd3c094365, redrawn by Ubaser",
   "size": {
     "x": 32,
     "y": 32
@@ -14,10 +14,6 @@
       "name": "equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "equipped-HELMET-vox",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4

Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae. vox state by Flareguy",
+  "copyright": "Taken from tgstation at commit https://github.com/discordia-space/CEV-Eris/commit/760f0be7af33a31f5a08a3291864e91539d0ebb7",
   "size": {
     "x": 32,
     "y": 32
@@ -13,10 +13,6 @@
     {
       "name": "equipped-HELMET",
       "directions": 4
-    },
-    {
-      "name": "equipped-HELMET-vox",
-      "directions": 4
     }
   ]
 }

Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, sprites updated by JORJ949",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
   "size": {
     "x": 32,
     "y": 32