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

Merge branch 'master' into computer_tweaks

Browse Source 
# Conflicts:
#	code/game/jobs/job/ship_crew.dm
This commit is contained in:
alberyk
2021-10-10 13:18:14 -03:00
parent 99cb9a0ea2 6298a41f58
commit 805ffc2f85
229 changed files with 3237 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/subtypes/dev_handheld.dm
+1
View File
@@ -7,6 +7,7 @@
icon_state = "tablet"
icon_state_unpowered = "tablet"
icon_state_menu = "menu"
overlay_state = "electronic"
slot_flags = SLOT_ID | SLOT_BELT
can_reset = TRUE
hardware_flag = PROGRAM_TABLET
code/modules/modular_computers/file_system/programs/command/comm.dm
+16 -3
View File
@@ -366,6 +366,15 @@ Command action procs
/proc/cancel_call_proc(var/mob/user)
if(!(ROUND_IS_STARTED) || !evacuation_controller)
return FALSE
if(current_map.shuttle_call_restarts && current_map.shuttle_call_restart_timer)
deltimer(current_map.shuttle_call_restart_timer)
current_map.shuttle_call_restart_timer = null
log_game("[key_name(user)] has stopped the 'shuttle' round restart.", key_name(user))
message_admins("[key_name_admin(user)] has stopped the 'shuttle' round restart.", 1)
to_world(FONT_LARGE(SPAN_VOTE(current_map.shuttle_recall_message)))
return
if(SSticker.mode.name == "Meteor")
return FALSE
@@ -411,10 +420,14 @@ Command action procs
return TRUE
/proc/init_shift_change(var/mob/user, var/force = FALSE)
if ((!(ROUND_IS_STARTED) || !evacuation_controller))
if(!(ROUND_IS_STARTED) || !evacuation_controller)
return
if (!evacuation_controller)
if(current_map.shuttle_call_restarts)
current_map.shuttle_call_restart_timer = addtimer(CALLBACK(GLOBAL_PROC, .proc/reboot_world), 10 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE)
log_game("[user? key_name(user) : "Autotransfer"] has called the 'shuttle' round restart.")
message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the 'shuttle' round restart.", 1)
to_world(FONT_LARGE(SPAN_VOTE(current_map.shuttle_called_message)))
return
. = evacuation_controller.call_evacuation(null, _emergency_evac = FALSE, autotransfer = TRUE)
@@ -425,4 +438,4 @@ Command action procs
SSevents.delay_events(EVENT_LEVEL_MAJOR, 10200)
log_game("[user? key_name(user) : "Autotransfer"] has called the shuttle.")
message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1)
message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1)