From 531e4c16f0e4670f4d3df0152c2bf9dd0df5cc89 Mon Sep 17 00:00:00 2001 From: Fira Date: Sat, 14 Oct 2023 23:43:11 +0100 Subject: [PATCH] fix oopsie causing xeno cultists to always use default hive --- code/modules/admin/player_panel/actions/antag.dm | 5 ++--- code/modules/admin/topic/topic.dm | 8 ++++---- code/modules/mob/living/carbon/human/human_abilities.dm | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/modules/admin/player_panel/actions/antag.dm b/code/modules/admin/player_panel/actions/antag.dm index b3b62243c812..b1c2da6be123 100644 --- a/code/modules/admin/player_panel/actions/antag.dm +++ b/code/modules/admin/player_panel/actions/antag.dm @@ -56,9 +56,8 @@ if(params["leader"]) preset = GLOB.gear_path_presets_list[/datum/equipment_preset/other/xeno_cultist/leader] - - preset.load_race(H, params["hivenumber"]) - preset.load_status(H) + preset.load_race(H) + preset.load_status(H, params["hivenumber"]) var/title = params["leader"]? "xeno cultist leader" : "cultist" diff --git a/code/modules/admin/topic/topic.dm b/code/modules/admin/topic/topic.dm index 191b292ab95b..64647b8f87fb 100644 --- a/code/modules/admin/topic/topic.dm +++ b/code/modules/admin/topic/topic.dm @@ -836,14 +836,14 @@ if(href_list["makecultist"]) var/datum/equipment_preset/preset = GLOB.gear_path_presets_list[/datum/equipment_preset/other/xeno_cultist] - preset.load_race(H, hive.hivenumber) - preset.load_status(H) + preset.load_race(H) + preset.load_status(H, hive.hivenumber) message_admins("[key_name_admin(usr)] has made [key_name_admin(H)] into a cultist for [hive.name].") else if(href_list["makecultistleader"]) var/datum/equipment_preset/preset = GLOB.gear_path_presets_list[/datum/equipment_preset/other/xeno_cultist/leader] - preset.load_race(H, hive.hivenumber) - preset.load_status(H) + preset.load_race(H) + preset.load_status(H, hive.hivenumber) message_admins("[key_name_admin(usr)] has made [key_name_admin(H)] into a cultist leader for [hive.name].") H.faction = hive.internal_faction diff --git a/code/modules/mob/living/carbon/human/human_abilities.dm b/code/modules/mob/living/carbon/human/human_abilities.dm index 502dd77a063d..fda4cea20ad1 100644 --- a/code/modules/mob/living/carbon/human/human_abilities.dm +++ b/code/modules/mob/living/carbon/human/human_abilities.dm @@ -414,8 +414,8 @@ CULT return var/datum/equipment_preset/preset = GLOB.gear_path_presets_list[/datum/equipment_preset/other/xeno_cultist] - preset.load_race(chosen, H.hivenumber) - preset.load_status(chosen) + preset.load_race(chosen) + preset.load_status(chosen, H.hivenumber) to_chat(chosen, SPAN_ROLE_HEADER("You are now a Xeno Cultist!")) to_chat(chosen, SPAN_ROLE_BODY("Worship the Xenomorphs and listen to the Cult Leader for orders. The Cult Leader is typically the person who transformed you. Do not kill anyone unless you are wearing your black robes, you may defend yourself."))