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

Stops the queen from resting while on an ovipositor #6835

Merged
merged 2 commits into from
Aug 1, 2024
Merged

Stops the queen from resting while on an ovipositor #6835

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4499bc
stops the queen from resting while on ovi
VileBeggar Jul 31, 2024
7c04547
apply suggestions from review
VileBeggar Aug 1, 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
6 changes: 5 additions & 1 deletion code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
View file
Open in desktop
VileBeggar marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,10 @@
/mob/living/carbon/xenomorph/queen/can_destroy_special()
return TRUE

/mob/living/carbon/xenomorph/queen/set_resting(new_resting, silent, instant)
if(ovipositor)
return
return ..()

/mob/living/carbon/xenomorph/queen/get_organ_icon()
return "heart_t3"
Expand Down Expand Up @@ -809,10 +813,10 @@
/mob/living/carbon/xenomorph/queen/proc/mount_ovipositor()
if(ovipositor)
return //sanity check
ovipositor = TRUE
ADD_TRAIT(src, TRAIT_IMMOBILIZED, OVIPOSITOR_TRAIT)
set_body_position(STANDING_UP)
set_resting(FALSE)
ovipositor = TRUE

set_resin_build_order(GLOB.resin_build_order_ovipositor) // This needs to occur before we update the abilities so we can update the choose resin icon
for(var/datum/action/xeno_action/action in actions)
Expand Down
Loading