diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 2f64c51287c79..655a5a283eafe 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -429,11 +429,12 @@ var/image/I = image(icon = 'icons/effects/effects.dmi', icon_state = "heart", layer = ABOVE_MOB_LAYER, loc = src) var/datum/atom_hud/alternate_appearance/basic/one_person/alt_appearance = add_alt_appearance( /datum/atom_hud/alternate_appearance/basic/one_person, - "heart", + "heart_[REF(src)]", I, NONE, seer ) + alt_appearance_weakref = WEAKREF(alt_appearance) I.alpha = 255 I.appearance_flags = RESET_ALPHA animate(I, alpha = 0, time = duration) diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 8b8611705d5b1..6cbe804fd3fac 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -133,9 +133,9 @@ to_chat(user, "Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded.") /obj/item/antag_spawner/nuke_ops/spawn_antag(client/C, turf/T, kind, datum/mind/user) - var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) - C.prefs.apply_prefs_to(M) - M.key = C.key + var/mob/living/carbon/human/nukie = new/mob/living/carbon/human(T) + C.prefs.apply_prefs_to(nukie) + nukie.key = C.key if(length(GLOB.newplayer_start)) // needed as hud code doesn't render huds if the atom (in this case the nukie) is in nullspace, so just move the nukie somewhere safe nukie.forceMove(pick(GLOB.newplayer_start)) else @@ -147,8 +147,8 @@ var/datum/antagonist/nukeop/creator_op = user.has_antag_datum(/datum/antagonist/nukeop,TRUE) if(creator_op) - M.mind.add_antag_datum(new_op,creator_op.nuke_team) - M.mind.special_role = "Nuclear Operative" + nukie.mind.add_antag_datum(new_op,creator_op.nuke_team) + nukie.mind.special_role = "Nuclear Operative" //////CLOWN OP /obj/item/antag_spawner/nuke_ops/clown