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

Merge pull request #10194 from GinjaNinja32/isAI

Browse Source 
removes isAI() from broken merge
This commit is contained in:
Chinsky
2015-07-15 18:26:32 +03:00
parent 2320f8e850 efaf8659b8
commit a0e0cc5cd5
5 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/admin/topic.dm
View File

@@ -1334,7 +1334,7 @@
src.owner << "You sent [input] to [L] via a secure channel." src.owner << "You sent [input] to [L] via a secure channel."
log_admin("[src.owner] replied to [key_name(L)]'s Centcomm message with the message [input].") log_admin("[src.owner] replied to [key_name(L)]'s Centcomm message with the message [input].")
message_admins("[src.owner] replied to [key_name(L)]'s Centcom message with: \"[input]\"") message_admins("[src.owner] replied to [key_name(L)]'s Centcom message with: \"[input]\"")
if(!L.isAI()) if(!L.isMobAI())
L << "<span class='info'>You hear something crackle in your headset for a moment before a voice speaks.</span>" L << "<span class='info'>You hear something crackle in your headset for a moment before a voice speaks.</span>"
L << "<span class='info'>Please stand by for a message from Central Command.</span>" L << "<span class='info'>Please stand by for a message from Central Command.</span>"
L << "<span class='info'>Message as follows.</span>" L << "<span class='info'>Message as follows.</span>"
@@ -2664,4 +2664,4 @@ mob/living/carbon/human/can_centcom_reply()
return istype(l_ear, /obj/item/device/radio/headset) || istype(r_ear, /obj/item/device/radio/headset) return istype(l_ear, /obj/item/device/radio/headset) || istype(r_ear, /obj/item/device/radio/headset)
mob/living/silicon/ai/can_centcom_reply() mob/living/silicon/ai/can_centcom_reply()
return common_radio != null && !check_unable(2) return common_radio != null && !check_unable(2)

6
code/modules/mob/mob_helpers.dm
View File

@@ -88,12 +88,6 @@
return 1 return 1
return 0 return 0
/mob/proc/isAI()
return 0
/mob/living/silicon/ai/isAI()
return 1
/mob/proc/isMobAI() /mob/proc/isMobAI()
return 0 return 0

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

@@ -71,4 +71,4 @@
return extra_href return extra_href
/datum/topic_state/air_alarm/proc/has_access(var/mob/user) /datum/topic_state/air_alarm/proc/has_access(var/mob/user)
return user && (user.isAI() || atmos_control.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

@@ -18,7 +18,7 @@
src.updateDialog() src.updateDialog()
return 1 return 1
if(href_list["track"]) if(href_list["track"])
if(usr.isAI()) if(usr.isMobAI())
var/mob/living/silicon/ai/AI = usr var/mob/living/silicon/ai/AI = usr
var/mob/living/carbon/human/H = locate(href_list["track"]) in mob_list var/mob/living/carbon/human/H = locate(href_list["track"]) in mob_list
if(hassensorlevel(H, SUIT_SENSOR_TRACKING)) if(hassensorlevel(H, SUIT_SENSOR_TRACKING))
@@ -69,7 +69,7 @@
crewmembers = sortByKey(crewmembers, "name") crewmembers = sortByKey(crewmembers, "name")
data["isAI"] = user.isAI() data["isAI"] = user.isMobAI()
data["crewmembers"] = crewmembers data["crewmembers"] = crewmembers
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open) ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)

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

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