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.

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

fixes is_interior(), fixing xeno construction on dropships during transport #5158

Merged
merged 1 commit into from
Dec 9, 2023

Conversation

harryob
Copy link
Member

@harryob harryob commented Dec 7, 2023

huh? how'd this not get reported?

🆑
fix: xenos can construct in dropships during transport again
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Dec 7, 2023
@SabreML
Copy link
Member

SabreML commented Dec 7, 2023

Wow, that was fast.

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can confirm changes work on a hijacked dropship in tranit:
image

@Doubleumc
Copy link
Contributor

If this does what I think it does (reserved-but-not-interior turfs don't inherently count as interior) you can revert part of #4815 https://github.com/cmss13-devs/cmss13/pull/4815/files#diff-150200d3d67a0db8d052db8dfcfa37b39396e514b3bef9d708dcce5d7e1bdd7aL45-R45

@Drulikar
Copy link
Contributor

Drulikar commented Dec 8, 2023

If this does what I think it does (reserved-but-not-interior turfs don't inherently count as interior) you can revert part of #4815 https://github.com/cmss13-devs/cmss13/pull/4815/files#diff-150200d3d67a0db8d052db8dfcfa37b39396e514b3bef9d708dcce5d7e1bdd7aL45-R45

I don't think there's currently any change there. if . was assigned it would matter; but the default return value should already be 0 aka FALSE; though maybe its actually null - either case it should be falsey - just not sure what it returns for isnull.

@Doubleumc
Copy link
Contributor

I don't think there's currently any change there. if . was assigned it would matter; but the default return value should already be 0 aka FALSE; though maybe its actually null - either case it should be falsey - just not sure what it returns for isnull.

It makes a difference because the return (VI) is subjected to a null check, which 0/FALSE would pass.

if(SSinterior.in_interior(turf_source))
var/datum/interior/VI = SSinterior.get_interior_by_coords(turf_source.x, turf_source.y, turf_source.z)
if(VI?.ready)

Also described here: #4815 (comment)

If reserved-but-not-interior turfs counting as interior is undesired, reverting this change would cause exceptions to be thrown if one managed to be created again.

@Birdtalon Birdtalon added this pull request to the merge queue Dec 9, 2023
Merged via the queue into cmss13-devs:master with commit f8e0618 Dec 9, 2023
28 checks passed
cm13-github added a commit that referenced this pull request Dec 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants