From 678bb87de38d0636c8d6b747209b97f19cc1d6a5 Mon Sep 17 00:00:00 2001 From: Erikos66 Date: Fri, 10 Jan 2025 19:08:36 +0000 Subject: [PATCH] Fixes demon type for shadow demon vial (#27887) * now checking for shadow demons. * damn typepathing * now using :: to get name. Thanks Lewcc. * go away silly var (Thanks Contra) Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Erikos66 --------- Signed-off-by: Erikos66 Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --- code/modules/antagonists/_common/antag_spawner.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index e594fd2f32b..92a69487236 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -198,10 +198,7 @@ used = TRUE to_chat(user, "You break the seal on the bottle, calling upon the dire spirits of the underworld...") - var/type = "slaughter" - if(demon_type == /mob/living/simple_animal/demon/slaughter/laughter) - type = "laughter" - var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a [type] demon summoned by [user.real_name]?", ROLE_DEMON, TRUE, 10 SECONDS, source = demon_type) + var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a [demon_type::name] summoned by [user.real_name]?", ROLE_DEMON, TRUE, 10 SECONDS, source = demon_type) if(length(candidates) > 0) var/mob/C = pick(candidates)