suit modifier fixes (#37258)

Author: jwhitak

code/game/machinery/suit_modifier.dm

@@ -118,12 +118,12 @@
 /obj/machinery/suit_modifier/attackby(var/obj/item/I, var/mob/user)
 	if(istype(I, /obj/item/rig_module) && user.drop_item(I, src))
 		playsound(src, 'sound/machines/click.ogg', 50, 1)
-		say("\The [I] installed.", class = "binaryradio")
+		say("Preparing \the [I] for installation.", class = "binaryradio")
 		modules_to_install.Add(I)
 		return
 	if(istype(I, /obj/item/weapon/cell) && !cell && user.drop_item(I, src))
 		playsound(src, 'sound/machines/click.ogg', 50, 1)
-		say("\The [I] installed.", class = "binaryradio")
+		say("Preparing \the [I] for installation.", class = "binaryradio")
 		cell = I
 		return
 	.=..()
@@ -135,7 +135,7 @@
 		return
 	if(is_locking(/mob/living/carbon/human))
 		playsound(src, 'sound/machines/buzz-two.ogg', 50, 0)
-		say("Unit Occupied.", class = "binaryradio")
+		say("Error: Unit occupied.", class = "binaryradio")
 		return
 	if(!ishuman(user))
 		return
@@ -146,10 +146,9 @@
 			var/obj/item/clothing/suit/space/rig/worn_rig = worn_suit
 			if(!modules_to_install.len && !cell)
 				if(worn_rig.modules.len)
-					say("Installed modules detected.", class = "binaryradio")
 					process_module_removal(H)
 					return
-				say("No upgrade available.", class = "binaryradio")
+				say("Error: No modules detected and no upgrades available.", class = "binaryradio")
 				return
 			process_module_installation(H)
 			return
@@ -158,9 +157,9 @@
 		else if(istype(worn_suit, /obj/item/clothing/suit/space/vox))
 			process_suit_replace(H, vox_suits)
 		else
-			say("Unable to detect compatible spacesuit on [H].", class = "binaryradio")
+			say("Error: Unable to detect compatible spacesuit on [H].", class = "binaryradio")
 	else if((modules_to_install.len || cell) && !activated)
-		var/obj/removed = input(user, "Choose an upgrade to remove from [src].", src) as null|anything in modules_to_install + cell
+		var/obj/removed = input(user, "Choose an upgrade to remove from \the [src].", src.name) as null|anything in modules_to_install + cell
 		if(!removed || activated || !user.Adjacent(src) || user.incapacitated())
 			return
 		user.put_in_hands(removed)
@@ -239,45 +238,63 @@
 			filtered_suit_list[entry] = list(suit_list[entry][SUIT_INDEX], suit_list[entry][HELMET_INDEX])
 	return filtered_suit_list
 
+/**
+ * Changes a vox/plasmaman suit.
+ */
 /obj/machinery/suit_modifier/proc/process_suit_replace(mob/living/carbon/human/guy, list/suit_list)
 	if(activated)
 		return
 	activated = TRUE
 	use_power = MACHINE_POWER_USE_ACTIVE
 	lock_atom(guy)
+	var/obj/item/clothing/suit/space/oldsuit = guy.get_item_by_slot(slot_wear_suit)
+	var/obj/item/clothing/head/helmet/space/oldhelmet = guy.get_item_by_slot(slot_head)
+	oldsuit?.canremove = FALSE
+	oldhelmet?.canremove = FALSE
 	activation_animation()
-	var/obj/item/clothing/suit/space/chosen_job = input(guy, "What kind of model do you wish to apply?") as null|anything in filter_suit_list(guy, suit_list)
-	if(!chosen_job || activated || guy.incapacitated() || guy.loc != loc)
+	var/chosen_job = input(guy, "What kind of model do you wish to apply?", src.name) as null|anything in filter_suit_list(guy, suit_list)
+	if(!chosen_job || guy.incapacitated() || guy.loc != loc)
 		cancel_animation()
 		unlock_atom(guy)
 		use_power = MACHINE_POWER_USE_IDLE
 		activated = FALSE
+		if(!oldsuit?.current_glue_state)
+			oldsuit?.canremove = TRUE
+		if(!oldhelmet?.current_glue_state)
+			oldhelmet?.canremove = TRUE
 		return
 	working_animation()
 	var/obj/item/clothing/suit/space/chosen_suit = suit_list[chosen_job][SUIT_INDEX]
 	var/obj/item/clothing/head/helmet/space/chosen_helmet = suit_list[chosen_job][HELMET_INDEX]
+	say("Repainting \the [oldsuit ? oldsuit.name : "suit"] into the [lowertext(chosen_job)] model.", class = "binaryradio")
 	spawn(rand(3,10) / apply_multiplier)
 		playsound(src, 'sound/effects/spray3.ogg', 30, 1)
 	spawn(rand(20,30) / apply_multiplier)
 		playsound(src, 'sound/effects/spray2.ogg', 30, 1)
 	spawn(5 SECONDS / apply_multiplier)
 		playsound(src, 'sound/effects/spray.ogg', 30, 1)
 	if(do_after(guy, src, 8 SECONDS / apply_multiplier, needhand = FALSE))
-		var/obj/item/clothing/suit/space/oldsuit = guy.get_item_by_slot(slot_wear_suit)
 		if(oldsuit)
 			guy.equip_to_slot(new chosen_suit, slot_wear_suit)
 			qdel(oldsuit)
 			guy.update_inv_wear_suit()
-		var/obj/item/clothing/head/helmet/space/oldhelmet = guy.get_item_by_slot(slot_head)
 		if(oldhelmet)
 			guy.equip_to_slot(new chosen_helmet, slot_head)
 			qdel(oldhelmet)
 			guy.update_inv_head()
+	else
+		if(!oldsuit?.current_glue_state)
+			oldsuit?.canremove = TRUE
+		if(!oldhelmet?.current_glue_state)
+			oldhelmet?.canremove = TRUE
 	unlock_atom(guy)
 	finished_animation()
 	use_power = MACHINE_POWER_USE_IDLE
 	activated = FALSE
 
+/**
+ * Adds a module to a rigsuit
+ */
 /obj/machinery/suit_modifier/proc/process_module_installation(var/mob/living/carbon/human/H)
 	if(activated)
 		return
@@ -296,19 +313,19 @@
 		if(!install_result[1]) //more versatile check, allows for custom install conditions.
 			say(install_result[2], class = "binaryradio")
 			continue
+		say("Installing \the [RM] into \the [R].", class = "binaryradio")
 		playsound(src, 'sound/mecha/hydraulic.ogg', 40, 1)
 		spawn(rand(4 SECONDS, 5 SECONDS) / apply_multiplier)
 			playsound(src, 'sound/items/Welder.ogg', 50, 1)
 		if(do_after(H, src, 8 SECONDS / apply_multiplier, needhand = FALSE))
-			say("Installing [RM] into \the [R].", class = "binaryradio")
 			R.modules.Add(RM)
 			RM.rig = R
 			RM.forceMove(R)
 			modules_to_install.Remove(RM)
 	if(cell) //Can't answer the prompt if you're incapacitated.
 		var/choice = alert(H, "Do you wish to install [cell]?", src, "Yes", "No")
 		if((choice == "Yes") && H.Adjacent(src) && !H.incapacitated())
-			say("Installing [cell] into to \the [R].", class = "binaryradio")
+			say("Installing \the [cell] into to \the [R].", class = "binaryradio")
 			playsound(src, 'sound/mecha/hydraulic.ogg', 40, 1)
 			spawn(rand(4 SECONDS, 5 SECONDS) / apply_multiplier)
 				playsound(src, 'sound/misc/click.ogg', 50, 1)
@@ -325,6 +342,9 @@
 	use_power = MACHINE_POWER_USE_IDLE
 	activated = FALSE
 
+/**
+ * Removes a module from a rigsuit
+ */
 /obj/machinery/suit_modifier/proc/process_module_removal(var/mob/living/carbon/human/H)
 	if(activated)
 		return
@@ -340,7 +360,7 @@
 	lock_atom(H)
 	R.deactivate_suit()
 	activation_animation()
-	var/obj/item/rig_module/RM = input(H, "Choose an upgrade to remove from [R].", R) as null|anything in R.modules
+	var/obj/item/rig_module/RM = input(H, "Choose an upgrade to remove from [R].", src.name) as null|anything in R.modules
 	if(!RM|| !H.Adjacent(src) || H.incapacitated())
 		cancel_animation()
 		if(!R.current_glue_state)
@@ -350,8 +370,8 @@
 		use_power = MACHINE_POWER_USE_IDLE
 		activated = FALSE
 		return
-	say("Uninstalling [RM] from \the [R].", class = "binaryradio")
 	working_animation()
+	say("Uninstalling \the [RM] from \the [R].", class = "binaryradio")
 	playsound(src, 'sound/mecha/hydraulic.ogg', 40, 1)
 	spawn(rand(4 SECONDS, 5 SECONDS) / apply_multiplier)
 		playsound(src, 'sound/items/Welder.ogg', 60, 1)