cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Unit Test rework & Master/Ticker update (#11372)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
This commit is contained in:
Selis
2025-08-12 08:46:46 +02:00
committed by GitHub
co-authored by Kashargul C.L.
parent 0ab6069dcb
commit 386c4f6756
390 changed files with 10560 additions and 5777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tgui/modules/communications.dm
+8 -8
View File
@@ -175,7 +175,7 @@
return global_message_listener
/proc/post_status(atom/source, command, data1, data2, mob/user = null)
var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435)
var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
if(!frequency)
return
@@ -385,7 +385,7 @@
PS.allowedtocall = !(PS.allowedtocall)
/proc/call_shuttle_proc(var/mob/user)
if ((!( ticker ) || !emergency_shuttle.location()))
if ((!( SSticker ) || !emergency_shuttle.location()))
return
if(!GLOB.universe.OnShuttleCall(user))
@@ -412,7 +412,7 @@
to_chat(user, "The emergency shuttle is already on its way.")
return
if(ticker.mode.name == "blob")
if(SSticker.mode.name == "blob")
to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.")
return
@@ -424,7 +424,7 @@
return
/proc/init_shift_change(var/mob/user, var/force = 0)
if ((!( ticker ) || !emergency_shuttle.location()))
if ((!( SSticker ) || !emergency_shuttle.location()))
return
if(emergency_shuttle.going_to_centcom())
@@ -449,11 +449,11 @@
to_chat(user, "The shuttle is refueling. Please wait another [round((54000-world.time)/60)] minutes before trying again.")
return
if(ticker.mode.auto_recall_shuttle)
if(SSticker.mode.auto_recall_shuttle)
//New version pretends to call the shuttle but cause the shuttle to return after a random duration.
emergency_shuttle.auto_recall = 1
if(ticker.mode.name == "blob" || ticker.mode.name == "epidemic")
if(SSticker.mode.name == "blob" || SSticker.mode.name == "epidemic")
to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.")
return
@@ -471,9 +471,9 @@
return
/proc/cancel_call_proc(var/mob/user)
if (!( ticker ) || !emergency_shuttle.can_recall())
if (!( SSticker ) || !emergency_shuttle.can_recall())
return
if((ticker.mode.name == "blob")||(ticker.mode.name == "Meteor"))
if((SSticker.mode.name == "blob")||(SSticker.mode.name == "Meteor"))
return
if(!emergency_shuttle.going_to_centcom()) //check that shuttle isn't already heading to CentCom
code/modules/tgui/modules/late_choices.dm
+1 -1
View File
@@ -126,7 +126,7 @@
if(!CONFIG_GET(flag/enter_allowed))
to_chat(new_user, span_notice("There is an administrative lock on entering the game!"))
return
else if(ticker && ticker.mode && ticker.mode.explosion_in_progress)
else if(SSticker && SSticker.mode && SSticker.mode.explosion_in_progress)
to_chat(new_user, span_danger("The station is currently exploding. Joining would go poorly."))
return