cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 18:12:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/modules/admin/topic.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/nano/modules/atmos_control.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
This commit is contained in:
PsiOmega
2015-07-17 23:19:34 +02:00
parent ae47726450 a9f2d83664
commit 34b0517578
12 changed files with 175 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/nano/modules/atmos_control.dm
View File

@@ -69,4 +69,4 @@
return extra_href
/datum/topic_state/air_alarm/proc/has_access(var/mob/user)
return user && (user.isAI() || atmos_control.access.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO))
return user && (user.isMobAI() || atmos_control.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO))

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

@@ -15,7 +15,7 @@
ui.close()
return 0
if(href_list["track"])
if(usr.isAI())
if(usr.isMobAI())
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))
@@ -66,7 +66,7 @@
crewmembers = sortByKey(crewmembers, "name")
data["isAI"] = user.isAI()
data["isAI"] = user.isMobAI()
data["crewmembers"] = crewmembers
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)

4
code/modules/nano/modules/law_manager.dm
View File

@@ -136,7 +136,7 @@
if(href_list["notify_laws"])
owner << "<span class='danger'>Law Notice</span>"
owner.laws.show_laws(owner)
if(owner.isAI())
if(owner.isMobAI())
var/mob/living/silicon/ai/AI = owner
for(var/mob/living/silicon/robot/R in AI.connected_robots)
R << "<span class='danger'>Law Notice</span>"
@@ -163,7 +163,7 @@
package_laws(data, "inherent_laws", owner.laws.inherent_laws)
package_laws(data, "supplied_laws", owner.laws.supplied_laws)
data["isAI"] = owner.isAI()
data["isAI"] = owner.isMobAI()
data["isMalf"] = is_malf(user)
data["isSlaved"] = owner.is_slaved()
data["isAdmin"] = is_admin(user)