Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction

Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm

code/modules/admin/verbs/bluespacearty.dm

@@ -28,7 +28,7 @@
 	message_admins("[target.name] has been hit by Bluespace Artillery fired by [usr]")
 
 	if(target.health <= 1)
-		target.gib()
+		target.gib(no_brain = 1)
 	else
 		target.adjustBruteLoss(min(99,(target.health - 1)))
 		target.Stun(20)

code/modules/admin/verbs/playsound.dm

@@ -7,29 +7,29 @@ var/sound/admin_sound
 	if(!check_rights(R_SOUNDS))
 		return
 
+	log_admin("[key_name(src)] played sound [S]")
+	message_admins("[key_name_admin(src)] played sound [S]")
+
+	var/freq = 1
+	if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS])
+		freq = pick(0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1.1, 1.2, 1.4, 1.6, 2.0, 2.5)
+		src << "You feel the Honkmother messing with your song..."
 
 	var/sound/admin_sound = new()
 	admin_sound.file = S
 	admin_sound.priority = 250
 	admin_sound.channel = SOUND_CHANNEL_ADMIN
+	admin_sound.frequency = freq
 	admin_sound.wait = 1
 	admin_sound.repeat = 0
-	admin_sound.status = SOUND_UPDATE|SOUND_STREAM
-
-	log_admin("[key_name(src)] played sound [S]")
-	message_admins("[key_name_admin(src)] played sound [S]")
-
-	if(SSevent.holidays && SSevent.holidays[APRIL_FOOLS])
-		admin_sound.frequency = pick(0.5, 0.7, 0.8, 0.85, 0.9, 0.95, 1.1, 1.2, 1.4, 1.6, 2.0, 2.5)
-		src << "You feel the Honkmother messing with your song..."
-
+	admin_sound.status = SOUND_STREAM
+		
 	for(var/mob/M in player_list)
 		if(M.client.prefs.toggles & SOUND_MIDI)
 			var/vol = M.client.prefs.adminmusicvolume
-			M << sound(admin_sound,channel = SOUND_CHANNEL_ADMIN,volume=vol)
-
-	admin_sound.frequency = 1 //Remove this line when the AFD stuff above is gone
-	admin_sound.wait = 0
+			admin_sound.volume = vol
+			M << admin_sound
+			
 	feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
@@ -72,4 +72,4 @@ var/sound/admin_sound
 			M << sound(null)
 	feedback_add_details("admin_verb","SS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
-#undef SOUND_CHANNEL_ADMIN
+#undef SOUND_CHANNEL_ADMIN

code/modules/admin/verbs/randomverbs.dm

@@ -583,8 +583,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		src << "Only administrators may use this command."
 		return
 
-	var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
-	if(confirm != "Yes")
+	var/confirm = alert(src, "Drop a brain?", "Confirm", "Yes", "No","Cancel")
+	if(confirm == "Cancel")
 		return
 	//Due to the delay here its easy for something to have happened to the mob
 	if(!M)
@@ -596,8 +596,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(istype(M, /mob/dead/observer))
 		gibs(M.loc, M.viruses)
 		return
-
-	M.gib()
+	if(confirm == "Yes")
+		M.gib()
+	else
+		M.gib(no_brain = 1)
 	feedback_add_details("admin_verb","GIB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /client/proc/cmd_admin_gib_self()
@@ -609,7 +611,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		if (istype(mob, /mob/dead/observer)) // so they don't spam gibs everywhere
 			return
 		else
-			mob.gib()
+			mob.gib(no_brain = 1)
 
 		log_admin("[key_name(usr)] used gibself.")
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] used gibself.</span>")
@@ -970,13 +972,13 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits
 
 	if(!holder) return
 
-	var/datum/atom_hud/A = huds[DATA_HUD_SECURITY_ADVANCED]
+	var/datum/atom_hud/A = huds[ANTAG_HUD_TRAITOR]
 	var/adding_hud = (usr in A.hudusers) ? 0 : 1
 
 	for(var/datum/atom_hud/H in huds)
-		if(istype(H, /datum/atom_hud/antag) || istype(H, /datum/atom_hud/data/human/security/advanced))
+		if(istype(H, /datum/atom_hud/antag))
 			(adding_hud) ? H.add_hud_to(usr) : H.remove_hud_from(usr)
-	
+
 	for(var/datum/gang/G in ticker.mode.gangs)
 		var/datum/atom_hud/antag/H = G.ganghud
 		(adding_hud) ? H.add_hud_to(usr) : H.remove_hud_from(usr)