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

2019-12-11 21:10:24 +01:00
parent 7a3cb3bd58 f2fc50119d
commit 651370c5b4
102 changed files with 296 additions and 181 deletions
@@ -52,9 +52,11 @@
 	edit_emitter(user)

 /obj/effect/sound_emitter/AltClick(mob/user)
+	. = ..()
 	if(check_rights_for(user.client, R_SOUNDS))
 		activate(user)
 		to_chat(user, "<span class='notice'>Sound emitter activated.</span>")
+		return TRUE

 /obj/effect/sound_emitter/proc/edit_emitter(mob/user)
 	var/dat = ""