cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 23:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port Bay's intercom overhaul

Browse Source
This commit is contained in:
Markolie
2015-09-03 21:21:20 +02:00
parent 65c793f9ac
commit 3a3457de36
26 changed files with 369 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/signaler.dm
+2 -2
View File
@@ -87,8 +87,8 @@
if (href_list["freq"])
var/new_frequency = (frequency + text2num(href_list["freq"]))
if(new_frequency < 1441 || new_frequency > 1489)
new_frequency = sanitize_frequency(new_frequency)
if(new_frequency < RADIO_LOW_FREQ || new_frequency > RADIO_HIGH_FREQ)
new_frequency = sanitize_frequency(new_frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ)
set_frequency(new_frequency)
if(href_list["code"])
code/modules/mob/living/silicon/pai/software_modules.dm
+1 -1
View File
@@ -538,7 +538,7 @@
else if(href_list["freq"])
var/new_frequency = (P.sradio.frequency + text2num(href_list["freq"]))
if(new_frequency < 1200 || new_frequency > 1600)
if(new_frequency < PUBLIC_LOW_FREQ || new_frequency > PUBLIC_HIGH_FREQ)
new_frequency = sanitize_frequency(new_frequency)
P.sradio.set_frequency(new_frequency)
return 1
code/modules/mob/transform_procs.dm
-2
View File
@@ -113,8 +113,6 @@
loc_landmark = sloc
O.loc = loc_landmark.loc
for (var/obj/item/device/radio/intercom/comm in O.loc)
comm.ai += O
O.on_mob_init()
code/modules/research/xenoarchaeology/tools/tools_locater.dm
+1 -1
View File
@@ -86,7 +86,7 @@
target_radio = null
else if(href_list["freq"])
var/new_frequency = (frequency + text2num(href_list["freq"]))
if (frequency < 1200 || frequency > 1600)
if (frequency < RADIO_LOW_FREQ || frequency > RADIO_HIGH_FREQ)
new_frequency = sanitize_frequency(new_frequency, 1499)
frequency = new_frequency
code/modules/scripting/Implementations/Telecomms.dm
+8 -8
View File
@@ -62,14 +62,14 @@
interpreter.SetVar("WEST" , WEST) // WEST (8)
// Channel macros
interpreter.SetVar("$common", 1459)
interpreter.SetVar("$science", 1351)
interpreter.SetVar("$command", 1353)
interpreter.SetVar("$medical", 1355)
interpreter.SetVar("$engineering", 1357)
interpreter.SetVar("$security", 1359)
interpreter.SetVar("$supply", 1347)
interpreter.SetVar("$service", 1349)
interpreter.SetVar("$common", PUB_FREQ)
interpreter.SetVar("$science", SCI_FREQ)
interpreter.SetVar("$command", COMM_FREQ)
interpreter.SetVar("$medical", MED_FREQ)
interpreter.SetVar("$engineering", ENG_FREQ)
interpreter.SetVar("$security", SEC_FREQ)
interpreter.SetVar("$supply", SUP_FREQ)
interpreter.SetVar("$service", SRV_FREQ)
// Signal data