diff --git a/Resources/Changelog/Parts/changelog1.yml b/Resources/Changelog/Parts/changelog1.yml
new file mode 100644
index 0000000000..9d637179c8
--- /dev/null
+++ b/Resources/Changelog/Parts/changelog1.yml
@@ -0,0 +1,4 @@
+author: Swept
+changes:
+  - type: Add # One of the following: Add, Remove, Tweak, Fix
+    message: Add jumpskirt for Captain
diff --git a/Resources/Changelog/Parts/changelog2.yml b/Resources/Changelog/Parts/changelog2.yml
new file mode 100644
index 0000000000..88789e0176
--- /dev/null
+++ b/Resources/Changelog/Parts/changelog2.yml
@@ -0,0 +1,4 @@
+author: Swept
+changes:
+  - type: Fix # One of the following: Add, Remove, Tweak, Fix
+    message: Fix holes in Captain's jumpsuit
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
index a2b8f84d36..da924a7b3b 100644
--- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -9,6 +9,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpskirtCaptain
+  name: captain's jumpskirt
+  description: It's a blue jumpskirt with some gold markings denoting the rank of "Captain".
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/captain.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/captain.rsi
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtCargo
diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
index 8c0bbb9666..19beb7c082 100644
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -40,5 +40,6 @@
     outerclothing: ClothingOuterHardsuitCap
     idcard: CaptainPDA
     ears: ClothingHeadsetAltCommand
+  innerclothingskirt: ClothingUniformJumpskirtCaptain
   satchel: ClothingBackpackSatchelCaptainFilled
   duffelbag: ClothingBackpackDuffelCaptainFilled
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 0000000000..116cce4ad7
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png
new file mode 100644
index 0000000000..477d8e4873
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png
new file mode 100644
index 0000000000..c48c84c07f
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png
new file mode 100644
index 0000000000..6b5de1dfa5
Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
new file mode 100644
index 0000000000..a0e86f87fd
--- /dev/null
+++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/captain.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png
index f64c76e54c..d5d1d5c979 100644
Binary files a/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/captain.rsi/equipped-INNERCLOTHING.png differ