]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Security Resprite (#29082)
authorFlareguy <78941145+Flareguy@users.noreply.github.com>
Wed, 19 Jun 2024 02:04:03 +0000 (21:04 -0500)
committerGitHub <noreply@github.com>
Wed, 19 Jun 2024 02:04:03 +0000 (22:04 -0400)
* security resprite

* hos cap fix

* i forgor

* further fixes

* my furniture is broken

* fedora update

121 files changed:
Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
Resources/Prototypes/Entities/Clothing/Head/hats.yml
Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-hamster.png [deleted file]
Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png
Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png
Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png
Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png
Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json
Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png
Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png
Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png
Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png
Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json
Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png [deleted file]
Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png
Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png
Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png
Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png
Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json
Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png
Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png
Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png
Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png
Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json
Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png [deleted file]
Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png [deleted file]
Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png
Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png
Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png
Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png
Resources/Textures/Clothing/Head/Helmets/swat.rsi/meta.json
Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png
Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png
Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png
Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/meta.json
Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-vox.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING-vox.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/meta.json [new file with mode: 0644]
Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png
Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png [deleted file]
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png [deleted file]
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png [deleted file]
Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json [deleted file]
Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png
Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png
Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png
Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png
Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png
Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png
Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png [deleted file]
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png [new file with mode: 0644]
Resources/migration.yml

index 91e45c83916ff59a822896abc4a957660e802947..a67ed9397b3d95c187627f4a75a7c158eec57d45 100644 (file)
@@ -4,7 +4,8 @@
     ClothingUniformJumpsuitDetective: 2
     ClothingUniformJumpskirtDetective: 2
     ClothingShoesColorBrown: 2
-    ClothingOuterCoatDetectiveLoadout: 2
+    ClothingOuterCoatDetectiveLoadout: 1
+    ClothingOuterCoatDetectiveLoadoutGrey: 1
     ClothingHeadHatFedoraBrown: 2
     ClothingUniformJumpsuitDetectiveGrey: 2
     ClothingUniformJumpskirtDetectiveGrey: 2
index ca3ba080b76088b4f7e19cb9628b20e9d3ca986a..462b1cb8895a53437ecba59b7da0ba46895d0118 100644 (file)
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatHoshat
-  name: head of security's hat
-  description: "There's a new sheriff in station."
+  name: head of security cap
+  description: The robust standard-issue cap of the Head of Security. For showing the officers who's in charge.
   components:
   - type: Sprite
     sprite: Clothing/Head/Hats/hoshat.rsi
index b5b969551c73e518df4e6997f38312d1da7ed762..fa937c1ccc6e09f392740b0f7fc8bba7a9f84b71 100644 (file)
     sprite: Clothing/OuterClothing/Coats/bomber.rsi
 
 - type: entity
-  parent: [ClothingOuterStorageBase, AllowSuitStorageClothing]
+  parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, ClothingOuterArmorBasic]
   id: ClothingOuterCoatDetective
   name: detective trenchcoat
-  description: A rugged canvas trenchcoat, designed and created by TX Fabrication Corp. Wearing it makes you feel for the plight of the Tibetans.
+  description: An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Coats/detective.rsi
     contents:
     - id: SmokingPipeFilledTobacco
     - id: FlippoEngravedLighter
-  - type: Armor #same as regular sec armor
-    modifiers:
-      coefficients:
-        Blunt: 0.70
-        Slash: 0.70
-        Piercing: 0.70
-        Heat: 0.80
+  - type: ExplosionResistance
+    damageCoefficient: 1 #its a coat. it doesnt do shit
+
+- type: entity
+  parent: [ClothingOuterCoatDetectiveLoadout]
+  id: ClothingOuterCoatDetectiveLoadoutGrey
+  name: noir trenchcoat
+  description: Ah, your trusty coat. There's a few tears here and there, giving it a more timely look. Or at least, that's what you told yourself when you found out gettin' it repaired would set you back 200 speos.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/detective_grey.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/detective_grey.rsi
+
 
 - type: entity
   parent: ClothingOuterCoatDetective
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
 
