Even admin-called shuttles will be affected by alert level

This commit is contained in:
CitadelStationBot
2017-04-27 16:55:12 -05:00
parent 1334608d23
commit 57a0e05679
5 changed files with 19 additions and 12 deletions
+4 -6
View File
@@ -210,12 +210,10 @@ SUBSYSTEM_DEF(shuttle)
var/emergency_reason = "\nNature of emergency:\n\n[call_reason]" var/emergency_reason = "\nNature of emergency:\n\n[call_reason]"
var/security_num = seclevel2num(get_security_level()) var/security_num = seclevel2num(get_security_level())
switch(security_num) switch(security_num)
if(SEC_LEVEL_GREEN) if(SEC_LEVEL_RED,SEC_LEVEL_DELTA)
emergency.request(null, 2, signal_origin, html_decode(emergency_reason), 0) emergency.request(null, signal_origin, html_decode(emergency_reason), 1) //There is a serious threat we gotta move no time to give them five minutes.
if(SEC_LEVEL_BLUE)
emergency.request(null, 1, signal_origin, html_decode(emergency_reason), 0)
else else
emergency.request(null, 0.5, signal_origin, html_decode(emergency_reason), 1) // There is a serious threat we gotta move no time to give them five minutes. emergency.request(null, signal_origin, html_decode(emergency_reason), 0)
log_game("[key_name(user)] has called the shuttle.") log_game("[key_name(user)] has called the shuttle.")
message_admins("[key_name_admin(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle.")
@@ -274,7 +272,7 @@ SUBSYSTEM_DEF(shuttle)
if(callShuttle) if(callShuttle)
if(EMERGENCY_IDLE_OR_RECALLED) if(EMERGENCY_IDLE_OR_RECALLED)
emergency.request(null, 2.5) emergency.request(null, set_coefficient = 2.5)
log_game("There is no means of calling the shuttle anymore. Shuttle automatically called.") log_game("There is no means of calling the shuttle anymore. Shuttle automatically called.")
message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.") message_admins("All the communications consoles were destroyed and all AIs are inactive. Shuttle called.")
+1 -1
View File
@@ -287,7 +287,7 @@ GLOBAL_LIST_INIT(lawlorify, list (
notify_ghosts("An arch devil has ascended in \the [A.name]. Reach out to the devil to be given a new shell for your soul.", source = owner.current, action=NOTIFY_ATTACK) notify_ghosts("An arch devil has ascended in \the [A.name]. Reach out to the devil to be given a new shell for your soul.", source = owner.current, action=NOTIFY_ATTACK)
sleep(50) sleep(50)
if(!SSticker.mode.devil_ascended) if(!SSticker.mode.devil_ascended)
SSshuttle.emergency.request(null, 0.3) SSshuttle.emergency.request(null, set_coefficient = 0.3)
SSticker.mode.devil_ascended++ SSticker.mode.devil_ascended++
form = ARCH_DEVIL form = ARCH_DEVIL
@@ -166,7 +166,7 @@
var/obj/machinery/abductor/console/con = get_team_console(team_number) var/obj/machinery/abductor/console/con = get_team_console(team_number)
var/datum/objective/objective = team_objectives[team_number] var/datum/objective/objective = team_objectives[team_number]
if (con.experiment.points >= objective.target_amount) if (con.experiment.points >= objective.target_amount)
SSshuttle.emergency.request(null, 0.5) SSshuttle.emergency.request(null, set_coefficient = 0.5)
finished = 1 finished = 1
return ..() return ..()
return ..() return ..()
+1 -1
View File
@@ -39,7 +39,7 @@
narsie_spawn_animation() narsie_spawn_animation()
sleep(70) sleep(70)
SSshuttle.emergency.request(null, 0.1) // Cannot recall SSshuttle.emergency.request(null, set_coefficient = 0.1) // Cannot recall
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob) /obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
+11 -2
View File
@@ -207,8 +207,17 @@
. = ..() . = ..()
/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, coefficient=1, area/signalOrigin, reason, redAlert) /obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signalOrigin, reason, redAlert, set_coefficient=null)
var/call_time = SSshuttle.emergencyCallTime * coefficient if(!isnum(set_coefficient))
var/security_num = seclevel2num(get_security_level())
switch(security_num)
if(SEC_LEVEL_GREEN)
set_coefficient = 2
if(SEC_LEVEL_BLUE)
set_coefficient = 1
else
set_coefficient = 0.5
var/call_time = SSshuttle.emergencyCallTime * set_coefficient
switch(mode) switch(mode)
// The shuttle can not normally be called while "recalling", so // The shuttle can not normally be called while "recalling", so
// if this proc is called, it's via admin fiat // if this proc is called, it's via admin fiat