Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380

[MIRROR] Refactors and fixes RPEDs
2018-04-29 22:45:28 +00:00
parent e66e348d5c ab8355968c
commit 6f13d2c2e9
41 changed files with 50 additions and 148 deletions
@@ -292,9 +292,6 @@ obj/machinery/chem_dispenser/proc/work_animation()
 		update_icon()
 		return

-	if(exchange_parts(user, I))
-		return
-
 	if(default_deconstruction_crowbar(I))
 		return
 	if(istype(I, /obj/item/reagent_containers) && !(I.flags_1 & ABSTRACT_1) && I.is_open_container())
@@ -60,9 +60,6 @@
 	if(default_deconstruction_screwdriver(user, "mixer0b", "mixer0b", I))
 		return

-	if(exchange_parts(user, I))
-		return
-
 	if(default_deconstruction_crowbar(I))
 		return

@@ -79,8 +79,6 @@
 	if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", I))
 		return

-	else if(exchange_parts(user, I))
-		return
 	else if(default_deconstruction_crowbar(I))
 		return