-
Notifications
You must be signed in to change notification settings - Fork 523
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# About the pull request Makes the Vehicle Bay elevator work better. Specifically: - Adds some ASRS sound effects, and tweaks the timing of various elements to line up with them. - Adds the pre-existing vehicle bay elevator shaft sprite for when the elevator has been lowered. (No animation yet though) - Adds `\proper` to `/turf/open/floor/almayer/empty` and the elevator shaft effect to change the grammar of its examine text: **Before/After:** ![before](https://github.com/cmss13-devs/cmss13/assets/57483089/d4fbf696-4f2c-47e3-8a7f-8f655112b9ff) ![after](https://github.com/cmss13-devs/cmss13/assets/57483089/1d883dec-306d-4605-88d5-97c1832b7428) - Fixes(?) the front guard rails not raising when the elevator is lowered. - Fixes a bug where the shipside docking port would fall into the elevator shaft after the elevator left: ![image](https://github.com/cmss13-devs/cmss13/assets/57483089/5cf513a4-118b-4567-8c71-d26d53585542) - Fixes an oversight where a human falling into the vehicle bay elevator shaft would be teleported to the requisitions elevator. - Fixes the gear things at the corners of the elevator spinning constantly until it's called back up. (See comparison videos below) # Explain why it's good for the game The vehicle bay elevator doesn't get used often, but it *does* get used. This will hopefully make it feel a bit less janky. # Testing Photographs and Procedure <details> <summary>Screenshots & Videos</summary> ### Sending the elevator down and up again: (Unmute for sound on both videos) **Before:** https://github.com/cmss13-devs/cmss13/assets/57483089/5fba87cd-2ef5-42ea-81f7-dc9872e4b622 **After:** https://github.com/cmss13-devs/cmss13/assets/57483089/3f833e89-3e52-4fee-9f07-2c376ab2000b </details> (I've also tested this with #5401, and it seems to work without any issues.) # Changelog :cl: add: Made the vehicle bay elevator look and sound better when in use. fix: Fixed the vehicle bay elevator's front railings not closing when the elevator was lowered. fix: Fixed the vehicle bay elevator's docking port falling down the elevator shaft when it was lowered. fix: Fixed falling into the vehicle bay elevator shaft teleporting players to the requisitions elevator. /:cl:
- Loading branch information
Showing
8 changed files
with
171 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,32 @@ | ||
/obj/effect/elevator/supply | ||
name = "\improper empty space" | ||
desc = "There seems to be an awful lot of machinery down below" | ||
/obj/effect/elevator | ||
name = "\proper empty space" | ||
desc = "There seems to be an awful lot of machinery down below..." | ||
icon = 'icons/effects/160x160.dmi' | ||
icon_state = "supply_elevator_lowered" | ||
unacidable = TRUE | ||
mouse_opacity = MOUSE_OPACITY_TRANSPARENT | ||
layer = ABOVE_TURF_LAYER | ||
appearance_flags = KEEP_TOGETHER | ||
|
||
/obj/effect/elevator/supply/ex_act(severity) | ||
/obj/effect/elevator/ex_act(severity) | ||
return | ||
|
||
/obj/effect/elevator/supply/Destroy(force) | ||
/obj/effect/elevator/Destroy(force) | ||
if(!force) | ||
return QDEL_HINT_LETMELIVE | ||
return ..() | ||
|
||
/obj/effect/elevator/supply/visible_message() //Prevents message spam with empty elevator shaft - "The empty space falls into the depths!" | ||
// Don't move with the elevator. | ||
/obj/effect/elevator/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock) | ||
return | ||
/obj/effect/elevator/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) | ||
return | ||
/obj/effect/elevator/lateShuttleMove(turf/oldT, list/movement_force, move_dir) | ||
return | ||
|
||
/obj/effect/elevator/animation_overlay | ||
blend_mode = BLEND_INSET_OVERLAY | ||
appearance_flags = KEEP_TOGETHER | ||
|
||
/obj/effect/elevator/vehicle | ||
icon_state = "vehicle_elevator_lowered" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.