cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts causing lack of compilation hopefully.

Browse Source
This commit is contained in:
Neerti
2015-12-07 03:38:38 -05:00
parent a1203ed942
commit f219980a3d
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/machinery/computer/crew.dm
View File

@@ -28,11 +28,8 @@
return
ui_interact(user)
/obj/machinery/computer/crew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
crew_monitor.ui_interact(user, ui_key, ui, force_open, state)
/obj/machinery/computer/crew/nano_container()
return crew_monitor
/obj/machinery/computer/crew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
crew_monitor.ui_interact(user, ui_key, ui, force_open)
/obj/machinery/computer/crew/interact(mob/user)
crew_monitor.ui_interact(user)

32
code/modules/nano/modules/crew_monitor.dm
View File

@@ -1,34 +1,25 @@
/obj/nano_module/crew_monitor
/datum/nano_module/crew_monitor
name = "Crew monitor"
/obj/nano_module/crew_monitor/Topic(href, href_list)
/datum/nano_module/crew_monitor/Topic(href, href_list)
if(..()) return 1
var/turf/T = get_turf(src)
var/turf/T = get_turf(nano_host()) // TODO: Allow setting any config.contact_levels from the interface.
if (!T || !(T.z in config.player_levels))
usr << "<span class='warning'>Unable to establish a connection<span>: You're too far away from the station!"
usr << "<span class='warning'>Unable to establish a connection</span>: You're too far away from the station!"
return 0
if(href_list["close"] )
var/mob/user = usr
var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")
usr.unset_machine()
ui.close()
return 0
if(href_list["update"])
src.updateDialog()
return 1
if(href_list["track"])
if(usr.isMobAI())
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
var/mob/living/carbon/human/H = locate(href_list["track"]) in mob_list
if(hassensorlevel(H, SUIT_SENSOR_TRACKING))
AI.ai_actual_track(H)
return 1
/obj/nano_module/crew_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
/datum/nano_module/crew_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
var/data[0]
var/turf/T = get_turf(src)
var/turf/T = get_turf(nano_host())
data["isAI"] = user.isMobAI()
data["isAI"] = isAI(user)
data["crewmembers"] = crew_repository.health_data(T)
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
@@ -46,4 +37,11 @@
// should make the UI auto-update; doesn't seem to?
ui.set_auto_update(1)
/*/datum/nano_module/crew_monitor/proc/scan()
for(var/mob/living/carbon/human/H in mob_list)
if(istype(H.w_uniform, /obj/item/clothing/under))
var/obj/item/clothing/under/C = H.w_uniform
if (C.has_sensor)
tracked |= C
return 1
*/