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

bugfix: shuttle now wait 3 minutes after deny lockdown #6288

Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion code/game/gamemodes/emergency_shuttle_lockdown.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
emergencyNoEscape = FALSE
if(emergency.mode == SHUTTLE_STRANDED)
emergency.mode = SHUTTLE_DOCKED
emergency.timer = world.time
emergency.timer = world.time + 3 MINUTES
GLOB.priority_announcement.Announce("Угроза устранена. У вас есть 3 минуты, чтобы подняться на борт эвакуационного шаттла.", "Приоритетное оповещение.")
10 changes: 5 additions & 5 deletions code/game/gamemodes/malfunction/Malf_Modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -276,18 +276,18 @@

/obj/machinery/doomsday_device/Destroy()
STOP_PROCESSING(SSfastprocess, src)
SSshuttle.emergencyNoEscape = 0
SSshuttle.emergencyNoEscape = FALSE
if(SSshuttle.emergency.mode == SHUTTLE_STRANDED)
SSshuttle.emergency.mode = SHUTTLE_DOCKED
SSshuttle.emergency.timer = world.time
SSshuttle.emergency.timer = world.time + 3 MINUTES
GLOB.priority_announcement.Announce("Вредоносное окружение устранено. У вас есть 3 минуты, чтобы подняться на борт эвакуационного шаттла.", "Приоритетное оповещение.", 'sound/AI/shuttledock.ogg')
return ..()

/obj/machinery/doomsday_device/proc/start()
detonation_timer = world.time + default_timer
timing = 1
START_PROCESSING(SSfastprocess, src)
SSshuttle.emergencyNoEscape = 1
SSshuttle.emergencyNoEscape = TRUE

/obj/machinery/doomsday_device/proc/seconds_remaining()
. = max(0, (round(detonation_timer - world.time) / 10))
Expand All @@ -296,10 +296,10 @@
var/turf/T = get_turf(src)
if(!T || !is_station_level(T.z))
GLOB.minor_announcement.Announce("УСТРОЙСТВО СУДНОГО ДНЯ ВНЕ ЗОНЫ ДЕЙСТВИЯ СТАНЦИИ, ОСТАНОВКА.", "ОШИБКА ОШИБКА $0ШБК$!А41.%%!!(%$^^__+ @#Ш0E4", 'sound/misc/notice1.ogg')
SSshuttle.emergencyNoEscape = 0
SSshuttle.emergencyNoEscape = FALSE
if(SSshuttle.emergency.mode == SHUTTLE_STRANDED)
SSshuttle.emergency.mode = SHUTTLE_DOCKED
SSshuttle.emergency.timer = world.time
SSshuttle.emergency.timer = world.time + 3 MINUTES
GLOB.priority_announcement.Announce("Вредоносное окружение устранено. У вас есть 3 минуты, чтобы подняться на борт эвакуационного шаттла.", "Приоритетное оповещение.", 'sound/AI/shuttledock.ogg')
qdel(src)
if(!timing)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/silicon/ai/death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@

if(doomsday_device)
doomsday_device.timing = 0
SSshuttle.emergencyNoEscape = 0
SSshuttle.emergencyNoEscape = FALSE
if(SSshuttle.emergency.mode == SHUTTLE_STRANDED)
SSshuttle.emergency.mode = SHUTTLE_DOCKED
SSshuttle.emergency.timer = world.time
SSshuttle.emergency.timer = world.time + 3 MINUTES
GLOB.priority_announcement.Announce("Вредоносное окружение устранено. У вас есть 3 минуты, чтобы подняться на борт эвакуационного шаттла.", "Приоритетное оповещение.", 'sound/AI/shuttledock.ogg')
qdel(doomsday_device)

Expand Down
Loading