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.

Sign up for GitHub

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

Autocall Revert #33693

Merged
merged 1 commit into from
Nov 28, 2022
Merged

Autocall Revert #33693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions code/controllers/shuttle_controller.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,15 +423,15 @@ var/global/datum/emergency_shuttle/emergency_shuttle
else
return 1

/proc/shuttle_autocall(var/reason = "None")
/proc/shuttle_autocall()
if (emergency_shuttle.departed)
return

if (emergency_shuttle.location == SHUTTLE_ON_STATION)
return

emergency_shuttle.incall(2)
log_game("[reason]. Shuttle called.")
message_admins("[reason]. Shuttle called.", 1)
captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes. Justification: [reason]")
log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.")
message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1)
captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
world << sound('sound/AI/shuttlecalled.ogg')
4 changes: 0 additions & 4 deletions code/datums/gamemode/dynamic/dynamic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ var/stacking_limit = 90
var/list/dead_players = list()
var/list/list_observers = list()
var/last_time_of_population = 0
var/last_time_of_late_shuttle_call = 0

var/latejoin_injection_cooldown = 0
var/midround_injection_cooldown = 0
Expand Down Expand Up @@ -656,9 +655,6 @@ var/stacking_limit = 90
last_time_of_population = world.time
else if(last_time_of_population && world.time - last_time_of_population > 1 HOURS) //if enough time has passed without it
ticker.station_nolife_cinematic()
if(world.time > (7 HOURS + 40 MINUTES) && world.time - last_time_of_late_shuttle_call > 1 HOURS && emergency_shuttle.direction == 0) // 8 hour work shift, with time for shuttle to arrive and leave. If recalled, do every hour
shuttle_autocall("Shift due to end")
last_time_of_late_shuttle_call = world.time

/datum/gamemode/dynamic/proc/GetInjectionChance()
var/chance = 0
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/computer/communications.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ var/list/shuttle_log = list()
if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction")
return ..()

shuttle_autocall("All the AIs, comm consoles and boards are destroyed")
shuttle_autocall()
..()

// -- Blob defcon 1 things
Expand Down Expand Up @@ -828,6 +828,6 @@ var/list/shuttle_log = list()
if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction")
return ..()

shuttle_autocall("All the AIs, comm consoles and boards are destroyed")
shuttle_autocall()

..()
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/ai/death.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
callshuttle = 0

if(callshuttle == 3) //if all three conditions are met
shuttle_autocall("All the AIs, comm consoles and boards are destroyed")
shuttle_autocall()

if(explosive && !gibbed && !istype(loc, /obj/machinery/power/apc))
visible_message("<span class='danger'>[name] begins to spark violently!</span>")
Expand Down
2 changes: 1 addition & 1 deletion vgstation13.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2523,8 +2523,8 @@
#include "code\modules\research\xenoarchaeology\artifact\artifact_hoverpod.dm"
#include "code\modules\research\xenoarchaeology\artifact\artifact_losetta.dm"
#include "code\modules\research\xenoarchaeology\artifact\artifact_replicator.dm"
#include "code\modules\research\xenoarchaeology\artifact\artifact_vendor.dm"
#include "code\modules\research\xenoarchaeology\artifact\artifact_unknown.dm"
#include "code\modules\research\xenoarchaeology\artifact\artifact_vendor.dm"
#include "code\modules\research\xenoarchaeology\artifact\effect.dm"
#include "code\modules\research\xenoarchaeology\artifact\trigger.dm"
#include "code\modules\research\xenoarchaeology\artifact\effects\unknown_affect_cold.dm"
Expand Down