cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports Bay's updated evacuation controller and bluespace jump. (#12445)

Browse Source
This commit is contained in:
Matt Atlas
2021-09-07 17:12:10 +02:00
committed by GitHub
parent 0b6631781a
commit b64224770c
59 changed files with 1137 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/abstract/new_player/new_player.dm
+1
View File
@@ -279,6 +279,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
character.buckled_to.set_dir(character.dir)
SSticker.mode.handle_latejoin(character)
universe.OnPlayerLatejoin(character)
if(SSjobs.ShouldCreateRecords(character.mind))
if(character.mind.assigned_role != "Cyborg")
SSrecords.generate_record(character)
code/modules/mob/abstract/observer/observer.dm
+2 -2
View File
@@ -266,8 +266,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/abstract/observer/Stat()
..()
if(statpanel("Status"))
if(emergency_shuttle)
var/eta_status = emergency_shuttle.get_status_panel_eta()
if(evacuation_controller)
var/eta_status = evacuation_controller.get_status_panel_eta()
if(eta_status)
stat(null, eta_status)
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -185,8 +185,8 @@
if(statpanel("Status"))
stat("Intent:", "[a_intent]")
stat("Move Mode:", "[m_intent]")
if(emergency_shuttle)
var/eta_status = emergency_shuttle.get_status_panel_eta()
if(evacuation_controller)
var/eta_status = evacuation_controller.get_status_panel_eta()
if(eta_status)
stat(null, eta_status)
if(is_diona() && DS)
code/modules/mob/living/silicon/ai/ai.dm
+5 -6
View File
@@ -429,12 +429,12 @@ var/list/ai_verbs_default = list(
/mob/living/silicon/ai/proc/ai_call_shuttle()
set category = "AI Commands"
set name = "Call Emergency Shuttle"
set name = "Call Evacuation"
if(check_unable(AI_CHECK_WIRELESS))
return
var/confirm = alert("Are you sure you want to call the shuttle?", "Confirm Shuttle Call", "Yes", "No")
var/confirm = alert("Are you sure you want to call the evacuation?", "Confirm Evacuation", "Yes", "No")
if(check_unable(AI_CHECK_WIRELESS))
return
@@ -442,17 +442,16 @@ var/list/ai_verbs_default = list(
if(confirm == "Yes")
call_shuttle_proc(src)
if(emergency_shuttle.online())
post_display_status("shuttle")
post_display_status("shuttle")
/mob/living/silicon/ai/proc/ai_recall_shuttle()
set category = "AI Commands"
set name = "Recall Emergency Shuttle"
set name = "Cancel Evacuation"
if(check_unable(AI_CHECK_WIRELESS))
return
var/confirm = alert("Are you sure you want to recall the shuttle?", "Confirm Shuttle Recall", "Yes", "No")
var/confirm = alert("Are you sure you want to cancel the evacuation?", "Confirm Cancel", "Yes", "No")
if(check_unable(AI_CHECK_WIRELESS))
return
code/modules/mob/living/silicon/silicon.dm
+2 -2
View File
@@ -176,8 +176,8 @@
// this function displays the shuttles ETA in the status panel if the shuttle has been called
/mob/living/silicon/proc/show_emergency_shuttle_eta()
if(emergency_shuttle)
var/eta_status = emergency_shuttle.get_status_panel_eta()
if(evacuation_controller)
var/eta_status = evacuation_controller.get_status_panel_eta()
if(eta_status)
stat(null, eta_status)
code/modules/mob/living/simple_animal/borer/borer.dm
+2 -2
View File
@@ -102,8 +102,8 @@
..()
statpanel("Status")
if(emergency_shuttle)
var/eta_status = emergency_shuttle.get_status_panel_eta()
if(evacuation_controller)
var/eta_status = evacuation_controller.get_status_panel_eta()
if(eta_status)
stat(null, eta_status)
code/modules/mob/living/simple_animal/hostile/hostile.dm
+1 -1
View File
@@ -353,7 +353,7 @@ mob/living/simple_animal/hostile/hitby(atom/movable/AM as mob|obj,var/speed = TH
/mob/living/simple_animal/hostile/proc/check_horde()
if(emergency_shuttle.shuttle.location)
if(evacuation_controller.is_prepared())
if(!enroute && !target_mob) //The shuttle docked, all monsters rush for the escape hallway
if(!shuttletarget && escape_list.len) //Make sure we didn't already assign it a target, and that there are targets to pick
shuttletarget = pick(escape_list) //Pick a shuttle target