shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Even admin-called shuttles will be affected by alert level

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/power/singularity/narsie.dm
View File

@@ -39,7 +39,7 @@
narsie_spawn_animation()
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)

13
code/modules/shuttle/emergency.dm
View File

@@ -207,8 +207,17 @@
. = ..()
/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, coefficient=1, area/signalOrigin, reason, redAlert)
var/call_time = SSshuttle.emergencyCallTime * coefficient
/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signalOrigin, reason, redAlert, set_coefficient=null)
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)
// The shuttle can not normally be called while "recalling", so
// if this proc is called, it's via admin fiat