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

Forsaken/Feral Xenos can use hive status. #5693

Merged
merged 3 commits into from
Feb 20, 2024
Merged

Forsaken/Feral Xenos can use hive status. #5693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04c4cda
Forsaken Xenos can use hive status.
private-tristan Feb 10, 2024
0c9fdc4
Merge branch 'master' into forsaken-tacmap
private-tristan Feb 13, 2024
04b0377
Merge branch 'master' into forsaken-tacmap
private-tristan Feb 17, 2024
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
18 changes: 3 additions & 15 deletions code/datums/keybinding/xenomorph.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,21 +189,9 @@
. = ..()
if(.)
return

var/mob/living/carbon/xenomorph/current_xeno = user?.mob

if(!current_xeno?.hive)
return

if((!current_xeno.hive.living_xeno_queen || SSmapping.configs[GROUND_MAP].map_name == MAP_WHISKEY_OUTPOST) && !current_xeno.hive.allow_no_queen_actions) //No Hive status on WO
to_chat(current_xeno, SPAN_WARNING("There is no Queen. We are alone."))
return

if(current_xeno.interference)
to_chat(current_xeno, SPAN_WARNING("A headhunter temporarily cut off our psychic connection!"))
return

current_xeno.hive.hive_ui.open_hive_status(current_xeno)
var/mob/living/carbon/xenomorph/xeno = user.mob
xeno.hive_status()
return TRUE

/datum/keybinding/xenomorph/hide
hotkey_keys = list("Unbound")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/xenomorph/hive_status_ui.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
return UI_INTERACTIVE

// If the Queen died or is otherwise missing.
if(!assoc_hive.living_xeno_queen)
if(!assoc_hive.living_xeno_queen && !assoc_hive.allow_no_queen_actions)
return UI_CLOSE

/datum/hive_status_ui/ui_data(mob/user)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/xenomorph/xeno_verbs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
//// Holds Xeno verbs that don't belong anywhere else.
/mob/living/carbon/xenomorph/verb/hive_status()
set name = "Hive Status"
set desc = "Check the status of your current hive."
set desc = "Check the status of our current hive."
set category = "Alien"

if(!hive)
return

if((!hive.living_xeno_queen || SSmapping.configs[GROUND_MAP].map_name == MAP_WHISKEY_OUTPOST) && !hive.allow_no_queen_actions) //No Hive status on WO
to_chat(src, SPAN_WARNING("There is no Queen. You are alone."))
to_chat(src, SPAN_WARNING("There is no Queen. We are alone."))
return

if(interference)
to_chat(src, SPAN_WARNING("A headhunter temporarily cut off your psychic connection!"))
to_chat(src, SPAN_WARNING("A headhunter temporarily cut off our psychic connection!"))
return

hive.hive_ui.open_hive_status(src)
Expand Down
Loading