diff --git a/code/__DEFINES/~~bubber_defines/robot_defines.dm b/code/__DEFINES/~~bubber_defines/robot_defines.dm
index 84691c1d528..8a086f942e9 100644
--- a/code/__DEFINES/~~bubber_defines/robot_defines.dm
+++ b/code/__DEFINES/~~bubber_defines/robot_defines.dm
@@ -206,6 +206,24 @@
 #define CYBORG_ICON_CC_XENOBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_CC.dmi'
 #define CYBORG_ICON_SEC_XENOBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_sec.dmi'
 #define CYBORG_ICON_CLOWN_XENOBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/xenomorphborgs/xenoborg_clown.dmi'
+
+// SKIFF ICON DEFINES - Sprites by Giik and BitSynergy
+// #define CYBORG_ICON_TYPE_SKIFF "skiff"
+#define CYBORG_ICON_CARGO_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_cargo.dmi'
+#define CYBORG_ICON_CLOWN_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_clown.dmi'
+#define CYBORG_ICON_ENG_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_eng.dmi'
+#define CYBORG_ICON_JANI_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_jani.dmi'
+#define CYBORG_ICON_MED_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_med.dmi'
+#define CYBORG_ICON_MINE_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_mine.dmi'
+#define CYBORG_ICON_NINJA_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_ninja.dmi'
+#define CYBORG_ICON_PK_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_pk.dmi'
+#define CYBORG_ICON_SCI_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_sci.dmi'
+#define CYBORG_ICON_SEC_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_sec.dmi'
+#define CYBORG_ICON_SERV_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_serv.dmi'
+#define CYBORG_ICON_GEN_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_standard.dmi'
+#define CYBORG_ICON_SYNDIE_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_syndie.dmi'
+#define CYBORG_ICON_LUST_SKIFF 'modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_lustwish.dmi'
+
 /************************************************************
 				CYBORG HAT OFFSETS GO BELOW
 *************************************************************/
@@ -262,3 +280,6 @@
 #define XENOBORG_HAT_OFFSET \
 	SKIN_HAT_OFFSET = list("north" = list(16, 10), "south" = list(16, 5), "east" = list(32, 7), "west" = list(0, 7)), \
 	SKIN_HAT_REST_OFFSET = list("north" = list(16, 6), "south" = list(16, 6), "east" = list(31, 6), "west" = list(1, 6))
+#define SKIFF_HAT_OFFSET \
+	SKIN_HAT_OFFSET = list("north" = list(0, -6), "south" = list(0, -5), "east" = list(-1, -5), "west" = list(1, -5)), \
+	SKIN_HAT_REST_OFFSET = list("north" = list(0, -12), "south" = list(0, -18), "east" = list(6, -18), "west" = list(-6, -18))
diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
index 516461841ee..d5b6841e26b 100644
--- a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
+++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
@@ -249,6 +249,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_science",
+			SKIN_ICON = CYBORG_ICON_SCI_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL), // Even if they aren't quadruped, it needs to be here for resting states to work
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 /* BUBBER SPRITE ADDITIONS BELOW */
@@ -285,6 +291,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_clown",
+			SKIN_ICON = CYBORG_ICON_CLOWN_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Standard borgs
@@ -302,6 +314,12 @@
 		SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL, TRAIT_R_WIDE),
 		SMOL_RAPTOR_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_standard",
