mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-28 07:20:09 +01:00
KanoandGitHub
2d9d4ce4b6
## About PR Implements an animation logic heavily inspired from CM-SS13 elevators. Elevator hatch and shaft sprites are courtesy of @KingOfThePing! Currently if something is standing on the hatches when the elevator is arriving, they'll be sent to CC level, fall, get paralyzed and severely injured enough to have broken bones/arterial bleeding. This PR also fixes cargo announcement screens not displaying elevator ETA. ## Images <details><summary>Elevator arriving</summary> <p> https://github.com/user-attachments/assets/34879994-d10b-4cb6-959e-314ec20411b8 </p> </details> <details><summary>Elevator departing</summary> <p> https://github.com/user-attachments/assets/c345fd3b-07eb-4922-9b28-31cf40842da1 </p> </details> <details><summary>Unfortunate victims falling to the pit</summary> <p> https://github.com/user-attachments/assets/98feac04-5d65-4383-8abc-363ce51a028a </p> </details> ### Asset Licenses The following assets that **have not** been created by myself are included in this PR: | Path | Original Author | License | | --- | --- | --- | | icons/effect/224x192.dmi | KingOfThePing | CC BY-SA 3.0 | | icons/obj/doors/retractable_railing.dmi | CM-SS13 | CC BY-SA 3.0 | | sound/machines/industrial_lift_raising.ogg | CM-SS13 | CC BY-SA 3.0 | | sound/machines/industrial_lift_lowering.ogg | CM-SS13 | CC BY-SA 3.0 | | sound/machines/warning-buzzer-2.ogg | Unknown - https://pixabay.com/sound-effects/incorrect-buzzer-sound-147336/ | Pixabay Licence |
72 lines
1.9 KiB
Plaintext
72 lines
1.9 KiB
Plaintext
/obj/machinery/status_display/supply_display
|
|
ignore_friendc = 1
|
|
text_color = COLOR_DISPLAY_ORANGE
|
|
header_text_color = COLOR_DISPLAY_YELLOW
|
|
|
|
/obj/machinery/status_display/supply_display/update()
|
|
if(!..() && mode == STATUS_DISPLAY_CUSTOM)
|
|
var/message1 = "CARGO"
|
|
var/message2 = ""
|
|
|
|
var/datum/shuttle/autodock/ferry/supply/shuttle = SScargo.shuttle
|
|
if (!shuttle)
|
|
message2 = "Error"
|
|
else if(shuttle.has_arrive_time())
|
|
message2 = get_supply_shuttle_timer()
|
|
else if (shuttle.is_launching())
|
|
if (shuttle.at_station())
|
|
message2 = "Launch"
|
|
else
|
|
message2 = "ETA"
|
|
else
|
|
if(shuttle.at_station())
|
|
message2 = "Elevator Arrived"
|
|
else
|
|
message1 = ""
|
|
set_messages(message1, message2)
|
|
arrange_displayed_texts(message1, message2)
|
|
return 0
|
|
|
|
/obj/machinery/status_display/supply_display/receive_signal(datum/signal/signal)
|
|
if(signal.data["command"] == "supply")
|
|
mode = STATUS_DISPLAY_CUSTOM
|
|
else
|
|
..(signal)
|
|
|
|
/obj/machinery/status_display/arrivals_display
|
|
ignore_friendc = 1
|
|
hears_arrivals = TRUE
|
|
|
|
text_color = COLOR_DISPLAY_GREEN
|
|
header_text_color = COLOR_DISPLAY_CYAN
|
|
|
|
/obj/machinery/status_display/arrivals_display/update()
|
|
if(!..() && mode == STATUS_DISPLAY_CUSTOM)
|
|
var/message1 = "ARVLS"
|
|
var/message2 = ""
|
|
|
|
var/datum/shuttle/autodock/ferry/arrival/shuttle = SSarrivals.shuttle
|
|
if (!shuttle)
|
|
message2 = "Error"
|
|
else if(shuttle.has_arrive_time())
|
|
message2 = get_arrivals_shuttle_timer()
|
|
else if (shuttle.is_launching())
|
|
if (shuttle.at_station())
|
|
message2 = "Retrn"
|
|
else
|
|
message2 = "ETA"
|
|
else
|
|
if(shuttle.at_station())
|
|
message2 = "Docked"
|
|
else
|
|
message2 = get_arrivals_shuttle_timer2()
|
|
set_messages(message1, message2)
|
|
return 1
|
|
return 0
|
|
|
|
/obj/machinery/status_display/arrivals_display/receive_signal(datum/signal/signal)
|
|
if(signal.data["command"] == "arrivals")
|
|
mode = STATUS_DISPLAY_CUSTOM
|
|
else
|
|
..(signal)
|