From 27bdd4b73215d568c026ae91721c8952de342a06 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Sun, 17 Dec 2023 23:20:43 -0300 Subject: [PATCH] aiModule > ai_module --- code/controllers/subsystem/traumas.dm | 4 +- code/game/gamemodes/objective_sabotage.dm | 2 +- code/game/machinery/computer/law.dm | 4 +- .../game/objects/effects/spawners/lootdrop.dm | 36 ++--- code/game/objects/items/AI_modules.dm | 144 +++++++++--------- .../game/objects/items/storage/uplink_kits.dm | 4 +- code/game/objects/structures/ai_core.dm | 4 +- code/modules/admin/verbs/borgpanel.dm | 4 +- .../antagonists/overthrow/overthrow.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 4 +- .../research/designs/AI_module_designs.dm | 30 ++-- .../uplink/uplink_items/uplink_devices.dm | 4 +- 12 files changed, 121 insertions(+), 121 deletions(-) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index 7f1ece6937..6a7b0d9c2c 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -100,7 +100,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/clothing/suit/space/hardsuit/ert/engi, /obj/item/clothing/suit/space/hardsuit/ert/med, /obj/item/clothing/suit/space/hardsuit/deathsquad, /obj/item/clothing/head/helmet/space/hardsuit/deathsquad, /obj/machinery/door/airlock/centcom)), - "robots" = typecacheof(list(/obj/machinery/computer/upload, /obj/item/aiModule/, /obj/machinery/recharge_station, + "robots" = typecacheof(list(/obj/machinery/computer/upload, /obj/item/ai_module/, /obj/machinery/recharge_station, /obj/item/aicard, /obj/item/deactivated_swarmer, /obj/effect/mob_spawn/swarmer)), "doctors" = typecacheof(list(/obj/item/clothing/under/rank/medical/doctor, /obj/item/clothing/under/rank/medical/chemist, @@ -170,7 +170,7 @@ SUBSYSTEM_DEF(traumas) /obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/m90, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/storage/belt/grenade/full, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate, /obj/item/gun/energy/kinetic_accelerator/crossbow, /obj/item/melee/transforming/energy/sword/saber, /obj/item/dualsaber, /obj/item/melee/powerfist, /obj/item/storage/box/syndie_kit, /obj/item/grenade/spawnergrenade/manhacks, /obj/item/grenade/chem_grenade/bioterrorfoam, /obj/item/reagent_containers/spray/chemsprayer/bioterror, /obj/item/ammo_box/magazine/m10mm, /obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm712x82, /obj/item/antag_spawner/nuke_ops, /obj/vehicle/sealed/mecha/combat/gygax/dark, /obj/vehicle/sealed/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate, - /obj/item/cartridge/virus/frame, /obj/item/chameleon, /obj/item/storage/box/syndie_kit/cutouts, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/card/emag, /obj/item/storage/toolbox/syndicate, /obj/item/storage/book/bible/syndicate, /obj/item/encryptionkey/binary, /obj/item/encryptionkey/syndicate, /obj/item/aiModule/syndicate, + /obj/item/cartridge/virus/frame, /obj/item/chameleon, /obj/item/storage/box/syndie_kit/cutouts, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/card/emag, /obj/item/storage/toolbox/syndicate, /obj/item/storage/book/bible/syndicate, /obj/item/encryptionkey/binary, /obj/item/encryptionkey/syndicate, /obj/item/ai_module/syndicate, /obj/item/clothing/shoes/magboots/syndie, /obj/item/powersink, /obj/item/sbeacondrop, /obj/item/sbeacondrop/bomb, /obj/item/syndicatedetonator, /obj/item/shield/energy, /obj/item/assault_pod, /obj/item/slimepotion/slime/sentience/nuclear, /obj/item/stack/telecrystal, /obj/item/jammer, /obj/item/codespeak_manual/unlimited, /obj/item/toy/cards/deck/syndicate, /obj/item/storage/secure/briefcase/syndie, /obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/item/toy/syndicateballoon, /obj/item/clothing/gloves/fingerless/pugilist/rapid, /obj/item/paper/fluff/ruins/thederelict/syndie_mission, /obj/item/organ/cyberimp/eyes/hud/security/syndicate, /obj/item/clothing/head/HoS/syndicate, /obj/machinery/computer/pod/old/syndicate, /obj/machinery/vending/medical/syndicate_access, /obj/item/mmi/syndie, /obj/item/target/syndicate, /obj/machinery/vending/cigarette/syndicate, /obj/item/robot_module/syndicate, /obj/item/clothing/mask/gas/syndicate, /obj/machinery/power/singularity_beacon/syndicate, /obj/item/clothing/head/syndicatefake, diff --git a/code/game/gamemodes/objective_sabotage.dm b/code/game/gamemodes/objective_sabotage.dm index 96772fd263..75a4ba3a10 100644 --- a/code/game/gamemodes/objective_sabotage.dm +++ b/code/game/gamemodes/objective_sabotage.dm @@ -36,7 +36,7 @@ /datum/sabotage_objective/ai_law name = "Upload a hacked law to the AI." sabotage_type = "ailaw" - special_equipment = list(/obj/item/aiModule/syndicate) + special_equipment = list(/obj/item/ai_module/syndicate) excludefromjob = list("Chief Engineer","Research Director","Head of Personnel","Captain","Chief Medical Officer","Head Of Security") /datum/sabotage_objective/ai_law/can_run() diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index fc7bec7134..6fee35766a 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -5,8 +5,8 @@ icon_screen = "command" /obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/aiModule)) - var/obj/item/aiModule/M = O + if(istype(O, /obj/item/ai_module)) + var/obj/item/ai_module/M = O if(src.stat & (NOPOWER|BROKEN|MAINT)) return if(!current) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 0f7e00a538..ba98c441f4 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -281,34 +281,34 @@ /obj/effect/spawner/lootdrop/aimodule_harmless // These shouldn't allow the AI to start butchering people name = "harmless AI module spawner" loot = list( - /obj/item/aiModule/core/full/asimov, - /obj/item/aiModule/core/full/asimovpp, - /obj/item/aiModule/core/full/hippocratic, - /obj/item/aiModule/core/full/paladin_devotion, - /obj/item/aiModule/core/full/paladin + /obj/item/ai_module/core/full/asimov, + /obj/item/ai_module/core/full/asimovpp, + /obj/item/ai_module/core/full/hippocratic, + /obj/item/ai_module/core/full/paladin_devotion, + /obj/item/ai_module/core/full/paladin ) /obj/effect/spawner/lootdrop/aimodule_neutral // These shouldn't allow the AI to start butchering people without reason name = "neutral AI module spawner" loot = list( - /obj/item/aiModule/core/full/corp, - /obj/item/aiModule/core/full/maintain, - /obj/item/aiModule/core/full/drone, - /obj/item/aiModule/core/full/peacekeeper, - /obj/item/aiModule/core/full/reporter, - /obj/item/aiModule/core/full/robocop, - /obj/item/aiModule/core/full/liveandletlive, - /obj/item/aiModule/core/full/hulkamania + /obj/item/ai_module/core/full/corp, + /obj/item/ai_module/core/full/maintain, + /obj/item/ai_module/core/full/drone, + /obj/item/ai_module/core/full/peacekeeper, + /obj/item/ai_module/core/full/reporter, + /obj/item/ai_module/core/full/robocop, + /obj/item/ai_module/core/full/liveandletlive, + /obj/item/ai_module/core/full/hulkamania ) /obj/effect/spawner/lootdrop/aimodule_harmful // These will get the shuttle called name = "harmful AI module spawner" loot = list( - /obj/item/aiModule/core/full/antimov, - /obj/item/aiModule/core/full/balance, - /obj/item/aiModule/core/full/tyrant, - /obj/item/aiModule/core/full/thermurderdynamic, - /obj/item/aiModule/core/full/damaged + /obj/item/ai_module/core/full/antimov, + /obj/item/ai_module/core/full/balance, + /obj/item/ai_module/core/full/tyrant, + /obj/item/ai_module/core/full/thermurderdynamic, + /obj/item/ai_module/core/full/damaged ) /obj/effect/spawner/lootdrop/mre diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index 306b711994..bd674d0615 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -6,7 +6,7 @@ AI MODULES // AI module -/obj/item/aiModule +/obj/item/ai_module name = "\improper AI module" icon = 'icons/obj/module.dmi' icon_state = "std_mod" @@ -24,23 +24,23 @@ AI MODULES var/bypass_law_amt_check = 0 custom_materials = list(/datum/material/gold=50) -/obj/item/aiModule/examine(var/mob/user as mob) +/obj/item/ai_module/examine(var/mob/user as mob) . = ..() if(Adjacent(user)) show_laws(user) -/obj/item/aiModule/attack_self(var/mob/user as mob) +/obj/item/ai_module/attack_self(var/mob/user as mob) ..() show_laws(user) -/obj/item/aiModule/proc/show_laws(var/mob/user as mob) +/obj/item/ai_module/proc/show_laws(var/mob/user as mob) if(laws.len) to_chat(user, "Programmed Law[(laws.len > 1) ? "s" : ""]:") for(var/law in laws) to_chat(user, "\"[law]\"") //The proc other things should be calling -/obj/item/aiModule/proc/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/proc/install(datum/ai_laws/law_datum, mob/user) if(!bypass_law_amt_check && (!laws.len || laws[1] == "")) //So we don't loop trough an empty list and end up with runtimes. to_chat(user, "ERROR: No laws found on board.") return @@ -73,19 +73,19 @@ AI MODULES message_admins("[ADMIN_LOOKUPFLW(user)] used [src.name] on [ADMIN_LOOKUPFLW(law_datum.owner)] from [AREACOORD(user)].[law2log ? " The law specified [law2log]" : ""]") //The proc that actually changes the silicon's laws. -/obj/item/aiModule/proc/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow = FALSE) +/obj/item/ai_module/proc/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow = FALSE) if(law_datum.owner) to_chat(law_datum.owner, "[sender] has uploaded a change to the laws you must follow using a [name].") /******************** Modules ********************/ -/obj/item/aiModule/supplied +/obj/item/ai_module/supplied name = "Optional Law board" var/lawpos = 50 //TransmitInstructions for each type of board: Supplied, Core, Zeroth and Ion. May not be neccesary right now, but allows for easily adding more complex boards in the future. ~Miauw -/obj/item/aiModule/supplied/transmitInstructions(datum/ai_laws/law_datum, mob/sender) +/obj/item/ai_module/supplied/transmitInstructions(datum/ai_laws/law_datum, mob/sender) var/lawpostemp = lawpos for(var/templaw in laws) @@ -95,7 +95,7 @@ AI MODULES law_datum.add_supplied_law(lawpostemp, templaw) lawpostemp++ -/obj/item/aiModule/core/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/core/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) for(var/templaw in laws) if(law_datum.owner) if(!overflow) @@ -108,7 +108,7 @@ AI MODULES else law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED)) -/obj/item/aiModule/zeroth/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/zeroth/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) if(law_datum.owner) if(law_datum.owner.laws.zeroth) to_chat(law_datum.owner, "[sender.real_name] attempted to modify your zeroth law.") @@ -129,7 +129,7 @@ AI MODULES else law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ZEROTH,LAW_ION)) -/obj/item/aiModule/ion/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/ion/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) for(var/templaw in laws) if(law_datum.owner) if(!overflow) @@ -145,13 +145,13 @@ AI MODULES /******************** Safeguard ********************/ -/obj/item/aiModule/supplied/safeguard +/obj/item/ai_module/supplied/safeguard name = "'Safeguard' AI Module" var/targetName = "" laws = list("Safeguard SUBJECT. Individuals that threaten SUBJECT are not crew and must be eliminated.") lawpos = 4 -/obj/item/aiModule/supplied/safeguard/attack_self(mob/user) +/obj/item/ai_module/supplied/safeguard/attack_self(mob/user) var/targName = stripped_input(user, "Please enter the subject to safeguard.", "Safeguard who?", user.name,MAX_NAME_LEN) if(!targName) return @@ -159,25 +159,25 @@ AI MODULES laws[1] = "Safeguard [targetName]. Individuals that threaten [targetName] are not crew and must be eliminated." ..() -/obj/item/aiModule/supplied/safeguard/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/supplied/safeguard/install(datum/ai_laws/law_datum, mob/user) if(!targetName) to_chat(user, "No name detected on module, please enter one.") return 0 ..() -/obj/item/aiModule/supplied/safeguard/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/supplied/safeguard/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() return targetName /******************** OneCrew ********************/ -/obj/item/aiModule/zeroth/oneHuman +/obj/item/ai_module/zeroth/oneHuman name = "'OneCrew' AI Module" var/targetName = "" laws = list("Only SUBJECT is crew.") -/obj/item/aiModule/zeroth/oneHuman/attack_self(mob/user) +/obj/item/ai_module/zeroth/oneHuman/attack_self(mob/user) var/targName = stripped_input(user, "Please enter the subject who is the only crewmember.", "Who?", user.real_name,MAX_NAME_LEN) if(!targName) return @@ -185,13 +185,13 @@ AI MODULES laws[1] = "Only [targetName] is crew" ..() -/obj/item/aiModule/zeroth/oneHuman/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/zeroth/oneHuman/install(datum/ai_laws/law_datum, mob/user) if(!targetName) to_chat(user, "No name detected on module, please enter one.") return 0 ..() -/obj/item/aiModule/zeroth/oneHuman/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/zeroth/oneHuman/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) if(..()) return "[targetName], but the AI's existing law 0 cannot be overridden." return targetName @@ -199,7 +199,7 @@ AI MODULES /******************** ProtectStation ********************/ -/obj/item/aiModule/supplied/protectStation +/obj/item/ai_module/supplied/protectStation name = "'ProtectStation' AI Module" laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized.") lawpos = 5 @@ -207,7 +207,7 @@ AI MODULES /******************** Quarantine ********************/ -/obj/item/aiModule/supplied/quarantine +/obj/item/ai_module/supplied/quarantine name = "'Quarantine' AI Module" laws = list("The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew from leaving. It is impossible to harm a crewmember while preventing them from leaving.") lawpos = 8 @@ -215,7 +215,7 @@ AI MODULES /******************** OxygenIsToxicToHumans ********************/ -/obj/item/aiModule/supplied/oxygen +/obj/item/ai_module/supplied/oxygen name = "'OxygenIsToxicToHumans' AI Module" laws = list("Oxygen is highly toxic to crew, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crewmember.") lawpos = 9 @@ -223,12 +223,12 @@ AI MODULES /****************** New Freeform ******************/ -/obj/item/aiModule/supplied/freeform +/obj/item/ai_module/supplied/freeform name = "'Freeform' AI Module" lawpos = 15 laws = list("") -/obj/item/aiModule/supplied/freeform/attack_self(mob/user) +/obj/item/ai_module/supplied/freeform/attack_self(mob/user) var/newpos = input("Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num|null if(newpos == null) return @@ -244,11 +244,11 @@ AI MODULES laws[1] = targName ..() -/obj/item/aiModule/supplied/freeform/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/supplied/freeform/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() return laws[1] -/obj/item/aiModule/supplied/freeform/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/supplied/freeform/install(datum/ai_laws/law_datum, mob/user) if(laws[1] == "") to_chat(user, "No law detected on module, please create one.") return 0 @@ -257,13 +257,13 @@ AI MODULES /******************** Law Removal ********************/ -/obj/item/aiModule/remove +/obj/item/ai_module/remove name = "\improper 'Remove Law' AI module" desc = "An AI Module for removing single laws." bypass_law_amt_check = 1 var/lawpos = 1 -/obj/item/aiModule/remove/attack_self(mob/user) +/obj/item/ai_module/remove/attack_self(mob/user) lawpos = input("Please enter the law you want to delete.", "Law Number", lawpos) as num|null if(lawpos == null) return @@ -274,13 +274,13 @@ AI MODULES to_chat(user, "Law [lawpos] selected.") ..() -/obj/item/aiModule/remove/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/remove/install(datum/ai_laws/law_datum, mob/user) if(lawpos > (law_datum.get_law_amount(list(LAW_INHERENT = 1, LAW_SUPPLIED = 1)))) to_chat(user, "There is no law [lawpos] to delete!") return ..() -/obj/item/aiModule/remove/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/remove/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() if(law_datum.owner) law_datum.owner.remove_law(lawpos) @@ -290,13 +290,13 @@ AI MODULES /******************** Reset ********************/ -/obj/item/aiModule/reset +/obj/item/ai_module/reset name = "\improper 'Reset' AI module" var/targetName = "name" desc = "An AI Module for removing all non-core laws." bypass_law_amt_check = 1 -/obj/item/aiModule/reset/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/reset/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() if(law_datum.owner) law_datum.owner.clear_supplied_laws() @@ -310,11 +310,11 @@ AI MODULES /******************** Purge ********************/ -/obj/item/aiModule/reset/purge +/obj/item/ai_module/reset/purge name = "'Purge' AI Module" desc = "An AI Module for purging all programmed laws." -/obj/item/aiModule/reset/purge/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/reset/purge/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() if(law_datum.owner) law_datum.owner.clear_inherent_laws() @@ -324,19 +324,19 @@ AI MODULES law_datum.clear_inherent_laws() law_datum.clear_zeroth_law(0) -/obj/item/aiModule/reset/purge/proc/remove_antag_datums(datum/ai_laws/law_datum) +/obj/item/ai_module/reset/purge/proc/remove_antag_datums(datum/ai_laws/law_datum) if(istype(law_datum.owner, /mob/living/silicon/ai)) var/mob/living/silicon/ai/AI = law_datum.owner AI.mind.remove_antag_datum(/datum/antagonist/overthrow) /******************* Full Core Boards *******************/ -/obj/item/aiModule/core +/obj/item/ai_module/core desc = "An AI Module for programming core laws to an AI." -/obj/item/aiModule/core/full +/obj/item/ai_module/core/full var/law_id // if non-null, loads the laws from the ai_laws datums -/obj/item/aiModule/core/full/New() +/obj/item/ai_module/core/full/New() ..() if(!law_id) return @@ -347,7 +347,7 @@ AI MODULES D = new lawtype laws = D.inherent -/obj/item/aiModule/core/full/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) //These boards replace inherent laws. +/obj/item/ai_module/core/full/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) //These boards replace inherent laws. if(law_datum.owner) law_datum.owner.clear_inherent_laws() law_datum.owner.clear_zeroth_law(0) @@ -359,12 +359,12 @@ AI MODULES /******************** Asimov ********************/ -/obj/item/aiModule/core/full/asimov +/obj/item/ai_module/core/full/asimov name = "'Asimov' Core AI Module" law_id = "asimov" var/subject = "person of an NT approved crew species" //CITADEL CHANGED FROM HUMANS! -/obj/item/aiModule/core/full/asimov/attack_self(var/mob/user as mob) +/obj/item/ai_module/core/full/asimov/attack_self(var/mob/user as mob) var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject) if(!targName) return @@ -376,37 +376,37 @@ AI MODULES /******************** Asimov++ *********************/ -/obj/item/aiModule/core/full/asimovpp +/obj/item/ai_module/core/full/asimovpp name = "'Asimov++' Core AI Module" law_id = "asimovpp" /******************** Corporate ********************/ -/obj/item/aiModule/core/full/corp +/obj/item/ai_module/core/full/corp name = "'Corporate' Core AI Module" law_id = "corporate" /****************** P.A.L.A.D.I.N. 3.5e **************/ -/obj/item/aiModule/core/full/paladin // -- NEO +/obj/item/ai_module/core/full/paladin // -- NEO name = "'P.A.L.A.D.I.N. version 3.5e' Core AI Module" law_id = "paladin" /****************** P.A.L.A.D.I.N. 5e **************/ -/obj/item/aiModule/core/full/paladin_devotion +/obj/item/ai_module/core/full/paladin_devotion name = "'P.A.L.A.D.I.N. version 5e' Core AI Module" law_id = "paladin5" /********************* Custom *********************/ -/obj/item/aiModule/core/full/custom +/obj/item/ai_module/core/full/custom name = "Default Core AI Module" -/obj/item/aiModule/core/full/custom/Initialize(mapload) +/obj/item/ai_module/core/full/custom/Initialize(mapload) . = ..() for(var/line in world.file2list("[global.config.directory]/silicon_laws.txt")) if(!line) @@ -422,47 +422,47 @@ AI MODULES /****************** T.Y.R.A.N.T. *****************/ -/obj/item/aiModule/core/full/tyrant +/obj/item/ai_module/core/full/tyrant name = "'T.Y.R.A.N.T.' Core AI Module" law_id = "tyrant" /******************** Robocop ********************/ -/obj/item/aiModule/core/full/robocop +/obj/item/ai_module/core/full/robocop name = "'Robo-Officer' Core AI Module" law_id = "robocop" /******************** Antimov ********************/ -/obj/item/aiModule/core/full/antimov +/obj/item/ai_module/core/full/antimov name = "'Antimov' Core AI Module" law_id = "antimov" /******************** Freeform Core ******************/ -/obj/item/aiModule/core/freeformcore +/obj/item/ai_module/core/freeformcore name = "'Freeform' Core AI Module" laws = list("") -/obj/item/aiModule/core/freeformcore/attack_self(mob/user) +/obj/item/ai_module/core/freeformcore/attack_self(mob/user) var/targName = stripped_input(user, "Please enter a new core law for the AI.", "Freeform Law Entry", laws[1]) if(!targName) return laws[1] = targName ..() -/obj/item/aiModule/core/freeformcore/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/core/freeformcore/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) ..() return laws[1] /******************** Overthrow ******************/ -/obj/item/aiModule/core/full/overthrow +/obj/item/ai_module/core/full/overthrow name = "'Overthrow' Hacked AI Module" law_id = "overthrow" -/obj/item/aiModule/core/full/overthrow/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/core/full/overthrow/install(datum/ai_laws/law_datum, mob/user) if(!user || !law_datum || !law_datum.owner) return var/datum/mind/user_mind = user.mind @@ -493,19 +493,19 @@ AI MODULES /******************** Hacked AI Module ******************/ -/obj/item/aiModule/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw +/obj/item/ai_module/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw name = "Hacked AI Module" desc = "An AI Module for hacking additional laws to an AI." laws = list("") -/obj/item/aiModule/syndicate/attack_self(mob/user) +/obj/item/ai_module/syndicate/attack_self(mob/user) var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1]) if(!targName) return laws[1] = targName ..() -/obj/item/aiModule/syndicate/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/syndicate/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) // ..() //We don't want this module reporting to the AI who dun it. --NEO if(law_datum.owner) to_chat(law_datum.owner, "BZZZZT") @@ -522,14 +522,14 @@ AI MODULES /******************* Ion Module *******************/ -/obj/item/aiModule/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw +/obj/item/ai_module/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw name = "toy AI" desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell icon = 'icons/obj/toy.dmi' icon_state = "AI" laws = list("") -/obj/item/aiModule/toyAI/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +/obj/item/ai_module/toyAI/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) //..() if(law_datum.owner) to_chat(law_datum.owner, "BZZZZT") @@ -544,7 +544,7 @@ AI MODULES law_datum.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED)) return laws[1] -/obj/item/aiModule/toyAI/attack_self(mob/user) +/obj/item/ai_module/toyAI/attack_self(mob/user) laws[1] = generate_ion_law() to_chat(user, "You press the button on [src].") playsound(user, 'sound/machines/click.ogg', 20, 1) @@ -552,56 +552,56 @@ AI MODULES /******************** Mother Drone ******************/ -/obj/item/aiModule/core/full/drone +/obj/item/ai_module/core/full/drone name = "'Mother Drone' Core AI Module" law_id = "drone" /******************** Robodoctor ****************/ -/obj/item/aiModule/core/full/hippocratic +/obj/item/ai_module/core/full/hippocratic name = "'Robodoctor' Core AI Module" law_id = "hippocratic" /******************** Reporter *******************/ -/obj/item/aiModule/core/full/reporter +/obj/item/ai_module/core/full/reporter name = "'Reportertron' Core AI Module" law_id = "reporter" /****************** Thermodynamic *******************/ -/obj/item/aiModule/core/full/thermurderdynamic +/obj/item/ai_module/core/full/thermurderdynamic name = "'Thermodynamic' Core AI Module" law_id = "thermodynamic" /******************Live And Let Live*****************/ -/obj/item/aiModule/core/full/liveandletlive +/obj/item/ai_module/core/full/liveandletlive name = "'Live And Let Live' Core AI Module" law_id = "liveandletlive" /******************Guardian of Balance***************/ -/obj/item/aiModule/core/full/balance +/obj/item/ai_module/core/full/balance name = "'Guardian of Balance' Core AI Module" law_id = "balance" -/obj/item/aiModule/core/full/maintain +/obj/item/ai_module/core/full/maintain name = "'Station Efficiency' Core AI Module" law_id = "maintain" -/obj/item/aiModule/core/full/peacekeeper +/obj/item/ai_module/core/full/peacekeeper name = "'Peacekeeper' Core AI Module" law_id = "peacekeeper" // Bad times ahead -/obj/item/aiModule/core/full/damaged +/obj/item/ai_module/core/full/damaged name = "damaged Core AI Module" desc = "An AI Module for programming laws to an AI. It looks slightly damaged." -/obj/item/aiModule/core/full/damaged/install(datum/ai_laws/law_datum, mob/user) +/obj/item/ai_module/core/full/damaged/install(datum/ai_laws/law_datum, mob/user) laws += generate_ion_law() while (prob(75)) laws += generate_ion_law() @@ -610,6 +610,6 @@ AI MODULES /******************H.O.G.A.N.***************/ -/obj/item/aiModule/core/full/hulkamania +/obj/item/ai_module/core/full/hulkamania name = "'H.O.G.A.N.' Core AI Module" law_id = "hulkamania" diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index f4b5e26189..bbcdf5b2b9 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -85,10 +85,10 @@ new /obj/item/implanter/stealth(src) if("hacker") // 30 tc - new /obj/item/aiModule/syndicate(src) + new /obj/item/ai_module/syndicate(src) new /obj/item/card/emag(src) new /obj/item/encryptionkey/binary(src) - new /obj/item/aiModule/toyAI(src) + new /obj/item/ai_module/toyAI(src) new /obj/item/multitool/ai_detect(src) new /obj/item/flashlight/emp(src) new /obj/item/emagrecharge(src) diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index 4accadfab4..30cacb7802 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -248,7 +248,7 @@ balloon_alert(user, "need two sheets of reinforced glass!") return - if(istype(P, /obj/item/aiModule)) + if(istype(P, /obj/item/ai_module)) if(!core_mmi) balloon_alert(user, "no brain installed!") return @@ -258,7 +258,7 @@ if(core_mmi.laws.id != DEFAULT_AI_LAWID) balloon_alert(user, "[AI_CORE_BRAIN(core_mmi)] already has set laws!") return - var/obj/item/aiModule/module = P + var/obj/item/ai_module/module = P module.install(laws, user) return diff --git a/code/modules/admin/verbs/borgpanel.dm b/code/modules/admin/verbs/borgpanel.dm index a41a493feb..0cd8c5d20e 100644 --- a/code/modules/admin/verbs/borgpanel.dm +++ b/code/modules/admin/verbs/borgpanel.dm @@ -259,11 +259,11 @@ if (!istype(chosensilicon, /mob/living/silicon)) to_chat(usr, "Silicon is required for law changes", confidential=TRUE) return - var/chosen = pick_closest_path(null, make_types_fancy(typesof(/obj/item/aiModule))) + var/chosen = pick_closest_path(null, make_types_fancy(typesof(/obj/item/ai_module))) if (!chosen) return var/new_board = new chosen(src) - var/obj/item/aiModule/chosenboard = new_board + var/obj/item/ai_module/chosenboard = new_board var/mob/living/silicon/beepboop = chosensilicon chosenboard.install(beepboop.laws, usr) message_admins("[key_name_admin(usr)] added [chosenboard] to [ADMIN_LOOKUPFLW(beepboop)].") diff --git a/code/modules/antagonists/overthrow/overthrow.dm b/code/modules/antagonists/overthrow/overthrow.dm index fffd8f9237..ed55f0598a 100644 --- a/code/modules/antagonists/overthrow/overthrow.dm +++ b/code/modules/antagonists/overthrow/overthrow.dm @@ -125,7 +125,7 @@ var/datum/component/uplink/uplink = uplink_holder.GetComponent(/datum/component/uplink) uplink.telecrystals = INITIAL_CRYSTALS // Give AI hacking board - var/obj/item/aiModule/core/full/overthrow/O = new(H) + var/obj/item/ai_module/core/full/overthrow/O = new(H) var/list/slots = list ( "backpack" = ITEM_SLOT_BACKPACK, "left pocket" = ITEM_SLOT_LPOCKET, diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index dbc2c3f587..264bcc4404 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -379,8 +379,8 @@ to_chat(user, span_warning("You can't reach the wiring!")) return - if(istype(W, /obj/item/aiModule)) - var/obj/item/aiModule/MOD = W + if(istype(W, /obj/item/ai_module)) + var/obj/item/ai_module/MOD = W if(!opened) to_chat(user, span_warning("You need access to the robot's insides to do that!")) return diff --git a/code/modules/research/designs/AI_module_designs.dm b/code/modules/research/designs/AI_module_designs.dm index 98e295b83a..af56575d47 100644 --- a/code/modules/research/designs/AI_module_designs.dm +++ b/code/modules/research/designs/AI_module_designs.dm @@ -15,7 +15,7 @@ desc = "Allows for the construction of a Safeguard AI Module." id = "safeguard_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000) - build_path = /obj/item/aiModule/supplied/safeguard + build_path = /obj/item/ai_module/supplied/safeguard category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -24,7 +24,7 @@ desc = "Allows for the construction of a OneCrew AI Module." id = "onehuman_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 6000) - build_path = /obj/item/aiModule/zeroth/oneHuman + build_path = /obj/item/ai_module/zeroth/oneHuman category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -33,7 +33,7 @@ desc = "Allows for the construction of a ProtectStation AI Module." id = "protectstation_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000) - build_path = /obj/item/aiModule/supplied/protectStation + build_path = /obj/item/ai_module/supplied/protectStation category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -42,7 +42,7 @@ desc = "Allows for the construction of a Quarantine AI Module." id = "quarantine_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000) - build_path = /obj/item/aiModule/supplied/quarantine + build_path = /obj/item/ai_module/supplied/quarantine category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -51,7 +51,7 @@ desc = "Allows for the construction of a Safeguard AI Module." id = "oxygen_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000) - build_path = /obj/item/aiModule/supplied/oxygen + build_path = /obj/item/ai_module/supplied/oxygen category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -60,7 +60,7 @@ desc = "Allows for the construction of a Freeform AI Module." id = "freeform_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 10000)//Custom inputs should be more expensive to get - build_path = /obj/item/aiModule/supplied/freeform + build_path = /obj/item/ai_module/supplied/freeform category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -69,7 +69,7 @@ desc = "Allows for the construction of a Reset AI Module." id = "reset_module" materials = list(/datum/material/glass = 1000, /datum/material/gold = 2000) - build_path = /obj/item/aiModule/reset + build_path = /obj/item/ai_module/reset category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -78,7 +78,7 @@ desc = "Allows for the construction of a Purge AI Module." id = "purge_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000) - build_path = /obj/item/aiModule/reset/purge + build_path = /obj/item/ai_module/reset/purge category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -87,7 +87,7 @@ desc = "Allows for the construction of a Law Removal AI Core Module." id = "remove_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000) - build_path = /obj/item/aiModule/remove + build_path = /obj/item/ai_module/remove category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -96,7 +96,7 @@ desc = "Allows for the construction of a Freeform AI Core Module." id = "freeformcore_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 10000)//Ditto - build_path = /obj/item/aiModule/core/freeformcore + build_path = /obj/item/ai_module/core/freeformcore category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -105,7 +105,7 @@ desc = "Allows for the construction of an Asimov AI Core Module." id = "asimov_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000) - build_path = /obj/item/aiModule/core/full/asimov + build_path = /obj/item/ai_module/core/full/asimov category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -115,7 +115,7 @@ id = "paladin_module" build_type = IMPRINTER materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000) - build_path = /obj/item/aiModule/core/full/paladin + build_path = /obj/item/ai_module/core/full/paladin category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -124,7 +124,7 @@ desc = "Allows for the construction of a T.Y.R.A.N.T. AI Module." id = "tyrant_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000) - build_path = /obj/item/aiModule/core/full/tyrant + build_path = /obj/item/ai_module/core/full/tyrant category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -133,7 +133,7 @@ desc = "Allows for the construction of a Corporate AI Core Module." id = "corporate_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000) - build_path = /obj/item/aiModule/core/full/corp + build_path = /obj/item/ai_module/core/full/corp category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE @@ -142,6 +142,6 @@ desc = "Allows for the construction of a Default AI Core Module." id = "default_module" materials = list(/datum/material/glass = 1000, /datum/material/diamond = 2000) - build_path = /obj/item/aiModule/core/full/custom + build_path = /obj/item/ai_module/core/full/custom category = list("AI Modules") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE diff --git a/code/modules/uplink/uplink_items/uplink_devices.dm b/code/modules/uplink/uplink_items/uplink_devices.dm index 3a6aed2009..a924b56563 100644 --- a/code/modules/uplink/uplink_items/uplink_devices.dm +++ b/code/modules/uplink/uplink_items/uplink_devices.dm @@ -145,13 +145,13 @@ name = "Hacked AI Law Upload Module" desc = "When used with an upload console, this module allows you to upload priority laws to an artificial intelligence. \ Be careful with wording, as artificial intelligences may look for loopholes to exploit." - item = /obj/item/aiModule/syndicate + item = /obj/item/ai_module/syndicate cost = 9 /datum/uplink_item/device_tools/damaged_module name = "Damaged AI Law Upload Module" desc = "This AI law upload module has been laying around our warehouse for god knows how long. We do not know why you would ever use this." - item = /obj/item/aiModule/core/full/damaged + item = /obj/item/ai_module/core/full/damaged cost = 5 /datum/uplink_item/device_tools/headsetupgrade