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

Elevators #26937

Merged
merged 4 commits into from May 6, 2017
Merged

Elevators #26937

merged 4 commits into from May 6, 2017

Conversation

imtakingabreakdontatme
Copy link
Contributor

It's a shuttle subtype that skips transit/ignition/ripples etc. Just simple up/down.

Not a very exciting PR

@RemieRichards
Copy link
Contributor

does it still knock people over? it shouldn't.

@ma44
Copy link
Contributor

ma44 commented May 5, 2017

Does it kill if someone is in the space on the other end?

@RemieRichards
Copy link
Contributor

RemieRichards commented May 5, 2017

@ma44 yes but that makes sense and should stay.

@imtakingabreakdontatme
Copy link
Contributor Author

@RemieRichards

The knocking over occurs when it calls onshuttlemove on everything in the shuttle. Should I add an argument to onshuttlemove (ELEVATOR) and then check that in carbons onshuttlemove or can you think of a better way?

@RemieRichards
Copy link
Contributor

@KorPhaeron an argument is fine.
Also, when someone is crushed by these elevators they get "hit by a hyperspace ripple" (visible message) still, should probably fix that.

@@ -3,7 +3,7 @@
return

// Called when shuttle attempts to move an atom.
/atom/movable/proc/onShuttleMove(turf/T1, rotation)
/atom/movable/proc/onShuttleMove(turf/T1, rotation, force = FALSE)
Copy link
Contributor

Choose a reason for hiding this comment

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

bad arg name.

@@ -517,7 +517,7 @@

//move mobile to new location
for(var/atom/movable/AM in T0)
if(AM.onShuttleMove(T1, rotation))
if(AM.onShuttleMove(T1, rotation, force))
Copy link
Contributor

Choose a reason for hiding this comment

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

potential change in functionality, make this argument source its value from the docking port object, and set it to false on your elevators.
eg:

/obj/docking_port/elevator
    knockdown = FALSE

a hyperspace ripple!</span>",
"<span class='userdanger'>You feel an immense \
crushing pressure as the space around you ripples.</span>")
M.visible_message("<span class='warning'>[src] slames into [M]!</span>"
Copy link
Contributor

Choose a reason for hiding this comment

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

slames

@GunHog
Copy link
Contributor

GunHog commented May 5, 2017

On the actual Planetstation, how hard would this be to do with the Aux Base?

@Dorsisdwarf
Copy link
Contributor

Can we get a rattling chain lift sound for the transition

@Jalleo
Copy link
Contributor

Jalleo commented May 5, 2017

Ask Cuboos for that.

@ExcessiveUseOfCobblestone
Copy link
Contributor

https://www.youtube.com/watch?v=RCSbmSmyAcY

for transition.

@lzimann lzimann merged commit 1ef9f66 into tgstation:master May 6, 2017
@imtakingabreakdontatme imtakingabreakdontatme deleted the elevator branch May 6, 2017 21:30
ghost referenced this pull request in HippieStation/HippieStationdeprecated2020 May 6, 2017
@coiax
Copy link
Member

coiax commented May 7, 2017

Did you mean to change regular shuttles to not hit people with hyperspace ripples anymore?

@imtakingabreakdontatme
Copy link
Contributor Author

Was trying to think of a generic message that would work for both

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants