cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixes oldcoder stuff with radio controllers (#26845)" (#26868)

Browse Source 
This reverts commit 6beff86079.
This commit is contained in:
DamianX
2020-06-17 08:16:55 +02:00
committed by GitHub
parent 6beff86079
commit cb1613403b
8 changed files with 61 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/ATMOSPHERICS/components/trinary_devices/filter.dm
View File

@@ -26,18 +26,18 @@ Filter types:
ex_node_offset = 5
/obj/machinery/atmospherics/trinary/filter/proc/set_frequency(new_frequency)
obj/machinery/atmospherics/trinary/filter/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
if(frequency)
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/atmospherics/trinary/filter/New()
if(ticker && ticker.mode == GAME_STATE_PLAYING)
obj/machinery/atmospherics/trinary/filter/New()
if(radio_controller)
initialize()
..()
/obj/machinery/atmospherics/trinary/filter/update_icon()
obj/machinery/atmospherics/trinary/filter/update_icon()
if(stat & NOPOWER)
icon_state = "hintact_off"
else if(node2 && node3 && node1)
@@ -47,14 +47,14 @@ Filter types:
on = 0
..()
/obj/machinery/atmospherics/trinary/filter/power_change()
obj/machinery/atmospherics/trinary/filter/power_change()
var/old_stat = stat
..()
if(old_stat != stat)
on = !on
update_icon()
/obj/machinery/atmospherics/trinary/filter/process()
obj/machinery/atmospherics/trinary/filter/process()
. = ..()
if(!on)
return
@@ -109,14 +109,12 @@ Filter types:
return 1
/obj/machinery/atmospherics/trinary/filter/initialize()
if (!radio_controller)
return
obj/machinery/atmospherics/trinary/filter/initialize()
set_frequency(frequency)
..()
/obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
obj/machinery/atmospherics/trinary/filter/attack_hand(user as mob) // -- TLE
if(..())
return
@@ -169,7 +167,7 @@ Filter types:
onclose(user, "atmo_filter")
return
/obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
obj/machinery/atmospherics/trinary/filter/Topic(href, href_list) // -- TLE
if(..())
return
usr.set_machine(src)

70
code/game/machinery/airlock_control.dm
View File

@@ -148,22 +148,20 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
/obj/machinery/door/airlock/initialize()
if (!radio_controller)
return
obj/machinery/door/airlock/initialize()
if(frequency)
set_frequency(frequency)
update_icon()
/obj/machinery/door/airlock/New()
obj/machinery/door/airlock/New()
..()
if(ticker && ticker.mode == GAME_STATE_PLAYING)
initialize()
if(radio_controller)
set_frequency(frequency)
/obj/machinery/airlock_sensor
obj/machinery/airlock_sensor
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_sensor_off"
name = "airlock sensor"
@@ -187,7 +185,7 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
machine_flags = MULTITOOL_MENU
/obj/machinery/airlock_sensor/update_icon()
obj/machinery/airlock_sensor/update_icon()
if(on)
if(alert)
icon_state = "airlock_sensor_alert"
@@ -196,7 +194,7 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
else
icon_state = "airlock_sensor_off"
/obj/machinery/airlock_sensor/attack_hand(mob/user)
obj/machinery/airlock_sensor/attack_hand(mob/user)
if(..())
return
var/datum/signal/signal = getFromPool(/datum/signal)
@@ -207,7 +205,7 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
flick("airlock_sensor_cycle", src)
/obj/machinery/airlock_sensor/process()
obj/machinery/airlock_sensor/process()
if(on)
var/datum/signal/signal = getFromPool(/datum/signal)
signal.transmission_method = 1 //radio signal
@@ -225,26 +223,24 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
update_icon()
/obj/machinery/airlock_sensor/proc/set_frequency(new_frequency)
obj/machinery/airlock_sensor/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_AIRLOCK)
/obj/machinery/airlock_sensor/initialize()
if (!radio_controller)
return
obj/machinery/airlock_sensor/initialize()
set_frequency(frequency)
/obj/machinery/airlock_sensor/New()
obj/machinery/airlock_sensor/New()
..()
if (ticker && ticker.mode == GAME_STATE_PLAYING)
initialize()
if(radio_controller)
set_frequency(frequency)
/obj/machinery/airlock_sensor/airlock_interior
obj/machinery/airlock_sensor/airlock_interior
command = "cycle_interior"
/obj/machinery/airlock_sensor/airlock_exterior
obj/machinery/airlock_sensor/airlock_exterior
command = "cycle_exterior"
/obj/machinery/airlock_sensor/New(turf/loc, var/ndir, var/building=0)
@@ -265,7 +261,7 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
//stat |= MAINT
//src.update_icon()
/obj/machinery/airlock_sensor/multitool_menu(var/mob/user,var/obj/item/device/multitool/P)
obj/machinery/airlock_sensor/multitool_menu(var/mob/user,var/obj/item/device/multitool/P)
return {"
<ul>
<li><b>Frequency:</b> <a href="?src=\ref[src];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=\ref[src];set_freq=[0]">Reset</a>)</li>
@@ -273,7 +269,7 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
[format_tag("Master ID Tag","master_tag")]
</ul>"}
/obj/machinery/airlock_sensor/Topic(href,href_list)
obj/machinery/airlock_sensor/Topic(href,href_list)
if(..())
return 0
@@ -296,7 +292,7 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
update_multitool_menu(usr)
/obj/machinery/airlock_sensor/attackby(var/obj/item/W, var/mob/user)
obj/machinery/airlock_sensor/attackby(var/obj/item/W, var/mob/user)
. = ..()
if(.)
return .
@@ -307,7 +303,7 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
new /obj/item/mounted/frame/airlock_sensor(get_turf(src))
qdel(src)
/obj/machinery/access_button
obj/machinery/access_button
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "access_button_standby"
name = "access button"
@@ -351,14 +347,14 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
//src.update_icon()
/obj/machinery/access_button/update_icon()
obj/machinery/access_button/update_icon()
if(on)
icon_state = "access_button_standby"
else
icon_state = "access_button_off"
/obj/machinery/access_button/attack_hand(mob/user)
obj/machinery/access_button/attack_hand(mob/user)
add_fingerprint(usr)
playsound(src,'sound/misc/click.ogg',30,0,-1)
if(!allowed(user))
@@ -375,7 +371,7 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
flick("access_button_cycle", src)
/obj/machinery/access_button/attackby(var/obj/item/W, var/mob/user)
obj/machinery/access_button/attackby(var/obj/item/W, var/mob/user)
. = ..()
if(.)
return .
@@ -386,35 +382,33 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
new /obj/item/mounted/frame/access_button(get_turf(src))
qdel(src)
/obj/machinery/access_button/proc/set_frequency(new_frequency)
obj/machinery/access_button/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, customfilter)
/obj/machinery/access_button/initialize()
if (!radio_controller)
return
obj/machinery/access_button/initialize()
set_frequency(frequency)
/obj/machinery/access_button/New()
obj/machinery/access_button/New()
..()
if(ticker && ticker.mode == GAME_STATE_PLAYING)
initialize()
if(radio_controller)
set_frequency(frequency)
/obj/machinery/access_button/airlock_interior
obj/machinery/access_button/airlock_interior
frequency = 1449
command = "cycle_interior"
/obj/machinery/access_button/airlock_exterior
obj/machinery/access_button/airlock_exterior
frequency = 1449
command = "cycle_exterior"
/obj/machinery/access_button/multitool_menu(var/mob/user,var/obj/item/device/multitool/P)
obj/machinery/access_button/multitool_menu(var/mob/user,var/obj/item/device/multitool/P)
return {"
<ul>
<li><b>Frequency:</b> <a href="?src=\ref[src];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=\ref[src];set_freq=[0]">Reset</a>)</li>
@@ -423,7 +417,7 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
<li><b>Filter:</b> <a href="?src=\ref[src];set_filter=-1">[customfilter]</a></li>
</ul>"}
/obj/machinery/access_button/Topic(href,href_list)
obj/machinery/access_button/Topic(href,href_list)
if(..())
return 1
@@ -456,4 +450,4 @@ obj/machinery/door/airlock/proc/set_frequency(new_frequency)
update_multitool_menu(usr)
#undef RADIO_FILTER_EXPLANATION
#undef RADIO_FILTER_EXPLANATION

6
code/game/machinery/atmo_control.dm
View File

@@ -104,15 +104,13 @@
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
/obj/machinery/air_sensor/initialize()
if (!radio_controller)
return
set_frequency(frequency)
/obj/machinery/air_sensor/New()
..()
if(ticker && ticker.mode == GAME_STATE_PLAYING)
initialize()
if(radio_controller)
set_frequency(frequency)
/obj/machinery/computer/general_air_control
icon = 'icons/obj/computer.dmi'

14
code/game/machinery/bots/mulebot.dm
View File

@@ -87,14 +87,14 @@ var/global/mulebot_count = 0
cell = new(src)
cell.charge = 2000
cell.maxcharge = 2000
if (ticker && ticker.current_state == GAME_STATE_PLAYING)
initialize()
/obj/machinery/bot/mulebot/initialize()
mulebot_count += 1
if(!suffix)
suffix = "#[mulebot_count]"
name = "\improper Mulebot ([suffix])"
spawn(5) // must wait for map loading to finish
mulebot_count += 1
if(!suffix)
suffix = "#[mulebot_count]"
name = "\improper Mulebot ([suffix])"
can_load = list(
/obj/structure/closet/crate,
/obj/structure/vendomatpack,

16
code/game/machinery/magnet.dm
View File

@@ -33,12 +33,10 @@
var/turf/T = loc
hide(T.intact)
center = T
if (ticker && ticker.current_state == GAME_STATE_PLAYING)
initialize()
/obj/machinery/magnetic_module/initialize()
if(radio_controller)
radio_controller.add_object(src, freq, RADIO_MAGNETS)
spawn(10) // must wait for map loading to finish
if(radio_controller)
radio_controller.add_object(src, freq, RADIO_MAGNETS)
spawn()
magnetic_process()
@@ -235,12 +233,10 @@
if(M.freq == frequency && M.code == code)
magnets.Add(M)
if (ticker && ticker.current_state == GAME_STATE_PLAYING)
initialize()
/obj/machinery/magnetic_controller/initialize()
if(radio_controller)
radio_connection = radio_controller.add_object(src, frequency, RADIO_MAGNETS)
spawn(45) // must wait for map loading to finish
if(radio_controller)
radio_connection = radio_controller.add_object(src, frequency, RADIO_MAGNETS)
if(path) // check for default path

11
code/game/machinery/status_display.dm
View File

@@ -58,14 +58,9 @@ var/global/list/status_displays = list() //This list contains both normal status
/obj/machinery/status_display/New()
..()
status_displays |= src
if (ticker && ticker.current_state == GAME_STATE_PLAYING)
initialize()
/obj/machinery/status_display/initialize()
..()
if(radio_controller)
radio_controller.add_object(src, frequency)
spawn(5) // must wait for map loading to finish
if(radio_controller)
radio_controller.add_object(src, frequency)
/obj/machinery/status_display/Destroy()
.=..()

4
code/game/objects/items/devices/PDA/radio.dm
View File

@@ -21,12 +21,10 @@
/obj/item/radio/integrated/signal/New()
..()
if(ticker && ticker.mode == GAME_STATE_PLAYING)
if(radio_controller)
initialize()
/obj/item/radio/integrated/signal/initialize()
if (!radio_controller)
return
if (src.frequency < 1441 || src.frequency > 1489)
src.frequency = sanitize_frequency(src.frequency)

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

@@ -51,7 +51,7 @@
secure_radio_connections = new
..(loc)
if(ticker && ticker.mode == GAME_STATE_PLAYING)
if(radio_controller)
initialize()
/obj/item/device/radio/Destroy()
@@ -61,8 +61,6 @@
/obj/item/device/radio/initialize()
if (!radio_controller)
return
frequency = COMMON_FREQ //common chat
if(freerange)
if(frequency < 1200 || frequency > 1600)