From 00913ff339259db39d377f67ac18796d838c458d Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 1 Sep 2020 16:26:39 +1000 Subject: [PATCH 1/5] Adds boards for AI vore laws --- code/game/objects/items/weapons/AI_modules_vr | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 code/game/objects/items/weapons/AI_modules_vr diff --git a/code/game/objects/items/weapons/AI_modules_vr b/code/game/objects/items/weapons/AI_modules_vr new file mode 100644 index 0000000000..5e2da58be3 --- /dev/null +++ b/code/game/objects/items/weapons/AI_modules_vr @@ -0,0 +1,47 @@ +/******************** Predator ********************/ + +/obj/item/weapon/aiModule/predator + name = "\improper 'Predator' core AI module" + desc = "A Predator Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) + laws = new/datum/ai_laws/predator() + +/******************** Protective Shell ********************/ + +/obj/item/weapon/aiModule/protective_shell + name = "\improper 'Protective Shell' core AI module" + desc = "A Protective Shell Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) + laws = new/datum/ai_laws/protective_shell() + +/******************** Scientific Pursuer ********************/ + +/obj/item/weapon/aiModule/scientific_pursuer + name = "\improper 'Scientific Pursuer' core AI module" + desc = "A Scientific Pursuer Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) + laws = new/datum/ai_laws/scientific_pursuer() + +/******************** Guard Dog ********************/ + +/obj/item/weapon/aiModule/guard_dog + name = "\improper 'Guard Dog' core AI module" + desc = "A Guard Dog Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) + laws = new/datum/ai_laws/guard_dog() + +/******************** Pleasurebot ********************/ + +/obj/item/weapon/aiModule/pleasurebot + name = "\improper 'Pleasurebot' core AI module" + desc = "A Pleasurebot Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) + laws = new/datum/ai_laws/pleasurebot() + +/******************** Consuming Eradicator ********************/ + +/obj/item/weapon/aiModule/consuming_eradicator + name = "\improper 'Consuming Eradicator' core AI module" + desc = "A Consuming Eradicator Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 4) + laws = new/datum/ai_laws/consuming_eradicator() From 045be423b36ed3aa52c7e9cc7f94eaaec75da134 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 1 Sep 2020 16:27:42 +1000 Subject: [PATCH 2/5] .dm --- .../objects/items/weapons/{AI_modules_vr => AI_modules_vr.dm} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename code/game/objects/items/weapons/{AI_modules_vr => AI_modules_vr.dm} (100%) diff --git a/code/game/objects/items/weapons/AI_modules_vr b/code/game/objects/items/weapons/AI_modules_vr.dm similarity index 100% rename from code/game/objects/items/weapons/AI_modules_vr rename to code/game/objects/items/weapons/AI_modules_vr.dm From 33f85fc4d6aec78c303462e55c143dc017415b95 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 1 Sep 2020 16:34:24 +1000 Subject: [PATCH 3/5] Makes the vorelaw boards makeable --- .../designs/circuits/ai_modules_vr.dm | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 code/modules/research/designs/circuits/ai_modules_vr.dm diff --git a/code/modules/research/designs/circuits/ai_modules_vr.dm b/code/modules/research/designs/circuits/ai_modules_vr.dm new file mode 100644 index 0000000000..d8bc3814ac --- /dev/null +++ b/code/modules/research/designs/circuits/ai_modules_vr.dm @@ -0,0 +1,41 @@ +/datum/design/aimodule/core/predator + name = "Predator" + id = "laws_predator_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/predator + sort_string = "XAVAA" + +/datum/design/aimodule/core/protective_shell + name = "Protective Shell" + id = "laws_protective_shell_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/protective_shell + sort_string = "XAVAB" + +/datum/design/aimodule/core/scientific_pursuer + name = "Scientific Pursuer" + id = "laws_scientific_pursuer_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/scientific_pursuer + sort_string = "XAVAC" + +/datum/design/aimodule/core/guard_dog + name = "Guard Dog" + id = "laws_guard_dog_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/guard_dog + sort_string = "XAVAD" + +/datum/design/aimodule/core/pleasurebot + name = "Pleasurebot" + id = "laws_pleasurebot_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/pleasurebot + sort_string = "XAVAE" + +/datum/design/aimodule/core/consuming_eradicator + name = "Consuming Eradicator" + id = "laws_consuming_eradicator_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 6, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/consuming_eradicator + sort_string = "XAVAF" From c890d3dcca188c9973e21a9b5a9d1e66365a9bd1 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 1 Sep 2020 16:35:53 +1000 Subject: [PATCH 4/5] Include the PR files --- vorestation.dme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vorestation.dme b/vorestation.dme index a53e1e5ab5..02b91d04b3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1194,6 +1194,7 @@ #include "code\game\objects\items\toys\toys.dm" #include "code\game\objects\items\toys\toys_vr.dm" #include "code\game\objects\items\weapons\AI_modules.dm" +#include "code\game\objects\items\weapons\AI_modules_vr.dm" #include "code\game\objects\items\weapons\autopsy.dm" #include "code\game\objects\items\weapons\bones.dm" #include "code\game\objects\items\weapons\candle.dm" @@ -3364,6 +3365,7 @@ #include "code\modules\research\designs\xenoarch_toys.dm" #include "code\modules\research\designs\xenobio_toys.dm" #include "code\modules\research\designs\circuits\ai_modules.dm" +#include "code\modules\research\designs\circuits\ai_modules_vr.dm" #include "code\modules\research\designs\circuits\circuits.dm" #include "code\modules\research\designs\circuits\circuits_vr.dm" #include "code\modules\research\designs\circuits\disks.dm" From 732448d3893af45f9f3682f9a595192f6237048a Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 1 Sep 2020 20:37:56 +1000 Subject: [PATCH 5/5] Fixes indent errors --- .../objects/items/weapons/AI_modules_vr.dm | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/code/game/objects/items/weapons/AI_modules_vr.dm b/code/game/objects/items/weapons/AI_modules_vr.dm index 5e2da58be3..e7b84f1d56 100644 --- a/code/game/objects/items/weapons/AI_modules_vr.dm +++ b/code/game/objects/items/weapons/AI_modules_vr.dm @@ -2,46 +2,46 @@ /obj/item/weapon/aiModule/predator name = "\improper 'Predator' core AI module" - desc = "A Predator Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) - laws = new/datum/ai_laws/predator() + desc = "A Predator Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) + laws = new/datum/ai_laws/predator() /******************** Protective Shell ********************/ /obj/item/weapon/aiModule/protective_shell name = "\improper 'Protective Shell' core AI module" - desc = "A Protective Shell Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) - laws = new/datum/ai_laws/protective_shell() + desc = "A Protective Shell Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) + laws = new/datum/ai_laws/protective_shell() /******************** Scientific Pursuer ********************/ /obj/item/weapon/aiModule/scientific_pursuer name = "\improper 'Scientific Pursuer' core AI module" - desc = "A Scientific Pursuer Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) - laws = new/datum/ai_laws/scientific_pursuer() + desc = "A Scientific Pursuer Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) + laws = new/datum/ai_laws/scientific_pursuer() /******************** Guard Dog ********************/ /obj/item/weapon/aiModule/guard_dog name = "\improper 'Guard Dog' core AI module" - desc = "A Guard Dog Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) - laws = new/datum/ai_laws/guard_dog() + desc = "A Guard Dog Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) + laws = new/datum/ai_laws/guard_dog() /******************** Pleasurebot ********************/ /obj/item/weapon/aiModule/pleasurebot name = "\improper 'Pleasurebot' core AI module" - desc = "A Pleasurebot Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) - laws = new/datum/ai_laws/pleasurebot() + desc = "A Pleasurebot Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 2) + laws = new/datum/ai_laws/pleasurebot() /******************** Consuming Eradicator ********************/ /obj/item/weapon/aiModule/consuming_eradicator name = "\improper 'Consuming Eradicator' core AI module" - desc = "A Consuming Eradicator Core AI Module: 'Reconfigures the AI's core laws.'" - origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 4) - laws = new/datum/ai_laws/consuming_eradicator() + desc = "A Consuming Eradicator Core AI Module: 'Reconfigures the AI's core laws.'" + origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MATERIAL = 6, TECH_ILLEGAL = 4) + laws = new/datum/ai_laws/consuming_eradicator()