+			SKIN_ICON = CYBORG_ICON_GEN_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Medical borgs
@@ -380,6 +398,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_medical",
+			SKIN_ICON = CYBORG_ICON_MED_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Engineering borgs
@@ -458,6 +482,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_engineer",
+			SKIN_ICON = CYBORG_ICON_ENG_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Jani borgs
@@ -520,6 +550,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_janitor",
+			SKIN_ICON = CYBORG_ICON_JANI_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Mining borgs
@@ -606,6 +642,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_miner",
+			SKIN_ICON = CYBORG_ICON_MINE_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Security borgs
@@ -678,6 +720,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_WIDE),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_security",
+			SKIN_ICON = CYBORG_ICON_SEC_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Peacekeeper borgs
@@ -762,6 +810,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_peacekeeper",
+			SKIN_ICON = CYBORG_ICON_PK_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Service borgs
@@ -851,6 +905,18 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_service",
+			SKIN_ICON = CYBORG_ICON_SERV_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
+		"Skiff (LustWish)" = list(
+			SKIN_ICON_STATE = "skiff_lustwish",
+			SKIN_ICON = CYBORG_ICON_LUST_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Cargo borgs
@@ -908,6 +974,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_cargo",
+			SKIN_ICON = CYBORG_ICON_CARGO_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Syndicate jack borgs
@@ -991,6 +1063,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_syndie",
+			SKIN_ICON = CYBORG_ICON_SYNDIE_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Syndicate borgs
@@ -1056,6 +1134,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_syndie",
+			SKIN_ICON = CYBORG_ICON_SYNDIE_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Syndicate medical borgs
@@ -1123,6 +1207,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_syndie",
+			SKIN_ICON = CYBORG_ICON_SYNDIE_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Syndicate Saboteur borgs
@@ -1185,6 +1275,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_syndie",
+			SKIN_ICON = CYBORG_ICON_SYNDIE_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Ninja borgs
@@ -1245,6 +1341,12 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_ninja",
+			SKIN_ICON = CYBORG_ICON_NINJA_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
 
 // Ninja Saboteur borgs
@@ -1280,4 +1382,10 @@
 			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUEPANEL, TRAIT_R_BIG),
 			XENOBORG_HAT_OFFSET
 		),
+		"Skiff" = list(
+			SKIN_ICON_STATE = "skiff_ninja",
+			SKIN_ICON = CYBORG_ICON_NINJA_SKIFF,
+			SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SQUADRUPED, TRAIT_R_SMALL),
+			SKIFF_HAT_OFFSET
+		),
 	)
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/CREDIT.MD b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/CREDIT.MD
new file mode 100644
index 00000000000..6c8b05266fc
--- /dev/null
+++ b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/CREDIT.MD
@@ -0,0 +1,7 @@
+**File:** `modular_zubbers\code\modules\silicons\borgs\sprites\skiff`<br>
+**Creator:** Giik <br>
+**License:** [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/deed.en)<br>
+**Notes:** Species and original sprites by Giik, ported with their permission.<br>
+
+**Co-Creator:** BitSynergy <br>
+**Notes:** Additional Lustwish, Science, Ninja, Syndicate, Cargo, Standard borgs, wiring panel edit and rest poses by BitSynergy, Original concept and design by Giik.<br>
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_cargo.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_cargo.dmi
new file mode 100644
index 00000000000..1beb4b1e217
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_cargo.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_clown.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_clown.dmi
new file mode 100644
index 00000000000..3a59ac67f84
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_clown.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_eng.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_eng.dmi
new file mode 100644
index 00000000000..624422ecc40
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_eng.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_jani.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_jani.dmi
new file mode 100644
index 00000000000..fbdad0b1ea7
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_jani.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_lustwish.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_lustwish.dmi
new file mode 100644
index 00000000000..1c3df1d1ede
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_lustwish.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_med.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_med.dmi
new file mode 100644
index 00000000000..28f13ce9ef5
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_med.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_mine.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_mine.dmi
new file mode 100644
index 00000000000..5d97cd60a6e
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_mine.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_ninja.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_ninja.dmi
new file mode 100644
index 00000000000..4549543e49e
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_ninja.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_pk.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_pk.dmi
new file mode 100644
index 00000000000..83f4af4c0c1
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_pk.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_sci.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_sci.dmi
new file mode 100644
index 00000000000..3b8e5bdc8fc
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_sci.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_sec.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_sec.dmi
new file mode 100644
index 00000000000..58eeec0a387
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_sec.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_serv.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_serv.dmi
new file mode 100644
index 00000000000..319140c40b9
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_serv.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_standard.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_standard.dmi
new file mode 100644
index 00000000000..e59c9e934c8
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_standard.dmi differ
diff --git a/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_syndie.dmi b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_syndie.dmi
new file mode 100644
index 00000000000..ec3a28a451c
Binary files /dev/null and b/modular_zubbers/code/modules/silicons/borgs/sprites/skiff/skiff_syndie.dmi differ