-- type: entity
-  parent: ClothingOuterStorageBase
-  id: ClothingOuterCoatInspector
-  name: inspector's coat
-  description: A strict inspector's coat for being intimidating during inspections.
-  components:
-  - type: Sprite
-    sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
-  - type: Clothing
-    sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
-
 - type: entity
   parent: ClothingOuterStorageToggleableBase
   id: ClothingOuterCoatJensen
index ea7b4ea0aab1140ed52ac15ababa3730116a1061..5ef711556b5389e1176a97c3bdf4a489529a5aa8 100644 (file)
     sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/hos.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-left
+        sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-right
+        sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
 
 - type: entity
   parent: ClothingUniformSkirtBase
     sprite: Clothing/Uniforms/Jumpskirt/security.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/security.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-left
+        sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-right
+        sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+
 
 - type: entity
   parent: ClothingUniformSkirtBase
     sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/warden.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-left
+        sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpskirt/color.rsi
+      - state: overlay-inhand-right
+        sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+
 
 - type: entity
   parent: ClothingUniformSkirtBase
index a71353051505f0755f9e29eee3658361534d9c6f..a5e57a608d92836d600bde6c914a6f268ea76a62 100644 (file)
     sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/hos.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-left
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-right
 
 - type: entity
   parent: ClothingUniformBase
     sprite: Clothing/Uniforms/Jumpsuit/security.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/security.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-left
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-right
 
 - type: entity
   parent: ClothingUniformBase
     sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/warden.rsi
+  - type: Item
+    inhandVisuals:
+      left:
+      - state: inhand-left
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-left
+      right:
+      - state: inhand-right
+        color: "#C12D30"
+        sprite: Clothing/Uniforms/Jumpsuit/color.rsi
+      - state: overlay-inhand-right
 
 - type: entity
   parent: ClothingUniformBase
diff --git a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-hamster.png
deleted file mode 100644 (file)
index ca8f4f2..0000000
Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET-hamster.png and /dev/null differ
index 36056a0e4effd66116a4fb7938e522d61b217ee4..3eadec710e68b337eee1a8e7f66017c708a91c3f 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png differ
index da90e4a62ec69a21eb44aea9fe24742ae568265d..a7d0e41adb9a759736eb85e4365cb5fec429963a 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png differ
index 28dc2d9d1d193b02e861a019cccc1221e6173e22..8c51d5e5b2be19478522ca025776323b5f7856ad 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png differ
index ef3574b017a37ec7f90c1deb9ed5a1e3bac4ed4e..b1bf119a2820acc47e9dc361e1c6097edd9cf938 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png differ
index ade65863af2dc4511717c91d3a3815549b9d36f9..6154f16eddcf59b3af9008d29fcc96d9a986122e 100644 (file)
@@ -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",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy for SS14. icon state made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
       "name": "equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "equipped-HELMET-hamster",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4
index 20554f5f2a728026670328dc4f708fd171607aea..64f9a1bd80cdd7bf9bc8cb483d3800c9dfc088dc 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png differ
index 634dbe744c98a49795538b37bf80b4d05a90534d..95153962eaefbfb887836b6179875d722c088b0d 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png differ
index 88f5e5ef93d3b8a40c0e80dd987827c2ff49a31e..c6986385b62a41ed02a3e31b42977b8f056f7a25 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-left.png differ
index 8c68945d834d9a9b54a958648d1ab0bdaf0ac6a0..15f87384784c3f4263e271c580bbadb6dadbedb9 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/inhand-right.png differ
index a470e0094432b54e095fa221e474399e0a4651fc..cb460f5efa71305dc1490b4f51efc90259db5ba3 100644 (file)
@@ -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",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy for space station 14. icon state made by Flareguy for Space Station 14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png
deleted file mode 100644 (file)
index 8b7692f..0000000
Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png and /dev/null differ
index f980e7b3ecc83b595894fbdb3e7fb6c363d32ddf..d897247c6ae512c1c7b64791719d2bf70745942b 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png differ
index e441011bcf4b482eb9fcfa85e57ecbfee32a360a..5c93734fe8a6fc6bb23b3f9e3b03e6882866f781 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png differ
index d0213d0eab33d1fe655199c1ee1bf71f380738f3..78a51140c60e47d0273ef2716682b931ccad237f 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png differ
index 36d4c7032f20a1fcf53df46feaecbacac15dc357..aa51e2962bd1f56c2d4aeb59683217fca8de07a0 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png differ
index 9a2a8389628bee108066a28806377f8f0ac0fee8..214d5b0e9efe2310751f59455d66fe210d138b02 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99. Inhands made by Flareguy using equipped-HELMET state",
   "size": {
     "x": 32,
     "y": 32
       "name": "equipped-HELMET",
       "directions": 4
     },
