Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update

2019-12-17 20:21:49 -06:00
parent 1d3fdad459 8b61c07713
commit 70e50e57cd
681 changed files with 11917 additions and 3314 deletions
@@ -952,10 +952,12 @@
 	to_chat(user, "<span class='notice'>You [suction ? "enable" : "disable"] the board's suction function.</span>")

 /obj/item/circuitboard/machine/dish_drive/AltClick(mob/living/user)
+	. = ..()
 	if(!user.Adjacent(src))
 		return
 	transmit = !transmit
 	to_chat(user, "<span class='notice'>You [transmit ? "enable" : "disable"] the board's automatic disposal transmission.</span>")
+	return TRUE

 /obj/item/circuitboard/machine/stacking_unit_console
 	name = "Stacking Machine Console (Machine Board)"