cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-09 16:12:17 +00: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
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

6
code/game/objects/items/devices/communicator/cartridge.dm
View File

@@ -323,7 +323,7 @@
// Copied from /obj/item/cartridge/proc/post_status(),
// code/game/objects/items/PDA/cart.dm, line 251
/obj/item/commcard/proc/post_status(var/command, var/data1, var/data2)
var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435)
var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
if(!frequency)
return
@@ -620,12 +620,12 @@
/obj/item/commcard/head/Initialize(mapload)
// Have to register the commcard with the Radio controller to receive updates to the status displays
radio_controller.add_object(src, 1435)
SSradio.add_object(src, 1435)
. = ..()
/obj/item/commcard/head/Destroy()
// Have to unregister the commcard for proper bookkeeping
radio_controller.remove_object(src, 1435)
SSradio.remove_object(src, 1435)
..()
/obj/item/commcard/head/get_data()

2
code/game/objects/items/devices/communicator/messaging.dm
View File

@@ -118,7 +118,7 @@
set name = "Text Communicator"
set desc = "If there is a communicator available, send a text message to it."
if(ticker.current_state < GAME_STATE_PLAYING)
if(SSticker.current_state < GAME_STATE_PLAYING)
to_chat(src, span_danger("The game hasn't started yet!"))
return

2
code/game/objects/items/devices/communicator/phone.dm
View File

@@ -276,7 +276,7 @@
set name = "Call Communicator"
set desc = "If there is a communicator available, send a request to speak through it. This will reset your respawn timer, if someone picks up."
if(ticker.current_state < GAME_STATE_PLAYING)
if(SSticker.current_state < GAME_STATE_PLAYING)
to_chat(src, span_danger("The game hasn't started yet!"))
return

2
code/game/objects/items/devices/paicard.dm
View File

@@ -504,7 +504,7 @@
if(has_channel_access(card.pai, internal_chan))
channels += ch_name
channels[ch_name] = 1
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
/obj/item/paicard/typeb
name = "personal AI device"

2
code/game/objects/items/devices/radio/electropack.dm
View File

@@ -47,7 +47,7 @@
//..()
if(usr.stat || usr.restrained())
return
if(((ishuman(usr) && ((!( ticker ) || (ticker && ticker.mode != "monkey")) && usr.contents.Find(src))) || (usr.contents.Find(master) || (in_range(src, usr) && istype(loc, /turf)))))
if(((ishuman(usr) && ((!( SSticker ) || (SSticker && SSticker.mode != "monkey")) && usr.contents.Find(src))) || (usr.contents.Find(master) || (in_range(src, usr) && istype(loc, /turf)))))
usr.set_machine(src)
if(href_list["freq"])
var/new_frequency = sanitize_frequency(frequency + text2num(href_list["freq"]))

8
code/game/objects/items/devices/radio/headset.dm
View File

@@ -99,7 +99,7 @@
for(var/ch_name in channels)
radio_controller.remove_object(src, radiochannels[ch_name])
SSradio.remove_object(src, radiochannels[ch_name])
secure_radio_connections[ch_name] = null
@@ -187,15 +187,15 @@
/obj/item/radio/headset/proc/handle_finalize_recalculatechannels(var/setDescription = FALSE, var/initial_run = FALSE)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(!radio_controller && initial_run)
if(!SSradio && initial_run)
addtimer(CALLBACK(src,PROC_REF(handle_finalize_recalculatechannels),setDescription, FALSE),3 SECONDS)
return
if(!radio_controller && !initial_run)
if(!SSradio && !initial_run)
name = "broken radio headset"
return
for (var/ch_name in channels)
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
if(setDescription)
setupRadioDescription()

28
code/game/objects/items/devices/radio/radio.dm
View File

@@ -45,9 +45,9 @@
var/list/datum/radio_frequency/secure_radio_connections
/obj/item/radio/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
SSradio.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
radio_connection = SSradio.add_object(src, frequency, RADIO_CHAT)
/obj/item/radio/Initialize(mapload)
. = ..()
@@ -57,7 +57,7 @@
set_frequency(frequency)
for (var/ch_name in channels)
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
wires = new(src)
internal_channels = GLOB.default_internal_channels.Copy()
@@ -106,10 +106,10 @@
qdel(wires)
wires = null
GLOB.listening_objects -= src
if(radio_controller)
radio_controller.remove_object(src, frequency)
if(SSradio)
SSradio.remove_object(src, frequency)
for (var/ch_name in channels)
radio_controller.remove_object(src, radiochannels[ch_name])
SSradio.remove_object(src, radiochannels[ch_name])
return ..()
/obj/item/radio/proc/recalculateChannels()
@@ -649,7 +649,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
for(var/ch_name in channels)
radio_controller.remove_object(src, radiochannels[ch_name])
SSradio.remove_object(src, radiochannels[ch_name])
secure_radio_connections[ch_name] = null
@@ -707,24 +707,24 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
/obj/item/radio/borg/proc/controller_check(var/initial_run = FALSE)
PRIVATE_PROC(TRUE)
SHOULD_NOT_OVERRIDE(TRUE)
if(!radio_controller && initial_run)
if(!SSradio && initial_run)
addtimer(CALLBACK(src,PROC_REF(controller_check), FALSE),3 SECONDS)
return
if(!radio_controller && !initial_run)
if(!SSradio && !initial_run)
name = "broken radio headset"
return
for (var/ch_name in channels)
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
/obj/item/radio/proc/config(op)
if(radio_controller)
if(SSradio)
for (var/ch_name in channels)
radio_controller.remove_object(src, radiochannels[ch_name])
SSradio.remove_object(src, radiochannels[ch_name])
secure_radio_connections = new
channels = op
if(radio_controller)
if(SSradio)
for (var/ch_name in op)
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
secure_radio_connections[ch_name] = SSradio.add_object(src, radiochannels[ch_name], RADIO_CHAT)
return
/obj/item/radio/off