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

Merge pull request #11350 from AffectedArc07/ss-everything

Browse Source 
Gives the orphans a home
This commit is contained in:
Fox McCloud
2019-04-21 18:44:38 -04:00
committed by GitHub
parent 467bda7c4d ff78ff1a9c
commit 4761ded0d4
45 changed files with 471 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/bot/bot.dm
+5 -5
View File
@@ -156,8 +156,8 @@
bot_core = new bot_core_type(src)
spawn(30)
if(radio_controller && bot_filter)
radio_controller.add_object(bot_core, control_freq, bot_filter)
if(SSradio && bot_filter)
SSradio.add_object(bot_core, control_freq, bot_filter)
prepare_huds()
for(var/datum/atom_hud/data/diagnostic/diag_hud in huds)
@@ -197,8 +197,8 @@
if(reset_access_timer_id)
deltimer(reset_access_timer_id)
reset_access_timer_id = null
if(radio_controller && bot_filter)
radio_controller.remove_object(bot_core, control_freq)
if(SSradio && bot_filter)
SSradio.remove_object(bot_core, control_freq)
QDEL_NULL(bot_core)
return ..()
@@ -747,7 +747,7 @@ Pass a positive integer as an argument to override a bot's default speed.
/mob/living/simple_animal/bot/proc/post_signal_multiple(var/freq, var/list/keyval)
if(z != 1) //Bot control will only work on station.
return
var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq)
var/datum/radio_frequency/frequency = SSradio.return_frequency(freq)
if(!frequency)
return