diff --git a/GainStation13/icons/mob/robots.dmi b/GainStation13/icons/mob/robots.dmi
index 64b8341ae1..83381b23c1 100644
Binary files a/GainStation13/icons/mob/robots.dmi and b/GainStation13/icons/mob/robots.dmi differ
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index b259c9f2d3..39c522d629 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -338,7 +338,9 @@
 		"Sleek" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "sleekmed"),
 		"Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinamed"),
 		"Eyebot" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "eyebotmed"),
-		"Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavymed")
+		"Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavymed"),
+		"Haydee" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "haydeemedical"), //GS13 EDIT
+		"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_medical"), //GS13 EDIT
 		)
 		var/list/L = list("Medihound" = "medihound", "Medihound Dark" = "medihounddark", "Vale" = "valemed")
 		for(var/a in L)
@@ -399,6 +401,16 @@
 			moduleselect_icon = "medihound"
 			moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
 			dogborg = TRUE
+		//GS13 EDIT START
+		if("Haydee")
+			cyborg_base_icon = "haydeemedical"
+			cyborg_icon_override = 'GainStation13/icons/mob/robots.dmi'
+			hat_offset = 3
+		if("Fat")
+			cyborg_base_icon = "fat_medical"
+			cyborg_icon_override = 'GainStation13/icons/mob/robots.dmi'
+			hat_offset = 3
+		//GS13 EDIT END
 		else
 			return FALSE
 	return ..()
@@ -457,7 +469,8 @@
 		"Can" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "caneng"),
 		"Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinaeng"),
 		"Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "spidereng"),
-		"Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavyeng")
+		"Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavyeng"),
+		"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_engineer"), //GS13 EDIT
 		)
 		var/list/L = list("Pup Dozer" = "pupdozer", "Vale" = "valeeng")
 		for(var/a in L)
@@ -515,6 +528,12 @@
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 			sleeper_overlay = "valeengsleeper"
 			dogborg = TRUE
+		//GS13 EDIT START
+		if("Fat")
+			cyborg_base_icon = "fat_engineer"
+			cyborg_icon_override = 'GainStation13/icons/mob/robots.dmi'
+			hat_offset = 3
+		//GS13 EDIT END
 		else
 			return FALSE
 	return ..()
@@ -660,7 +679,8 @@
 	var/static/list/peace_icons = sort_list(list(
 		"Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "peace"),
 		"Borgi" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "borgi"),
-		"Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "whitespider")
+		"Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "whitespider"),
+		"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_peacekeeper"), //GS13 EDIT
 		))
 	var/peace_borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
 	switch(peace_borg_icon)
@@ -669,6 +689,12 @@
 		if("Spider")
 			cyborg_base_icon = "whitespider"
 			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		//GS13 EDIT START
+		if("Fat")
+			cyborg_base_icon = "fat_peacekeeper"
+			cyborg_icon_override = 'GainStation13/icons/mob/robots.dmi'
+			hat_offset = 3
+		//GS13 EDIT END
 		if("Borgi")
 			cyborg_base_icon = "borgi"
 			moduleselect_icon = "borgi"
@@ -817,6 +843,8 @@
 		"(Service) Tophat" = image(icon = 'icons/mob/robots.dmi', icon_state = "tophat"),
 		"(Service) Sleek" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "sleekserv"),
 		"(Service) Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavyserv"),
+		"(Service) Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_service"),
+		"(Service) Busty" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "busty_service")
 		"(Janitor) Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "janitor"),
 		"(Janitor) Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinajan"),
 		"(Janitor) Sleek" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "sleekjan"),
@@ -874,6 +902,16 @@
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 			sleeper_overlay = "valeservsleeper"
 			dogborg = TRUE
+		//GS13 EDIT START
+		if("(Service) Fat")
+			cyborg_base_icon = "fat_service"
+			cyborg_icon_override = 'GainStation13/icons/mob/robots.dmi'
+			hat_offset = 3
+		if("(Service) Busty")
+			cyborg_base_icon = "busty_service"
+			cyborg_icon_override = 'GainStation13/icons/mob/robots.dmi'
+			hat_offset = 1
+		//GS13 EDIT END
 		if("(Janitor) Default")
 			cyborg_base_icon = "janitor"
 		if("(Janitor) Marina")
@@ -941,7 +979,8 @@
 		"Sleek" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "sleekmin"),
 		"Marina" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "marinamin"),
 		"Can" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "canmin"),
-		"Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavymin")
+		"Heavy" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "heavymin"),
+		"Fat" = image(icon = 'GainStation13/icons/mob/robots.dmi', icon_state = "fat_mining"), //GS13 EDIT
 		)
 		var/list/L = list("Blade" = "blade", "Vale" = "valemine")
 		for(var/a in L)
@@ -985,6 +1024,12 @@
 			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
 			sleeper_overlay = "valeminesleeper"
 			dogborg = TRUE
+		// GS13 EDIT START
+		if("Fat")
+			cyborg_base_icon = "fat_mining"
+			cyborg_icon_override = 'GainStation13/icons/mob/robots.dmi'
+			hat_offset = 3
+		//GS13 EDIT END
 		else
 			return FALSE
 	return ..()
diff --git a/tgstation.dme b/tgstation.dme
index 7009f6e4e0..7ba4d39826 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3972,10 +3972,6 @@
 #include "GainStation13\code\mechanics\web_weaving.dm"
 #include "GainStation13\code\mechanics\den abductors\console.dm"
 #include "GainStation13\code\mechanics\den abductors\purchaseble_goodies.dm"
-#include "GainStation13\code\mechanics\transformation\food.dm"
-#include "GainStation13\code\mechanics\transformation\mob_procs.dm"
-#include "GainStation13\code\mechanics\transformation\transformation_component.dm"
-#include "GainStation13\code\mechanics\transformation\transformation_item.dm"
 #include "GainStation13\code\mobs\cakegolem.dm"
 #include "GainStation13\code\mobs\chocoslime.dm"
 #include "GainStation13\code\mobs\eat_trash.dm"
@@ -4034,7 +4030,6 @@
 #include "GainStation13\code\modules\reagents\reagent_containers\barrel_tank.dm"
 #include "GainStation13\code\modules\research\designs\autolathe.dm"
 #include "GainStation13\code\modules\research\designs\biogen.dm"
-#include "GainStation13\code\modules\research\designs\borg.dm"
 #include "GainStation13\code\modules\research\designs\nutri_designs.dm"
 #include "GainStation13\code\modules\research\nanites\nanite_programs\fattening.dm"
 #include "GainStation13\code\modules\research\techweb\nutritech_nodes.dm"
@@ -4046,10 +4041,8 @@
 #include "GainStation13\code\modules\weapons\grenades.dm"
 #include "GainStation13\code\obj\items\bluespace_belt.dm"
 #include "GainStation13\code\obj\items\circuits.dm"
-#include "GainStation13\code\obj\items\floor_tiles.dm"
 #include "GainStation13\code\obj\items\holy.dm"
 #include "GainStation13\code\obj\items\minor_items.dm"
-#include "GainStation13\code\obj\items\reskinable_floor_tile.dm"
 #include "GainStation13\code\obj\items\sensors\weight_infared.dm"
 #include "GainStation13\code\obj\structure\airlock.dm"
 #include "GainStation13\code\obj\structure\calorite_doors.dm"