cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 15:51:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some tweaks to bot and power apps

Browse Source
This commit is contained in:
Tastyfish
2016-02-12 20:19:45 -05:00
parent 45fd531594
commit 19108df390
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/machinery/computer/power.dm
View File

@@ -16,6 +16,9 @@
power_monitors += src power_monitors += src
power_monitors = sortAtom(power_monitors) power_monitors = sortAtom(power_monitors)
power_monitor = new(src) power_monitor = new(src)
/obj/machinery/computer/monitor/initialize()
..()
powermonitor_repository.update_cache() powermonitor_repository.update_cache()
powernet = find_powernet() powernet = find_powernet()

8
code/modules/pda/cart_apps.dm
View File

@@ -95,6 +95,8 @@
var/obj/machinery/computer/monitor/powmonitor = null var/obj/machinery/computer/monitor/powmonitor = null
/datum/data/pda/app/power/update_ui(mob/user as mob, list/data) /datum/data/pda/app/power/update_ui(mob/user as mob, list/data)
update = PDA_APP_UPDATE_SLOW
if (powmonitor && !isnull(powmonitor.powernet)) if (powmonitor && !isnull(powmonitor.powernet))
data["records"] = list( data["records"] = list(
"powerconnected" = 1, "powerconnected" = 1,
@@ -114,8 +116,10 @@
if("Power Select") if("Power Select")
var/pref = href_list["target"] var/pref = href_list["target"]
powmonitor = locate(pref) powmonitor = locate(pref)
update = PDA_APP_UPDATE
if("Back") if("Back")
powmonitor = null powmonitor = null
update = PDA_APP_UPDATE
/datum/data/pda/app/crew_records /datum/data/pda/app/crew_records
var/datum/data/record/general_records = null var/datum/data/record/general_records = null
@@ -205,14 +209,13 @@
icon = "rss" icon = "rss"
template = "pda_secbot" template = "pda_secbot"
category = "Security" category = "Security"
update = PDA_APP_UPDATE_SLOW
/datum/data/pda/app/secbot_control/update_ui(mob/user as mob, list/data) /datum/data/pda/app/secbot_control/update_ui(mob/user as mob, list/data)
var/botsData[0] var/botsData[0]
var/beepskyData[0] var/beepskyData[0]
if(pda.cartridge && istype(pda.cartridge.radio, /obj/item/radio/integrated/beepsky)) if(pda.cartridge && istype(pda.cartridge.radio, /obj/item/radio/integrated/beepsky))
var/obj/item/radio/integrated/beepsky/SC = pda.cartridge.radio var/obj/item/radio/integrated/beepsky/SC = pda.cartridge.radio
beepskyData["active"] = SC.active ? SC.active.name : null beepskyData["active"] = SC.active ? sanitize(SC.active.name) : null
has_back = SC.active ? 1 : 0 has_back = SC.active ? 1 : 0
if(SC.active && !isnull(SC.botstatus)) if(SC.active && !isnull(SC.botstatus))
var/area/loca = SC.botstatus["loca"] var/area/loca = SC.botstatus["loca"]
@@ -254,7 +257,6 @@
icon = "truck" icon = "truck"
template = "pda_mule" template = "pda_mule"
category = "Quartermaster" category = "Quartermaster"
update = PDA_APP_UPDATE_SLOW
/datum/data/pda/app/mule_control/update_ui(mob/user as mob, list/data) /datum/data/pda/app/mule_control/update_ui(mob/user as mob, list/data)
var/muleData[0] var/muleData[0]

2
code/modules/pda/radio.dm
View File

@@ -78,7 +78,6 @@
if("control") if("control")
active = locate(href_list["bot"]) active = locate(href_list["bot"])
botstatus = list(mode = -1)
spawn(0) spawn(0)
post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter)
@@ -177,7 +176,6 @@
switch(href_list["op"]) switch(href_list["op"])
if("control") if("control")
botstatus = list(mode = -1)
active = locate(href_list["bot"]) active = locate(href_list["bot"])
if("scanbots") // find all bots if("scanbots") // find all bots