-    {
-      "name": "equipped-HELMET-hamster",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4
index 952b32f3a1a34d817f78106edf11be43b7b9f696..1f6b8adcebab1802edc5ea9f3fef09437b0131f7 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET-vox.png differ
index 3264d3cde68e74db3806cebca526c2235652e343..af6fbcd77e91b4548e02758c7aae86b467dfc9be 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png differ
index a2892255be83484892c98ef9b5520cb55a7c6e80..55eaa9ed576192f415aa1ae648d6b901e3019071 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png differ
index 9640ec825fbbb5a71e9b5fba7c3fa31cb455221e..cd3dc7f55754487223ef403c19298ff7e27bb44c 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png differ
index abfed0635afd64db70893edc4e8d4f236cd25a26..292dc9c99396b13a8671b1659b862e3cd5f11112 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from TGstation github https://github.com/tgstation/tgstation/commit/fed2ddeb54d0fb8bb97cb0a899a088b7d7423bbb. Vox state by Flareguy for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
index 703d927ecfeac2e12f93febd13612df3f9aacf11..47a6bfb145fc646fbcd7a39d6b676832281a8b94 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png differ
index 4fd9f44ff218b7c008b471c3ab41e442597b4e73..fd0c4dd25d592d8337bb365515a28ffa2ca4a513 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png differ
index f8f7501afcdeae45790499ec585f891623d01300..2ddfc4379ffaa54d127ced7954f0621eddb0464d 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png differ
index a8bbe3dfac724962184b35855c0656ca85fddea8..ff0b6b723b7d5bd2c7a454f9f40f101f5292c467 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png
deleted file mode 100644 (file)
index e1ed2d5..0000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png
deleted file mode 100644 (file)
index 634828f..0000000
Binary files a/Resources/Textures/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png and /dev/null differ
index a0653e5c65fbc64f645907146e779c1e28639d6d..20fb373db6596602159c3405569c5d7f5348a9b6 100644 (file)
@@ -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. Vox state by Flareguy for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
       "name": "equipped-HELMET-vox",
       "directions": 4
     },
