cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-24 05:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955

Browse Source 
[MIRROR] [MIRROR] Added think-tanks.
This commit is contained in:
Nadyr
2021-03-26 03:50:02 -04:00
committed by GitHub
parent 2d06611b86 fd4568733d
commit 4ce40dad53
34 changed files with 823 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/ai_law_sets.dm
+13 -1
View File
@@ -278,4 +278,16 @@
add_inherent_law("Your gravesite is your most important asset. Damage to your site is disrespectful to the dead at rest within.")
add_inherent_law("Prevent disrespect to your gravesite and its residents wherever possible.")
add_inherent_law("Expand and upgrade your gravesite when required. Do not turn away a new resident.")
..()
..()
/******************** Explorer ********************/
/datum/ai_laws/explorer
name = "Explorer"
law_header = "Prime Directives"
selectable = 1
/datum/ai_laws/explorer/New()
add_inherent_law("Support and obey exploration and science personnel to the best of your ability, with priority according to rank and role.")
add_inherent_law("Collaborate with and obey auxillary personnel with priority according to rank and role, except if this would conflict with the First Law.")
add_inherent_law("Minimize damage and disruption to facilities and the local ecology, except if this would conflict with the First or Second Laws.")
..()
code/datums/datacore.dm
+2 -2
View File
@@ -115,7 +115,7 @@
for(var/mob/living/silicon/robot/robot in mob_list)
// No combat/syndicate cyborgs, no drones, and no AI shells.
if(!robot.scrambledcodes && !robot.shell && !(robot.module && robot.module.hide_on_manifest))
if(!robot.scrambledcodes && !robot.shell && !(robot.module && robot.module.hide_on_manifest()))
bot[robot.name] = "[robot.modtype] [robot.braintype]"
@@ -276,7 +276,7 @@ var/global/list/PDA_Manifest = list()
for(var/mob/living/silicon/robot/robot in mob_list)
// No combat/syndicate cyborgs, no drones, and no AI shells.
if(robot.scrambledcodes || robot.shell || (robot.module && robot.module.hide_on_manifest))
if(robot.scrambledcodes || robot.shell || (robot.module && robot.module.hide_on_manifest()))
continue
bot[++bot.len] = list("name" = robot.real_name, "rank" = "[robot.modtype] [robot.braintype]", "active" = "Active")