Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into simple_animals_sleeping

code/game/gamemodes/antag_hud.dm

@@ -49,6 +49,11 @@
 	if(M.mind || new_icon_state) //in mindless mobs, only null is acceptable, otherwise we're antagging a mindless mob, meaning we should runtime
 		M.mind.antag_hud_icon_state = new_icon_state
 
+/datum/atom_hud/antag/proc/is_solo_antag(mob/M)
+	if(M.mind.special_role == "traitor" || M.mind.special_role == "vampire" || M.mind.special_role == "Changeling")
+		return 1
+	return 0
+
 
 //MIND PROCS
 //these are called by mind.transfer_to()
@@ -56,7 +61,10 @@
 	leave_all_huds()
 	ticker.mode.set_antag_hud(current, antag_hud_icon_state)
 	if(newhud)
-		newhud.join_hud(current)
+		if(newhud.is_solo_antag(current))
+			newhud.join_solo_hud(current)
+		else
+			newhud.join_hud(current)
 
 /datum/mind/proc/leave_all_huds()
 	for(var/datum/atom_hud/antag/hud in huds)

code/game/objects/items/weapons/tools.dm

@@ -172,7 +172,7 @@
 	return
 
 /obj/item/weapon/weldingtool/examine(mob/user)
-	if(!..(user, 0))
+	if(..(user, 0))
 		user << "It contains [get_fuel()] unit\s of fuel out of [max_fuel]."
 
 /obj/item/weapon/weldingtool/suicide_act(mob/user)

code/modules/mob/living/simple_animal/guardian/guardian.dm

@@ -32,6 +32,7 @@
 	melee_damage_lower = 15
 	melee_damage_upper = 15
 	AIStatus = AI_OFF
+	var/summoned = FALSE
 	var/animated_manifest = FALSE
 	var/cooldown = 0
 	var/damage_transfer = 1 //how much damage from each attack we transfer to the owner
@@ -59,6 +60,10 @@
 			src << "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]"
 			visible_message("<span class='danger'>The [src] jumps back to its user.</span>")
 			Recall()
+	if(summoned && !summoner)
+		src << "<span class='danger'>You somehow lack a summoner! As a result, you dispel!</span>"
+		ghostize()
+		qdel()
 
 /mob/living/simple_animal/hostile/guardian/Move() //Returns to summoner if they move out of range
 	..()
@@ -679,6 +684,7 @@
 
 	var/mob/living/simple_animal/hostile/guardian/G = new pickedtype(user)
 	G.summoner = user
+	G.summoned = TRUE
 	G.key = key
 	G << "You are a [mob_name] bound to serve [user.real_name]."
 	G << "You are capable of manifesting or recalling to your master with verbs in the Guardian tab. You will also find a verb to communicate with them privately there."

code/modules/reagents/newchem/pyro.dm

@@ -622,7 +622,7 @@ datum/reagent/firefighting_foam/reaction_obj(var/obj/O, var/volume)
 	var/turf/T = get_turf(holder.my_atom)
 	for(var/mob/living/carbon/C in view(6, T))
 		C.Beam(T,icon_state="lightning[rand(1,12)]",icon='icons/effects/effects.dmi',time=5) //What? Why are we beaming from the mob to the turf? Turf to mob generates really odd results.
-		C.electrocute_act(1, "electrical blast")
+		C.electrocute_act(3.5, "electrical blast")
 	holder.del_reagent("teslium") //Clear all remaining Teslium and Uranium, but leave all other reagents untouched.
 	holder.del_reagent("uranium")
 	return