Merge branch 'master' into development

code/modules/mob/living/carbon/metroid/items.dm

@@ -250,7 +250,7 @@
 			if(O.mind && O.mind.current && O.mind.current.stat != DEAD)	continue
 			ghost = O
 			break
-		if(ghost)
+		if(ghost && !(ghost.has_enabled_antagHUD && config.antag_hud_restricted))
 			icon_state = "golem2"
 		else
 			icon_state = "golem"
@@ -265,6 +265,10 @@
 		if(!ghost)
 			user << "The rune fizzles uselessly. There is no spirit nearby."
 			return
+		if(ghost.has_enabled_antagHUD && config.antag_hud_restricted)
+			ghost <<"You can not join as a golem with antagHUD on!"
+			user << "The rune fizzles uselessly. There is no spirit nearby."
+			return
 		var/mob/living/carbon/human/G = new(src.loc)
 		G.set_species("Golem")
 		G.key = ghost.key