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

Revives "Stops Queen from stomping on Xenos with relevant pass flags (Lessers/Huggers/Larva) " #7228

Merged
merged 2 commits into from
Oct 5, 2024
Merged

Revives "Stops Queen from stomping on Xenos with relevant pass flags (Lessers/Huggers/Larva) " #7228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bbf7ac
Revive best PR
Venuska1117 Sep 27, 2024
9a2ac16
Fixed code.
Venuska1117 Sep 27, 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
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/xenomorph/castes/Queen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,8 @@
/mob/living/carbon/xenomorph/queen/proc/check_block(mob/queen, turf/new_loc)
SIGNAL_HANDLER
for(var/mob/living/carbon/xenomorph/xeno in new_loc.contents)
if(xeno.pass_flags.flags_pass & PASS_MOB_THRU_XENO|PASS_MOB_THRU && !(xeno.flags_pass_temp & PASS_MOB_THRU))
return
if(xeno.hivenumber == hivenumber)
xeno.KnockDown((5 DECISECONDS) / GLOBAL_STATUS_MULTIPLIER)
playsound(src, 'sound/weapons/alien_knockdown.ogg', 25, 1)
Expand Down
23 changes: 13 additions & 10 deletions code/modules/mob/living/living.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,20 +388,23 @@
if(loc && !loc.Adjacent(L.loc))
now_pushing = FALSE
return
var/oldloc = loc
var/oldLloc = L.loc

L.add_temp_pass_flags(PASS_MOB_THRU)
add_temp_pass_flags(PASS_MOB_THRU)
if(!(L.pass_flags.flags_pass & PASS_MOB_THRU)) //if they already pass through mob thi stuff is unnecessary

L.Move(oldloc)
Move(oldLloc)
var/oldloc = loc
var/oldLloc = L.loc

remove_temp_pass_flags(PASS_MOB_THRU)
L.remove_temp_pass_flags(PASS_MOB_THRU)
L.add_temp_pass_flags(PASS_MOB_THRU)
add_temp_pass_flags(PASS_MOB_THRU)

now_pushing = FALSE
return
L.Move(oldloc)
Move(oldLloc)

remove_temp_pass_flags(PASS_MOB_THRU)
L.remove_temp_pass_flags(PASS_MOB_THRU)

now_pushing = FALSE
return

now_pushing = FALSE

Expand Down
Loading