Merge branch 'master' into light_and_vendors

code/game/data_huds.dm

@@ -165,14 +165,17 @@ Medical HUD! Basic mode needs suit sensors on.
 	holder.pixel_y = I.Height() - world.icon_size
 	if(HAS_TRAIT(src, TRAIT_XENO_HOST))
 		holder.icon_state = "hudxeno"
+	if(undergoing_cardiac_arrest() && stat != DEAD)	//dripstation edit
+		holder.icon_state = "huddefib"	//dripstation edit
+		return							//dripstation edit
 	else if(stat == DEAD || (HAS_TRAIT(src, TRAIT_FAKEDEATH)))
 		if(HAS_TRAIT(src, TRAIT_FAKEDEATH))
-			holder.icon_state = "huddefib"
+			holder.icon_state = "hudflatline"	//dripstation edit
 			return
 		if(tod)
 			var/tdelta = round(world.time - timeofdeath)
 			if(tdelta < (DEFIB_TIME_LIMIT))
-				holder.icon_state = "huddefib"
+				holder.icon_state = "hudflatline"	//dripstation edit
 				return
 		holder.icon_state = "huddead"
 	else

code/modules/antagonists/_common/antag_datum.dm

@@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(antagonists)
 	var/antag_moodlet //typepath of moodlet that the mob will gain with their status
 	var/can_hijack = HIJACK_NEUTRAL //If these antags are alone on shuttle hijack happens.
 	///The antag hud's icon file
-	var/hud_icon = 'yogstation/icons/mob/antag_hud.dmi'
+	var/hud_icon = 'modular_dripstation/icons/mob/hud.dmi'	//dripstation edit
 	///Name of the antag hud we provide to this mob.
 	var/antag_hud_name
 	var/awake_stage = ANTAG_AWAKE //What stage we are of "waking up"

code/modules/antagonists/bloodsuckers/vassal/vassal.dm

@@ -276,7 +276,7 @@
 	show_in_antagpanel = FALSE
 	silent = TRUE
 	ui_name = FALSE
-	hud_icon = 'yogstation/icons/mob/hud.dmi'
+	hud_icon = 'modular_dripstation/icons/mob/hud.dmi'	//dripstation edit
 
 	///The revenge vassal that brought us into the fold.
 	var/datum/antagonist/vassal/revenge/revenge_vassal

code/modules/antagonists/disease/disease_datum.dm

@@ -76,7 +76,7 @@
 	return result.Join("<br>")
 
 /datum/antagonist/disease/get_preview_icon()
-	var/icon/icon = icon('icons/mob/hud.dmi', "virus_infected")
+	var/icon/icon = icon('modular_dripstation/icons/mob/hud.dmi', "virus_infected")	//dripstation edit
 	icon.Blend(COLOR_GREEN_GRAY, ICON_MULTIPLY)
 	icon.Scale(ANTAGONIST_PREVIEW_ICON_SIZE, ANTAGONIST_PREVIEW_ICON_SIZE)
 	return icon
@@ -109,7 +109,7 @@
 	return FALSE
 
 /datum/antagonist/disease/get_preview_icon()
-	var/icon/disease_icon = icon('icons/mob/hud.dmi', "infected")
+	var/icon/disease_icon = icon('modular_dripstation/icons/mob/hud.dmi', "infected")	//dripstation edit
 	disease_icon.Blend(COLOR_GREEN_GRAY, ICON_MULTIPLY)
 	disease_icon.Scale(ANTAGONIST_PREVIEW_ICON_SIZE, ANTAGONIST_PREVIEW_ICON_SIZE)
 	return disease_icon

code/modules/antagonists/revolution/revolution.dm

@@ -175,7 +175,7 @@
 	// Otherwise, the R gets cut off.
 	final_icon.Scale(64, 64)
 
-	var/icon/rev_head_icon = icon('yogstation/icons/mob/antag_hud.dmi', "rev_head")
+	var/icon/rev_head_icon = icon('modular_dripstation/icons/mob/hud.dmi', "rev_head")	//dripstation edit
 	rev_head_icon.Scale(48, 48)
 	rev_head_icon.Crop(1, 1, 64, 64)
 	rev_head_icon.Shift(EAST, 10)

code/modules/mob/mob.dm

@@ -161,7 +161,7 @@
 			hud_list[hud] = list()
 
 		else
-			var/image/I = image('yogstation/icons/mob/hud.dmi', src, "")
+			var/image/I = image('modular_dripstation/icons/mob/hud.dmi', src, "")	//dripstation edit
 			I.appearance_flags = RESET_COLOR|RESET_TRANSFORM
 			hud_list[hud] = I
 		set_hud_image_active(hud, update_huds = FALSE) //by default everything is active. but dont add it to huds to keep control.

modular_dripstation/code/modules/antagonists/nukeop/nukeop.dm

@@ -80,6 +80,9 @@
 	op_mob.real_name = "[newname]"
 
 
+//////Nuke leader//////
+/datum/antagonist/nukeop/leader
+	antag_hud_name = "syndleader"
 
 /datum/antagonist/nukeop/leader/give_alias()
 	title = pick("Boss", "Commander", "Chief", "Director", "Overlord")
@@ -203,4 +206,7 @@
 				var/obj/item/computer_hardware/card_slot/CS = ID.loc
 				CS.holder?.update_label()
 			balloon_alert(op, "name replaced")
-			search_id = 0
+			search_id = 0
+
+/datum/antagonist/nukeop/lone
+	antag_hud_name = "loneop"