Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes Xeno Cultists always belonging to the Normal hive #4684

Merged
merged 1 commit into from
Oct 15, 2023
Merged

Fixes Xeno Cultists always belonging to the Normal hive #4684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions code/modules/admin/player_panel/actions/antag.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
8 changes: 4 additions & 4 deletions code/modules/admin/topic/topic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/human_abilities.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."))
Expand Down
Loading