cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7068 from FalseIncarnate/bugfix

Browse Source 
[s] Shadowling "Extend Shuttle" prevents recall
This commit is contained in:
Fox McCloud
2017-04-11 18:53:37 -04:00
committed by GitHub
parent 14a2df684b 971cc07d04
commit be2ceef4ab
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/Processes/shuttles.dm
+2
View File
@@ -160,6 +160,8 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
/datum/controller/process/shuttle/proc/canRecall()
if(emergency.mode != SHUTTLE_CALL)
return
if(!emergency.canRecall)
return
if(ticker.mode.name == "meteor")
return
if(seclevel2num(get_security_level()) >= SEC_LEVEL_RED)
code/game/gamemodes/shadowling/shadowling_abilities.dm
+2 -1
View File
@@ -718,8 +718,9 @@
var/more_minutes = 9000
var/timer = shuttle_master.emergency.timeLeft()
timer += more_minutes
event_announcement.Announce("Major system failure aboard the emergency shuttle. This will extend its arrival time by approximately 15 minutes..", "System Failure", 'sound/misc/notice1.ogg')
event_announcement.Announce("Major system failure aboard the emergency shuttle. This will extend its arrival time by approximately 15 minutes and the shuttle is unable to be recalled.", "System Failure", 'sound/misc/notice1.ogg')
shuttle_master.emergency.setTimer(timer)
shuttle_master.emergency.canRecall = FALSE
user.mind.spell_list.Remove(src) //Can only be used once!
qdel(src)