more fixes

modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm

@@ -561,9 +561,6 @@
 		if(blob.healing)
 			blob.healing.expire()
 
-		if(blob.l_hand) blob.drop_l_hand()
-		if(blob.r_hand) blob.drop_r_hand()
-
 		if(blob.mob_radio)
 			blob.mob_radio.forceMove(src)
 			blob.mob_radio = null
@@ -584,11 +581,14 @@
 		var/atom/reform_spot = blob.drop_location()
 
 		//Size update
-		resize(blob.size_multiplier, FALSE, ignore_prefs = TRUE)
+		resize(blob.size_multiplier, 1, 1, ignore_prefs = TRUE)
 
 		//Move them back where the blob was
 		forceMove(reform_spot)
 
+		if(blob.l_hand) blob.drop_l_hand()
+		if(blob.r_hand) blob.drop_r_hand()
+
 		//Put our owner in it (don't transfer var/mind)
 		ckey = blob.ckey
 		ooc_notes = blob.ooc_notes // Lets give the protean any updated notes from blob form.

modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm

@@ -525,7 +525,9 @@
 /obj/item/weapon/rig/protean/proc/AssimilateRig(mob/user, var/obj/item/weapon/rig/R)
 	if(!R || assimilated_rig)
 		return
-	to_chat(user, "You assimilate the [R] into the [src]. Mimicking its stats and appearance.")
+	if(istype(R, /obj/item/weapon/rig/protean))
+		to_chat(user, "<span class='warning'>The world is not ready for such a technological singularity.</span>")
+	to_chat(user, "<span class='notice'>You assimilate the [R] into the [src]. Mimicking its stats and appearance.</span>")
 	for(var/obj/item/piece in list(gloves,helmet,boots,chest))
 		piece.armor = R.armor.Copy()
 		piece.max_pressure_protection = R.max_pressure_protection
@@ -567,7 +569,7 @@
 			piece.armor = armor.Copy()
 			piece.max_pressure_protection = initial(piece.max_pressure_protection)
 			piece.max_heat_protection_temperature = initial(piece.max_heat_protection_temperature)
-			piece.icon_state = initial(piece.icon_state)
+			piece.icon_state = src.icon_state
 			piece.icon = initial(piece.icon)
 
 		//Byond at this time does not support initial() on lists

modular_chomp/code/modules/research/mechfab_designs.dm

@@ -117,4 +117,12 @@
 	id = "rig_gun_phase"
 	req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 4, TECH_MAGNET = 3, TECH_POWER = 4, TECH_COMBAT = 4)
 	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1250)
-	build_path = /obj/item/rig_module/mounted/phase
+	build_path = /obj/item/rig_module/mounted/phase
+
+/datum/design/item/mechfab/rigsuit/defib
+	name = "mounted defib unit"
+	desc = "A rig mounted defib and jumper kit combo."
+	id = "rig_defib"
+	req_tech = list(TECH_BIO = 5, TECH_MAGNET = 2, TECH_POWER = 3)
+	materials = list(DEFAULT_WALL_MATERIAL = 6000, "glass" = 2000)
+	build_path = /obj/item/rig_module/device/defib