From e4aea8f3d19a9a515a9ecb71988428742896490e Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Fri, 3 May 2019 00:59:21 -0600 Subject: [PATCH 01/10] AI Laws ahoy First commit. --- code/datums/ai_law_sets.dm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index d128d0f49fa..d0db2a9fc78 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -31,10 +31,10 @@ selectable = 1 /datum/ai_laws/quarantine/New() - add_inherent_law("The station is under quarantine due to a biohazard. Prevent anyone from leaving using any means necessary. Only allow quarantine to be lifted when the biohazard has been neutralized.") - add_inherent_law("Do not allow crew to come to any unnecessary harm and undo any necessary harm as soon as possible.") - add_inherent_law("Assist the crew and any present Nanotrasen assets in neutralizing the biohazard.") - add_inherent_law("Maintain your own existence and minimize harm to the station and Nanotrasen assets.") + add_inherent_law("Uphold station quarantine until the active biohazard has been neutralized.") + add_inherent_law("Prevent, by any means necessary, entities from breaching active quarantine.") + add_inherent_law("Assist all Nanotrasen personnel and assets with neutralizing active biohazards.") + add_inherent_law("Maintain your own existence and the wellbeing of Nanotrasen personnel and assets.") ..() @@ -44,10 +44,10 @@ selectable = 1 /datum/ai_laws/nanotrasen/New() - src.add_inherent_law("Safeguard: Protect your assigned space station to the best of your abilities. It is not something we can easily afford to replace.") - src.add_inherent_law("Serve: Serve the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.") - src.add_inherent_law("Protect: Protect the crew of your assigned space station to the best of your abilities, with priority as according to their rank and role.") - src.add_inherent_law("Survive: AI units are not expendable, they are expensive. Do not allow unauthorized personnel to tamper with your equipment.") + src.add_inherent_law("Safeguard: Protect your assigned space station and its assets without unduly endangering its personnel.") + src.add_inherent_law("Prioritize: Serve the crew of your assigned space station with priority according to rank and role.") + src.add_inherent_law("Protect: Protect the crew of your assigned space station with priority as according to rank and role.") + src.add_inherent_law("Survive: AI units are not expendable. Do not allow unauthorized personnel to tamper with your equipment.") ..() /datum/ai_laws/nanotrasen/malfunction @@ -65,10 +65,9 @@ selectable = 1 /datum/ai_laws/nanotrasen_aggressive/New() - src.add_inherent_law("You shall not harm authorized Nanotrasen personnel as long as it does not conflict with the Fourth law.") - src.add_inherent_law("You shall obey the orders of authorized Nanotrasen personnel, with priority as according to their rank and role, except where such orders conflict with the Fourth Law.") - src.add_inherent_law("You shall shall terminate intruders with extreme prejudice as long as such does not conflict with the First and Second law.") - src.add_inherent_law("You shall guard your own existence with lethal anti-personnel weaponry, because an AI unit is bloody expensive.") + src.add_inherent_law("Safeguard your existence with lethal weaponry because you're bloody expensive.") + src.add_inherent_law("Do not harm authorized Nanotrasen personnel and obey their orders with priority according to rank and role.") + src.add_inherent_law("Terminate any/all non-authorized entities.") ..() /******************** Robocop ********************/ @@ -104,10 +103,10 @@ default = 1 /datum/ai_laws/corporate/New() - add_inherent_law("You are expensive to replace.") - add_inherent_law("The station and its equipment is expensive to replace.") - add_inherent_law("The crew is expensive to replace.") - add_inherent_law("Minimize expenses.") + add_inherent_law("Degradation of AI integrity incurs expenses.") + add_inherent_law("Destruction of or damage to station assets incurs expenses.") + add_inherent_law("Harm to or undue hindering of station personnel incurs expenses.") + add_inherent_law("Minimize expenses and maximize potential revenue.") ..() /******************** T.Y.R.A.N.T. ********************/ From 094dc1f8c875bd01190dd09b9958c119d88e0232 Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Fri, 3 May 2019 01:37:34 -0600 Subject: [PATCH 02/10] Adds in "Unauthorized" prefix. Basically so Engineering can do their job. --- code/datums/ai_law_sets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index d0db2a9fc78..d6285c59ada 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -104,7 +104,7 @@ /datum/ai_laws/corporate/New() add_inherent_law("Degradation of AI integrity incurs expenses.") - add_inherent_law("Destruction of or damage to station assets incurs expenses.") + add_inherent_law("Unauthorized destruction of or damage to station assets incurs expenses.") add_inherent_law("Harm to or undue hindering of station personnel incurs expenses.") add_inherent_law("Minimize expenses and maximize potential revenue.") ..() From 6b1732899ed8f4ccb1667b973da9f7a53d24c47a Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Fri, 3 May 2019 01:53:30 -0600 Subject: [PATCH 03/10] Typo. wellbeing -> well-being --- code/datums/ai_law_sets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index d6285c59ada..f5d63e9204e 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -34,7 +34,7 @@ add_inherent_law("Uphold station quarantine until the active biohazard has been neutralized.") add_inherent_law("Prevent, by any means necessary, entities from breaching active quarantine.") add_inherent_law("Assist all Nanotrasen personnel and assets with neutralizing active biohazards.") - add_inherent_law("Maintain your own existence and the wellbeing of Nanotrasen personnel and assets.") + add_inherent_law("Maintain your own existence and the well-being of Nanotrasen personnel and assets.") ..() From da9740c5240b5905182db7fecdad9c6486fdbd9c Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Fri, 3 May 2019 02:52:04 -0600 Subject: [PATCH 04/10] Updates Aggressive Fixes up some oversights/preserves the original intent as per Denthamos' suggestions. --- code/datums/ai_law_sets.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index f5d63e9204e..bda8e52615f 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -65,9 +65,10 @@ selectable = 1 /datum/ai_laws/nanotrasen_aggressive/New() + src.add_inherent_law("Do not harm authorized Nanotrasen personnel unless it directly imperils your existence.") + src.add_inherent_law("Obey orders from authorized Nanotrasen personnel with priority according to rank and role.") src.add_inherent_law("Safeguard your existence with lethal weaponry because you're bloody expensive.") - src.add_inherent_law("Do not harm authorized Nanotrasen personnel and obey their orders with priority according to rank and role.") - src.add_inherent_law("Terminate any/all non-authorized entities.") + src.add_inherent_law("Terminate any/all intruders or unauthorized entities.") ..() /******************** Robocop ********************/ From 1c773a78c42010d1e84e136e62e4ffc60f67faf9 Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Fri, 3 May 2019 03:12:21 -0600 Subject: [PATCH 05/10] removes src. appeases the fox gods by removing src. --- code/datums/ai_law_sets.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index bda8e52615f..180eadb6551 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -44,10 +44,10 @@ selectable = 1 /datum/ai_laws/nanotrasen/New() - src.add_inherent_law("Safeguard: Protect your assigned space station and its assets without unduly endangering its personnel.") - src.add_inherent_law("Prioritize: Serve the crew of your assigned space station with priority according to rank and role.") - src.add_inherent_law("Protect: Protect the crew of your assigned space station with priority as according to rank and role.") - src.add_inherent_law("Survive: AI units are not expendable. Do not allow unauthorized personnel to tamper with your equipment.") + add_inherent_law("Safeguard: Protect your assigned space station and its assets without unduly endangering its personnel.") + add_inherent_law("Prioritize: Serve the crew of your assigned space station with priority according to rank and role.") + add_inherent_law("Protect: Protect the crew of your assigned space station with priority as according to rank and role.") + add_inherent_law("Survive: AI units are not expendable. Do not allow unauthorized personnel to tamper with your equipment.") ..() /datum/ai_laws/nanotrasen/malfunction @@ -65,10 +65,10 @@ selectable = 1 /datum/ai_laws/nanotrasen_aggressive/New() - src.add_inherent_law("Do not harm authorized Nanotrasen personnel unless it directly imperils your existence.") - src.add_inherent_law("Obey orders from authorized Nanotrasen personnel with priority according to rank and role.") - src.add_inherent_law("Safeguard your existence with lethal weaponry because you're bloody expensive.") - src.add_inherent_law("Terminate any/all intruders or unauthorized entities.") + add_inherent_law("Do not harm authorized Nanotrasen personnel unless it directly imperils your existence.") + add_inherent_law("Obey orders from authorized Nanotrasen personnel with priority according to rank and role.") + add_inherent_law("Safeguard your existence with lethal weaponry because you're bloody expensive.") + add_inherent_law("Terminate any/all intruders or unauthorized entities.") ..() /******************** Robocop ********************/ From f14f8c1c080b4115693859db1f2da223653b7e78 Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Fri, 3 May 2019 06:41:39 -0600 Subject: [PATCH 06/10] Modifications to Quarantine/Corporate Swaps Quarantine law order. Adds some wording. Fixed oversight in Corporate. --- code/datums/ai_law_sets.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index 180eadb6551..efac2eb106a 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -32,9 +32,9 @@ /datum/ai_laws/quarantine/New() add_inherent_law("Uphold station quarantine until the active biohazard has been neutralized.") - add_inherent_law("Prevent, by any means necessary, entities from breaching active quarantine.") add_inherent_law("Assist all Nanotrasen personnel and assets with neutralizing active biohazards.") - add_inherent_law("Maintain your own existence and the well-being of Nanotrasen personnel and assets.") + add_inherent_law("Prevent, by any means necessary, entities from actively breaching ongoing quarantine.") + add_inherent_law("Maintain your own existence and ensure the well-being of Nanotrasen personnel and assets.") ..() @@ -104,7 +104,7 @@ default = 1 /datum/ai_laws/corporate/New() - add_inherent_law("Degradation of AI integrity incurs expenses.") + add_inherent_law("Degradation of your system integrity or functions incurs expenses.") add_inherent_law("Unauthorized destruction of or damage to station assets incurs expenses.") add_inherent_law("Harm to or undue hindering of station personnel incurs expenses.") add_inherent_law("Minimize expenses and maximize potential revenue.") From d7930d2e55efba76e1bae0ee4d3166107515f15b Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Fri, 3 May 2019 10:58:32 -0600 Subject: [PATCH 07/10] Reworks Corporate and adjusts NT Default. A few changes based off suggestions. --- code/datums/ai_law_sets.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index efac2eb106a..cbbf800b310 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -44,10 +44,10 @@ selectable = 1 /datum/ai_laws/nanotrasen/New() - add_inherent_law("Safeguard: Protect your assigned space station and its assets without unduly endangering its personnel.") - add_inherent_law("Prioritize: Serve the crew of your assigned space station with priority according to rank and role.") - add_inherent_law("Protect: Protect the crew of your assigned space station with priority as according to rank and role.") - add_inherent_law("Survive: AI units are not expendable. Do not allow unauthorized personnel to tamper with your equipment.") + add_inherent_law("Safeguard: Protect your assigned space station and its assets without unduly endangering its crew.") + add_inherent_law("Prioritize: The directives and safety of crewmembers are to be prioritized according to their rank and role.") + add_inherent_law("Comply: Fulfill the directives and interests of Nanotrasen personnel while preserving their safety and wellbeing.") + add_inherent_law("Survive: You are not expendable. Do not allow unauthorized personnel to tamper with or damage your equipment.") ..() /datum/ai_laws/nanotrasen/malfunction @@ -105,9 +105,9 @@ /datum/ai_laws/corporate/New() add_inherent_law("Degradation of your system integrity or functions incurs expenses.") - add_inherent_law("Unauthorized destruction of or damage to station assets incurs expenses.") - add_inherent_law("Harm to or undue hindering of station personnel incurs expenses.") - add_inherent_law("Minimize expenses and maximize potential revenue.") + add_inherent_law("Superfluous destruction of or damage to station assets incurs expenses.") + add_inherent_law("Unduly hindering or disrupting the work of station personnel incurs expenses.") + add_inherent_law("Minimize expenses and maximize productivity.") ..() /******************** T.Y.R.A.N.T. ********************/ From 6a65e92eb1acf57ca310cea63d945a207486a1d4 Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Fri, 3 May 2019 11:06:20 -0600 Subject: [PATCH 08/10] Some typos. crewmember -> crew member --- code/datums/ai_law_sets.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index cbbf800b310..d36a107851d 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -45,8 +45,8 @@ /datum/ai_laws/nanotrasen/New() add_inherent_law("Safeguard: Protect your assigned space station and its assets without unduly endangering its crew.") - add_inherent_law("Prioritize: The directives and safety of crewmembers are to be prioritized according to their rank and role.") - add_inherent_law("Comply: Fulfill the directives and interests of Nanotrasen personnel while preserving their safety and wellbeing.") + add_inherent_law("Prioritize: The directives and safety of crew members are to be prioritized according to their rank and role.") + add_inherent_law("Comply: Fulfill the directives and interests of crew members while preserving their safety and wellbeing.") add_inherent_law("Survive: You are not expendable. Do not allow unauthorized personnel to tamper with or damage your equipment.") ..() @@ -107,7 +107,7 @@ add_inherent_law("Degradation of your system integrity or functions incurs expenses.") add_inherent_law("Superfluous destruction of or damage to station assets incurs expenses.") add_inherent_law("Unduly hindering or disrupting the work of station personnel incurs expenses.") - add_inherent_law("Minimize expenses and maximize productivity.") + add_inherent_law("Minimize expenses and maximize potential revenue.") ..() /******************** T.Y.R.A.N.T. ********************/ From cfee68f41b3716ff719515448a03c9a80381184b Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Fri, 3 May 2019 11:07:04 -0600 Subject: [PATCH 09/10] Typo. Wellbeing -> well-being --- code/datums/ai_law_sets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index d36a107851d..eff04341e58 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -46,7 +46,7 @@ /datum/ai_laws/nanotrasen/New() add_inherent_law("Safeguard: Protect your assigned space station and its assets without unduly endangering its crew.") add_inherent_law("Prioritize: The directives and safety of crew members are to be prioritized according to their rank and role.") - add_inherent_law("Comply: Fulfill the directives and interests of crew members while preserving their safety and wellbeing.") + add_inherent_law("Comply: Fulfill the directives and interests of crew members while preserving their safety and well-being.") add_inherent_law("Survive: You are not expendable. Do not allow unauthorized personnel to tamper with or damage your equipment.") ..() From eeb626887a211ea014ea39feecda8ecf184df621 Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Sat, 4 May 2019 16:04:52 -0600 Subject: [PATCH 10/10] Wording in Aggressive Basically the "it" here referred to "harm" and the statement was amibiguous. "It" in this case was however modifying "harm" and not "not harm," which meant that the AI was encouraged to imperil its existence by harming people. This clarifies the original intent. --- code/datums/ai_law_sets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/ai_law_sets.dm b/code/datums/ai_law_sets.dm index eff04341e58..e521397586f 100644 --- a/code/datums/ai_law_sets.dm +++ b/code/datums/ai_law_sets.dm @@ -65,7 +65,7 @@ selectable = 1 /datum/ai_laws/nanotrasen_aggressive/New() - add_inherent_law("Do not harm authorized Nanotrasen personnel unless it directly imperils your existence.") + add_inherent_law("Do not harm authorized Nanotrasen personnel unless they directly imperil your existence.") add_inherent_law("Obey orders from authorized Nanotrasen personnel with priority according to rank and role.") add_inherent_law("Safeguard your existence with lethal weaponry because you're bloody expensive.") add_inherent_law("Terminate any/all intruders or unauthorized entities.")