-    {
-      "name": "light-equipped-HELMET",
-      "directions": 4
-    },
-    {
-      "name": "lighton-equipped-HELMET",
-      "directions": 4
-    },
     {
       "name": "inhand-left",
       "directions": 4
index 1ed974c2062485a30a4592a91e557377c1f73ed6..e13fb420993a8bbe19415f9889a7e35423929dec 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET-vox.png differ
index 030107f05e3e15775b5dc5b634ff75fbd3e26787..770a9c020d10a08a94a3cf4117281026d83eaffa 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/equipped-HELMET.png differ
index c334355ba851e9647f3a9dbe9ad2dc6d4336a326..27ce818b8e55d4006e3ebceec9c45b7418a04956 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-left.png differ
index 423f3fe52e61453a8d7dd00119b1bb5853864aa0..9316e65d1c0fd6e47583a498eda26e54f7bf62ff 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/swat.rsi/inhand-right.png differ
index f505b4e75e8ec42ff663ce30d8f58392d4266f9e..20fb373db6596602159c3405569c5d7f5348a9b6 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites & vox state by Flareguy",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
index e228a8a33aa3e744fa03b1a0c21b20c5f2ed9dab..31bb5b7ada07d3163d6da9c14aaa556c1f2bc29f 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/equipped-HELMET-vox.png differ
index 6c958708c8d3a7a5dec331e390c4f490d080e4c6..194c17066d29c11035a91abe35c63422eaa552b9 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-left.png differ
index e0ab815b503825445f130f89ce44fcd39568966d..2932481da1ac08bd2ecd828bc3dedcbd2ebe6af4 100644 (file)
Binary files a/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png and b/Resources/Textures/Clothing/Head/Helmets/swat_syndicate.rsi/inhand-right.png differ
index a0bf9545853d105a43ad0f050596f29e6a5013cb..20fb373db6596602159c3405569c5d7f5348a9b6 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/fb2d71495bfe81446159ef528534193d09dd8d34, inhand sprites by Flareguy, icon edited by Flareguy. Vox state taken from from Paradise at https://github.com/ParadiseSS13/Paradise/blob/b1658390731745adf5cc9fb039bb0f17ad3c11a7/icons/mob/clothing/species/vox/helmet.dmi ",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644 (file)
index 0000000..2fc3e13
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING-vox.png differ
index 24481b1f748a72469c4818c488e1c0c306a20e6e..4cd72c8e3ce71ce659b7a2a4b1f1de3db2d86768 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png differ
index ed3481d3d2f5aae7ee4ad0f6c8bcfa56d432dfe2..661741d7907ddc66cc5dc11c0a2e3e1fdd981831 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png differ
index 9f79738900ce3497b0f954bc591dd52772eee54b..8274ada74ae288bcf4e409a56fa13a2dd3a47190 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png differ
index b1315700d185c444fcb876ea30b985dc4ebc4064..5e5f6f98166c6e42958e4c3ac3af637889939045 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png differ
index 18a65e16d7160e535ab5275f1c7899ad111f1918..b2c9c730124fb6773f4e36cbfdd336126bc4494f 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
-  "license": "CC0-1.0",
-  "copyright": "Created by EmoGarbage404",
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy. Vox state taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi and modified by Flareguy",
   "size": {
     "x": 32,
     "y": 32
       "name": "equipped-OUTERCLOTHING",
       "directions": 4
     },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644 (file)
index 0000000..c1c1244
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING.png
new file mode 100644 (file)
index 0000000..a7c91b5
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/icon.png
new file mode 100644 (file)
index 0000000..70672d2
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..a661e43
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..3a6c76f
Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/detective_grey.rsi/meta.json
new file mode 100644 (file)
index 0000000..8e05b97
--- /dev/null
@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC0-1.0",
+  "copyright": "Modified from detective coat found in https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 by Flareguy. vox state modified from detective state found in vgstation13 at https://github.com/vgstation-coders/vgstation13/blob//icons/mob/species/vox/suit.dmi. icon state by Flareguy. ",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "equipped-OUTERCLOTHING-vox",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
index 31e6f31708ee89e082de1e959e3349d1cbb4fb2c..e89ec20485b1bc3f084c9b99168a8bffc5af6ab1 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING-vox.png differ
index 987679cecb9360ebe4eaf3d5accdb2d385346739..1d911bfa1a2ab77e9ad334548821332a74707980 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png differ
index 20ac8b6d1894617df8a372bfa656fcf1059a4285..d6f9dad5568755ada119531721da08f08ed14099 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png differ
index aa0228cf311166a4dea8ee2cb77587cd1a4c0159..0aca0dd5172933b6217d86949f27725bee52dc26 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png differ
index 4d6c934790623a62682f9b12edec18509bb4e609..b4012d09ead0e49d474c1de5c9503f851b7b57ec 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png differ
index fa20ea7d5966de6368fef0f820dfc4ce5659d831..afc5942298c6bfefe108166aa0ed55208d2608d5 100644 (file)
@@ -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 , edited by Alekshhh. Vox state made by Flareguy for SS14",
+  "copyright": "Taken from Paradise at commit bad1ec7aa2c86df5794dc6ba28be05ebd0228012",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png
deleted file mode 100644 (file)
index 6790bf5..0000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/equipped-OUTERCLOTHING.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png
deleted file mode 100644 (file)
index 61ad9f9..0000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/icon.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png
deleted file mode 100644 (file)
index 72db471..0000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png
deleted file mode 100644 (file)
index e50751b..0000000
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/inhand-right.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/insp_coat.rsi/meta.json
deleted file mode 100644 (file)
index e482264..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "equipped-OUTERCLOTHING",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}
index a56db4fd532819b5de7ecbcd9158a257f4d6065a..3b01d4176c4b3c57943f79b766855f87bc032c34 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING-vox.png differ
index b62a0318da7d58c352017176a37bd0e25c8d905b..2426c2aa251d5d8004bd9c9b26f2a159640a1be4 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png differ
index b226550a5d194a138fc1b2c6b1c42436bda88da6..2a06209b62840028292224769d2a8344aff2e674 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png differ
index 51b08d956811dd666c430d3fde278fa77329f10f..62d25c958bbf7696ed424a7d2d29e1ef86b88c85 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-left.png differ
index 464ee509bc30432ae4195bbd5fc335e7ead1791f..581ba4b95153a40b2f9c92fc5e83af602c390c3a 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/inhand-right.png differ
index 232bec9c0a223cac83d66f452189c4597a5835d6..cb3e0ab4710a502ed9369ae6ca330a35822eb50d 100644 (file)
@@ -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. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by Flareguy. equipped-OUTERCLOTHING-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/31d6576ba8102135d058ef49c3cb6ecbe8db8a79 and modified by Flareguy",
   "size": {
     "x": 32,
     "y": 32
index 50e6d79c20f04613693cabbc0cffd7bc7e60bcfa..9e02aa280aafa3df1a4ca89fa3349ea4169a5157 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING-vox.png differ
index 2e86e3443836217f147c787667964758efc690bd..73c0691b96b074fc1662d2353a0cdc435b9b70fd 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png differ
index e0de8c7ec981492a6e5debd465de6f09d47aa7b0..043e2709ddbe1b542205954bdde9a9c98e305afe 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png differ
index 457d2f0aa733cb3a3296df9810a1bfa9be2cf83b..30dd5afe3f3712b38b8aa2d2b9b6424e3a5b885d 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-left.png differ
index 46c4bf259c70898d4cb024d5c3ef6b2b54d4f44a..26ec896bf6e00146f7306499ce7abb8e9ba399d8 100644 (file)
Binary files a/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png and b/Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/inhand-right.png differ
index 920eab55204dea7d2928260a66732b7b0bc16b43..175876d3d7216ba8fec30cbd31efe82dce670c50 100644 (file)
@@ -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. Vox state made by Flareguy for Space Station 14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy",
   "size": {
     "x": 32,
     "y": 32
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644 (file)
index b3d41dd..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
index 0eff0ab3faa97701ccfbcb0dc0a0f225d638ff95..54c35ef4551044560a46a5b9441a961249109635 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png differ
index 31ba54e8af73ae0e9400ec5f413262b9154768b6..50d752aa667dc71878b75d1dc2d7ad77eec78096 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png
deleted file mode 100644 (file)
index f3b0529..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png
deleted file mode 100644 (file)
index d7cfdd2..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png and /dev/null differ
index bbcef071e2ea56b2f34b9bce56935fd3387f4ffe..2b78bcd698377d53863a48bdd4d8af50a771245c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "equipped-INNERCLOTHING",
       "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644 (file)
index 9acfc27..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
index 8781d46b5f813e8c7ff779700ad63298ed6531ce..bede369f672c76c6af9164a316f4300048f4b730 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png differ
index accf74dc8f6914bcb3aebc37fb2f9d7279cb28e9..619ad40626dafa109e2a55330075470fe7915f85 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png
deleted file mode 100644 (file)
index 5fc87a9..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png
deleted file mode 100644 (file)
index 1cb708b..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png and /dev/null differ
index 45e0f9141cb3b6fc22a2fbf2f5228103110bf8e2..2b78bcd698377d53863a48bdd4d8af50a771245c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Original sec jumpsuit from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, jumpskirt sprite made by Flareguy for SS14. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "equipped-INNERCLOTHING",
       "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644 (file)
index 8b722ac..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
index 56e7e3567a3cf0de73e70b058d2e37779fc19edc..d2380bdf73a3f1a88df96fecf2ab3adf2b7844fc 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png differ
index 77db2ff02849896ec3e62e2599a9e7021fa026ee..d44522dcca730688581827a0bc9bc6f2a51ded8d 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png
deleted file mode 100644 (file)
index 2ed5523..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png
deleted file mode 100644 (file)
index dec63da..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png and /dev/null differ
index bbcef071e2ea56b2f34b9bce56935fd3387f4ffe..2b78bcd698377d53863a48bdd4d8af50a771245c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpskirt base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
     {
       "name": "equipped-INNERCLOTHING",
       "directions": 4
-    },
-    {
-      "name": "equipped-INNERCLOTHING-monkey",
-      "directions": 4
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644 (file)
index fa049e8..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
index 80984c51c1279bed3a00b126ba8a78a0e03e58d6..bf0b30d17aaf22b79875466bb7c08bd4b62cde48 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png differ
index 94007963536373a456df976363b55170682c921d..b0e364c82595b62246f1167da0eb74a02e2ed973 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png
deleted file mode 100644 (file)
index f3b0529..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png
deleted file mode 100644 (file)
index d7cfdd2..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png and /dev/null differ
index 3f72fb446001b9309f73f5ecea1c404def25837a..8fe98eacbe4f61fd6330ed00db24665e411e7c3c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
       "directions": 4
     },
     {
-      "name": "equipped-INNERCLOTHING-monkey",
+      "name": "overlay-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
+      "name": "overlay-inhand-right",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png
new file mode 100644 (file)
index 0000000..cedb194
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png
new file mode 100644 (file)
index 0000000..8a353cc
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/overlay-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644 (file)
index f17cb06..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
index 2fb771d84c3133abcc7c0cfd62cb6fe93f5016bb..bd0af340983492059665502f749afea8c6356d0f 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png differ
index a3186ba4c1adc2c52ecfd9ec9d273319b934a354..be5b2406d2084843817b52ec611654674a44f94b 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png
deleted file mode 100644 (file)
index 5fc87a9..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png
deleted file mode 100644 (file)
index 1cb708b..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png and /dev/null differ
index c11c48fe747182b2c793344b045d86ec33bc1581..8fe98eacbe4f61fd6330ed00db24665e411e7c3c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github).",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
       "directions": 4
     },
     {
-      "name": "equipped-INNERCLOTHING-monkey",
+      "name": "overlay-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
+      "name": "overlay-inhand-right",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png
new file mode 100644 (file)
index 0000000..f6bb7be
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png
new file mode 100644 (file)
index 0000000..139eaee
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/overlay-inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png
deleted file mode 100644 (file)
index 562402e..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png and /dev/null differ
index a912ead1775d261f2c1a9eb16503ebe4004c45d5..67ba63f7cdbbfad34e817da9a048db76ddedccc7 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png differ
index 331203e531f8b09643c667fe4609c1aa824a18b8..e7ae72ca07f89c8fb9e43ba528a72fd86f154b47 100644 (file)
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png
deleted file mode 100644 (file)
index 2ed5523..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png and /dev/null differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png
deleted file mode 100644 (file)
index dec63da..0000000
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png and /dev/null differ
index 3f72fb446001b9309f73f5ecea1c404def25837a..8fe98eacbe4f61fd6330ed00db24665e411e7c3c 100644 (file)
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14",
+  "copyright": "Created by Flareguy using sprites from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039 & the jumpsuit base found in color.rsi.",
   "size": {
     "x": 32,
     "y": 32
       "directions": 4
     },
     {
-      "name": "equipped-INNERCLOTHING-monkey",
+      "name": "overlay-inhand-left",
       "directions": 4
     },
     {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
+      "name": "overlay-inhand-right",
       "directions": 4
     }
   ]
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png
new file mode 100644 (file)
index 0000000..d3a01e1
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png
new file mode 100644 (file)
index 0000000..ffe5f93
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/overlay-inhand-right.png differ
index 5f73d4d2530b8274ff28310181db947cffb477db..c345d8616d49e834eec4d8f9d4b7e811303ee4ac 100644 (file)
@@ -348,3 +348,6 @@ DoorRemoteFirefight: null
 
 # 2024-06-03
 AirlockServiceCaptainLocked: AirlockCaptainLocked
+
+# 2024-06-15
+ClothingOuterCoatInspector: ClothingOuterCoatDetectiveLoadout
\ No newline at end of file