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

Lets xenos drag and drop themselves into a vent crawl #6635

Closed
Closed
Changes from all commits
Commits
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: 6 additions & 0 deletions code/game/objects/structures/pipes/vents/vents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@
/obj/structure/pipes/vents/hide()
update_underlays()

/obj/structure/pipes/vents/MouseDrop_T(obj/structure/pipes/vents/dropvent, mob/living/carbon/xenomorph/user)
Copy link
Member

Choose a reason for hiding this comment

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

isn't dropvent here the atom being dropped (aka the user)?

Suggested change
/obj/structure/pipes/vents/MouseDrop_T(obj/structure/pipes/vents/dropvent, mob/living/carbon/xenomorph/user)
/obj/structure/pipes/vents/MouseDrop_T(atom/dropping, mob/living/carbon/xenomorph/user)

if(!isxeno(user) || !user.check_state() || !user.can_ventcrawl())
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if(!isxeno(user) || !user.check_state() || !user.can_ventcrawl())
if(!isxeno(user) || !user.check_state() || !user.can_ventcrawl() || dropping != user)

return
if(dropvent in range(1))
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if(dropvent in range(1))
if(get_dist(src, user) <= 1)

user.handle_ventcrawl(dropvent)

/obj/structure/pipes/vents/attackby(obj/item/W, mob/user)
if(iswelder(W))
var/weldtime = 50
Expand Down
Loading