Rebase onto Master for Volume Control Panel, Squash Commits

This commit is contained in:
Rykka
2020-08-27 19:47:38 -04:00
parent 61f7ef53c2
commit d2fb9a7691
375 changed files with 743 additions and 73 deletions
+1
View File
@@ -615,6 +615,7 @@
if(original_occupant)
occupant = original_occupant
playsound(src, 'sound/machines/medbayscanner1.ogg', 100, 1) // Play our sound at the end of the mind injection!
return 1
/obj/machinery/transhuman/resleever/proc/go_out(var/mob/M)