Merge pull request #5547 from Citadel-Station-13/upstream-merge-35722

[MIRROR] Fixes extremely thicc robots

code/game/objects/items/robot/robot_upgrades.dm

@@ -397,7 +397,7 @@
 	if(..())
 		return
 
-	if(locate(/obj/item/borg/upgrade/expand, R))
+	if(R.hasExpanded)
 		to_chat(usr, "<span class='notice'>This unit already has an expand module installed!</span>")
 		return
 
@@ -417,5 +417,6 @@
 	R.anchored = FALSE
 	R.notransform = FALSE
 	R.resize = 2
+	R.hasExpanded = TRUE
 	R.update_transform()
 	return TRUE

code/modules/mob/living/silicon/robot/robot.dm

@@ -77,6 +77,7 @@
 
 	var/list/upgrades = list()
 
+	var/hasExpanded = FALSE
 	var/obj/item/hat
 	var/hat_offset = -3
 	var/list/equippable_hats = list(/obj/item/clothing/head/caphat,
@@ -976,6 +977,11 @@
 	shown_robot_modules = FALSE
 	if(hud_used)
 		hud_used.update_robot_modules_display()
+
+	if (hasExpanded)
+		resize = 0.5
+		hasExpanded = FALSE
+		update_transform()
 	module.transform_to(/obj/item/robot_module)
 
 	// Remove upgrades.