+ Those BASTARDS! I agreed to sign up for 3 years, but those bean counters were measuring in LOCAL solar cycles!
+ I've talked to some of the others, and we're going to overthrow these tyrants!
+ "}
+
+/obj/item/paper/fluff/awaymissions/mine_coordinates
+ name = "coordinate readout"
+ info = {"Coordinates of REDACTED facility attached for supply purposes. Return to transmuter to upload coordinates and access further missions."}
diff --git a/code/modules/awaymissions/mission_code/netmin/combat_robot_factory.dm b/code/modules/awaymissions/mission_code/netmin/combat_robot_factory.dm
new file mode 100644
index 000000000000..dd59d5c8669c
--- /dev/null
+++ b/code/modules/awaymissions/mission_code/netmin/combat_robot_factory.dm
@@ -0,0 +1,119 @@
+/area/awaymission/vr/combat_robot_factory
+ name = "Abandoned Robot Factory"
+ icon_state = "awaycontent4"
+ pacifist = FALSE
+
+/obj/item/paper/fluff/awaymissions/robot_factory/shipment_details
+ name = "Shipment Details"
+ info = "Shipment Details: 500x Agricultural Robots @ 1999.95 cr 200x Construction Robots @ 2499.95 cr
Total: 1,499,965 cr
Destination: Gamnar Military Base"
+
+/obj/item/paper/fluff/awaymissions/robot_factory/advanced_model
+ name = "Personal Research"
+ info = "I've crunched the numbers on the capabilities of the servors in these robots. I'm pretty certain they could handle additional armor plating, and maybe even a more powerful gun. I'll tell the boss after I've finished my prototypes."
+
+/obj/item/paper/fluff/awaymissions/robot_factory/benny
+ name = "diary entry #631"
+ info = "I should really stop naming all my passwords after you, Benny. The boss says it isn't secure, wouldn't want the workers getting in to the emergency supplies."
+
+/obj/item/paper/fluff/awaymissions/robot_factory/spider
+ name = "Beware: Spider"
+ info = "Stop leaving your leftovers out! It's attracting bugs, and with bugs comes spiders. We've called an exterminator but the breakroom is off-limits until then."
+
+/obj/item/paper/fluff/awaymissions/robot_factory/classified
+ name = "Research Notes"
+ info = {"The biggest limiter to the efficiency of our robots have always been the rigid programming. The Board has ordered me to explore if it's feasible to use human minds instead of programming. \
+ If possible they should make a formidable addition as a commander type robot.\
+ We'd have to wipe their memories or I'm sure they wouldn't be happy..."}
+
+/obj/item/paper/crumpled/bloody/fluff/awaymissions/robot_factory/control_man
+ name = "paper"
+ info = {"Something went horribly wrong with the latest experiment... I'm not sure how to explain, but it's *alive* and it's *angry*. The higher ups will have my head for this if I don't get killed in action...
+ I'll send them a message to halt the latest shipment incase it was contaminated, and after that..."}
+
+/obj/item/paper/fluff/awaymissions/robot_factory/control_message
+ name = "message log"
+ info = {"Sending message with title 'SHIPMENT CONTAMINATION' failed. Please validate that communication dishes are working and try again."}
+
+/obj/item/paper/fluff/awaymissions/robot_factory/diagnostic
+ name = "diagnostic report"
+ info = {"Main servos offline. Main processor failing. Sending diagnostic data to master controller at location \[REDACTED\]."}
+
+
+/obj/item/disk/holodisk/combat_robot/introduction
+ preset_image_type = /datum/preset_holoimage/cc_official
+ preset_record_text = {"
+ NAME HR Representative
+ DELAY 30
+ SAY Welcome aboard your new home for the next 12 months!
+ DELAY 30
+ SAY Your main duties will consist of refilling machinery, packing boxes, and most importantly..
+ DELAY 45
+ SAY Not asking any questions.
+ DELAY 30
+ SAY In addition, please refrain from bothering the Corporate Liason stationed here unless he specifically asks for your help.
+ DELAY 45"}
+
+
+/obj/item/disk/holodisk/combat_robot/classified
+ preset_image_type = /datum/preset_holoimage/cc_official
+ preset_record_text = {"
+ NAME Mr. Nakada
+ DELAY 30
+ SAY Research log number 63
+ DELAY 45
+ SAY Further attempts to artifically grow and integrate a human host have failed.
+ DELAY 60
+ SAY Attempting one further growth cycle before returning to Central Command
+ DELAY 60
+ SAY Using the local supervisor as the neural template.
+ DELAY 60
+ SAY Final report is estimated to be completed within the next two weeks.
+ DELAY 45"}
+
+/obj/item/disk/holodisk/combat_robot/experiment
+ preset_image_type = /datum/preset_holoimage/researcher
+ preset_record_text = {"
+ NAME Doctor Williams
+ DELAY 30
+ SAY Beginning experiment number 31
+ DELAY 60
+ SAY Injecting solution...
+ DELAY 45
+ SAY Subject appears to be displaying decreased blood pressure. Subject having difficulty maintaining consciousness.
+ DELAY 60
+ SAY Neural activity appears incompatible with capture device.
+ DELAY 50
+ SAY Subject has expired. End log for experiment number 31.
+ DELAY 45"}
+
+/obj/item/disk/holodisk/combat_robot/factory_floor
+ preset_image_type = /datum/preset_holoimage/nanotrasenprivatesecurity
+ preset_record_text = {"
+ NAME Officer Rymes
+ DELAY 30
+ SAY After last nights incident I believe we should reiterate the corporate policy on rioting.
+ DELAY 45
+ SAY In case of any kind of illegal striking or insurrection by the stationed workers you are to close the blast door to the factory floor.
+ DELAY 75
+ SAY After the situation is under control and production ready to resume you should unlock the door.
+ DELAY 45
+ SAY For the forgetful amongst you, the password is 'Zandar' after our dear CEO.
+ DELAY 45
+ SAY Don't forget that the door is voice activated.
+ DELAY 45"}
+
+/obj/item/ai_cpu/self_aware
+ name = "semi self-aware neural processing unit"
+ desc = "The remains of the neuron interfacing chip found onboard a redacted robot production facility. The remaining organic material still seems alive."
+
+ icon = 'icons/obj/surgery.dmi'
+ icon_state = "brain-x"
+
+ speed = 20
+ base_power_usage = 2 * AI_CPU_BASE_POWER_USAGE
+
+ minimum_max_power = 1.1
+ maximum_max_power = 2.8
+
+ minimum_growth = 1
+ maximum_growth = 4.5
diff --git a/code/modules/awaymissions/mission_code/netmin/scientist_raid.dm b/code/modules/awaymissions/mission_code/netmin/scientist_raid.dm
new file mode 100644
index 000000000000..c5998310867b
--- /dev/null
+++ b/code/modules/awaymissions/mission_code/netmin/scientist_raid.dm
@@ -0,0 +1,49 @@
+/area/awaymission/vr/scientist_raid
+ name = "Small Abandoned Station"
+ icon_state = "awaycontent3"
+
+/obj/item/paper/fluff/awaymissions/scientist_raid/report1
+ name = "Adaptive Neural Networks - Research Report"
+ info = "While these types of networks seem to be well-suited for our needs, the current processing technology doesn't seem able to simulate them quickly enough. More research is needed.."
+
+/obj/item/paper/fluff/awaymissions/scientist_raid/report2
+ name = "Captive Organic Neurons - Research Report"
+ info = "A new scientific article has piqued my interest. A Cybersun Industries biologist seems to have extracted useable responses from lab-grown neurons. Although the experiment was small-scale it seems promising.."
+
+/obj/item/paper/fluff/awaymissions/scientist_raid/report3
+ name = "Personnel Requisition Order"
+ info = "I require additional low-level personnel to maintain the station. Primarily janitors and low-level engineers. Due to the distance to the station they should preferably have minimal family and social contacts."
+
+/obj/item/paper/fluff/awaymissions/scientist_raid/report4
+ name = "Deep Tissue Neuron Control"
+ info = "Further research reveals that using invasive surgical procedures it is possible to influence and digitally mirror the actions of individual neurons. Preliminary results show a 1251.83x performance improvement compared to traditional neural networks."
+
+/obj/item/paper/crumpled/bloody/fluff/awaymissions/scientist_raid/report5
+ name = "hastily scribbled note"
+ info = "Forgive me for what I have done... Corporate goons are knocking down the door to my room, it seems they've caught on to my... unique ways of researching. I've hidden my last prototype in my safe. To anyone reading this, please carry on my research. The code to the safe is 7295"
+
+/obj/item/ai_cpu/organic
+ name = "experimental organic neural processing unit"
+ desc = "A half-machine half-human chip built by a mad scientist. Capable of processing immense amounts of data, at the expense of the sacrifice of the sanity of the consciousness contained within.."
+ icon_state = "cpuboard_adv"
+
+ speed = 12
+ base_power_usage = 4 * AI_CPU_BASE_POWER_USAGE
+
+ minimum_max_power = 1.1
+ maximum_max_power = 2.6
+
+ minimum_growth = 1
+ maximum_growth = 4
+
+/obj/item/storage/secure/safe/scientist_raid
+ name = "secure safe"
+
+/obj/item/storage/secure/safe/scientist_raid/Initialize(mapload)
+ . = ..()
+ l_code = "7295"
+ l_set = TRUE
+ new /obj/item/ai_cpu/organic(src)
+ SEND_SIGNAL(src, COMSIG_TRY_STORAGE_SET_LOCKSTATE, TRUE)
+ cut_overlays()
+
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 1dd5233b9488..fe49200ba1ee 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -360,6 +360,9 @@ BLIND // can't see anything
return
if (!can_use(M))
return
+ if(is_synth(M))
+ to_chat(usr, "You're unable to use suit sensors as a synthetic!")
+ return
if(src.has_sensor == LOCKED_SENSORS)
to_chat(usr, "The controls are locked.")
return 0
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 575b81e4dce0..b7adf9f270f5 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -544,3 +544,4 @@
w_class = WEIGHT_CLASS_BULKY
// Does not cover additional limbs like vest does
plating = K
+
diff --git a/code/modules/clothing/outfits/vr.dm b/code/modules/clothing/outfits/vr.dm
index 63e111ae72ea..1d81c2db9204 100644
--- a/code/modules/clothing/outfits/vr.dm
+++ b/code/modules/clothing/outfits/vr.dm
@@ -1,9 +1,8 @@
/datum/outfit/vr
name = "Basic VR"
- uniform = /obj/item/clothing/under/color/random
+ uniform = /obj/item/clothing/under/rank/cargotech
shoes = /obj/item/clothing/shoes/sneakers/black
- ears = /obj/item/radio/headset
- id = /obj/item/card/id
+ id = /obj/item/card/id/no_bank
/datum/outfit/vr/pre_equip(mob/living/carbon/human/H)
H.dna.species.before_equip_job(null, H)
@@ -12,6 +11,8 @@
var/obj/item/card/id/id = H.wear_id
if (istype(id))
id.access |= get_all_accesses()
+ if(isplasmaman(H)) //sorry plasma people
+ H.set_species(/datum/species/human)
/datum/outfit/vr/syndicate
name = "Syndicate VR Operative - Basic"
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index e26d93aef5e0..4b27e2ae28cb 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -1251,3 +1251,57 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
slowdown = 0
+
+/obj/item/clothing/head/helmet/space/hardsuit/synth
+ name = "\improper synthetic worksuit helmet"
+ desc = "An integrated helmet that provides some level of resistance, to assist in hostile environments."
+ icon = 'icons/mob/clothing/head/head.dmi'
+ icon_state = "hardsuit0-synth"
+ item_state = "centcom"
+ w_class = WEIGHT_CLASS_BULKY
+ clothing_flags = THICKMATERIAL | STOPSPRESSUREDAMAGE
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+ armor = list(MELEE = 10, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 15, BIO = 15, RAD = 100, FIRE = 10, ACID = 15)
+ hardsuit_type = "synth"
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | INDESTRUCTIBLE | FREEZE_PROOF
+
+/obj/item/clothing/head/helmet/space/hardsuit/synth/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, SYNTHETIC_TRAIT)
+
+/obj/item/clothing/suit/space/hardsuit/synth
+ name = "\improper synthetic worksuit"
+ desc = "An integrated suit that provides some level of resistance, to assist in hostile environments."
+ icon = 'icons/mob/clothing/suit/suit.dmi'
+ icon_state = "synth_suit"
+ item_state = "centcom"
+ w_class = WEIGHT_CLASS_BULKY
+ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ clothing_flags = STOPSPRESSUREDAMAGE | STOPSPRESSUREDAMAGE
+ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+ cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+ max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+ armor = list(MELEE = 30, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 25, BIO = 25, RAD = 100, FIRE = 10, ACID = 25)
+ var/evil = FALSE
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/synth
+ slowdown = 0
+
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | INDESTRUCTIBLE | FREEZE_PROOF
+
+/obj/item/clothing/suit/space/hardsuit/synth/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, SYNTHETIC_TRAIT)
+
+/obj/item/clothing/suit/space/hardsuit/synth/update_icon_state()
+ . = ..()
+ if(evil)
+ icon_state = "synth_suit_evil"
+ else
+ icon_state = "synth_suit"
+
+ var/mob/living/carbon/human/user = loc
+ if(user && istype(user))
+ user.update_inv_wear_suit()
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 8b39d4c86061..5a7b1e1ddeae 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -539,3 +539,4 @@
slowdown_set = 0.4 // Very slow
armor = list(MELEE = 55, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 0, RAD = 0, FIRE = 65, ACID = 75, WOUND = 50) //Walking tank
partial_coverage = LEGS|ARMS
+
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index d26178c6e029..45e265f8742e 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -109,6 +109,9 @@
attached_accessory.on_clothing_equip(src, user)
if(attached_accessory.above_suit)
H.update_inv_wear_suit()
+ if(is_synth(user) && has_sensor)
+ to_chat(user, span_notice("Suit sensors disabled due to non-compatible user."))
+ sensor_mode = SENSOR_OFF
/obj/item/clothing/under/dropped(mob/user)
if(attached_accessory)
diff --git a/code/modules/economy/account.dm b/code/modules/economy/account.dm
index 508e998206e4..8755d6201bca 100644
--- a/code/modules/economy/account.dm
+++ b/code/modules/economy/account.dm
@@ -67,6 +67,8 @@
/datum/bank_account/proc/payday(amt_of_paychecks, free = FALSE)
var/money_to_transfer = account_job.paycheck * amt_of_paychecks
+ if(!money_to_transfer)
+ return TRUE
if(free)
adjust_money(money_to_transfer)
return TRUE
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 23052383fad8..9b922ed08a01 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -100,6 +100,9 @@
if(user.a_intent != INTENT_HARM || !isGlass)
return ..()
+ if(!synth_check(user, SYNTH_ORGANIC_HARM))
+ return
+
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, span_warning("You don't want to harm [target]!"))
return
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index 46a4b70f6087..b9106bbb0e99 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -74,6 +74,10 @@
to_chat(user, span_notice("[src] cannot be used unless bolted to the ground."))
return
+ if(is_synth(user))
+ to_chat(user, span_warning("You don't want to use this!"))
+ return
+
if(user.pulling && user.a_intent == INTENT_GRAB && isliving(user.pulling))
var/mob/living/L = user.pulling
if(!iscarbon(L))
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index 35b55d5f883f..5763ced37db0 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -18,6 +18,10 @@
#define HOLODECK_CD 25
#define HOLODECK_DMG_CD 500
+/// typecache for turfs that should be considered ok during floorchecks.
+/// A linked turf being anything not in this typecache will cause the holodeck to perform an emergency shutdown.
+GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf/open/floor/holofloor, /turf/closed)))
+
/obj/machinery/computer/holodeck
name = "holodeck control console"
desc = "A computer used to control a nearby holodeck."
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index c0b8bd142596..fa9ece84f0a8 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -123,6 +123,8 @@
/turf/open/floor/holofloor/carpet/update_icon(updates=ALL)
. = ..()
+ if(!.)
+ return FALSE
if((updates & UPDATE_SMOOTHING) && overfloor_placed && smoothing_flags & (SMOOTH_CORNERS|SMOOTH_BITMASK))
QUEUE_SMOOTH(src)
diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
index e8934128e90f..21a64c5c8903 100644
--- a/code/modules/jobs/access.dm
+++ b/code/modules/jobs/access.dm
@@ -410,7 +410,7 @@
"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
// yogs start - Yog jobs
"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer",
- "Network Admin", "Mining Medic", "Paramedic", "Psychiatrist", "Clerk", "Tourist", "Space Bartender", "Artist", "Brig Physician")
+ "Network Admin", "Mining Medic", "Paramedic", "Psychiatrist", "Clerk", "Tourist", "Space Bartender", "Artist", "Brig Physician", "Synthetic")
// yogs end
/// Gets all jobs with hud icons
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index 9e1f55089ea2..09464ee928a4 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -96,6 +96,7 @@
/// Icons to be displayed in the orbit ui. Source: FontAwesome v5.
var/orbit_icon
+ var/datum/species/forced_species
/**
* A list of job-specific areas to enable lights for if this job is present at roundstart, whenever minimal access is not in effect.
* This will be combined with minimal_lightup_areas, so no need to duplicate entries.
@@ -183,11 +184,16 @@
if(!H)
return FALSE
+
+
//This reads Command placement exceptions in code/controllers/configuration/entries/game_options to allow non-Humans in specified Command roles. If the combination of species and command role is invalid, default to Human.
if(CONFIG_GET(keyed_list/job_species_whitelist)[type] && !splittext(CONFIG_GET(keyed_list/job_species_whitelist)[type], ",").Find(H.dna.species.id))
if(H.dna.species.id != "human")
H.set_species(/datum/species/human)
H.apply_pref_name(/datum/preference/name/backup_human, preference_source)
+
+ if(forced_species)
+ H.set_species(forced_species)
if(!visualsOnly)
var/datum/bank_account/bank_account = new(H.real_name, src)
@@ -356,15 +362,17 @@
B.bank_cards += C
H.sec_hud_set_ID()
- var/obj/item/modular_computer/PDA = new pda_type()
- if(istype(PDA))
- PDA.InsertID(C)
- H.equip_to_slot_if_possible(PDA, ITEM_SLOT_ID)
+ if(pda_type)
+ var/obj/item/modular_computer/PDA = new pda_type()
+ if(istype(PDA))
+ PDA.InsertID(C)
+ H.equip_to_slot_if_possible(PDA, ITEM_SLOT_ID)
- PDA.update_label()
- PDA.update_appearance(UPDATE_ICON)
- PDA.update_filters()
-
+ PDA.update_label()
+ PDA.update_appearance(UPDATE_ICON)
+ PDA.update_filters()
+ else
+ H.equip_to_slot_if_possible(C, ITEM_SLOT_ID)
else
H.equip_to_slot_if_possible(C, ITEM_SLOT_ID)
diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm
index c2f33e9b666b..9df34178ac02 100644
--- a/code/modules/jobs/job_types/ai.dm
+++ b/code/modules/jobs/job_types/ai.dm
@@ -33,13 +33,13 @@
. = ..()
var/mob/living/silicon/ai/AI = spawned
- AI.relocate(TRUE)
+ AI.relocate(TRUE, TRUE)
+
+ var/total_available_cpu = 1 - AI.ai_network.resources.total_cpu_assigned()
+ var/total_available_ram = AI.ai_network.resources.total_ram() - AI.ai_network.resources.total_ram_assigned()
- var/total_available_cpu = 1 - GLOB.ai_os.total_cpu_assigned()
- var/total_available_ram = GLOB.ai_os.total_ram - GLOB.ai_os.total_ram_assigned()
-
- GLOB.ai_os.set_cpu(AI, total_available_cpu)
- GLOB.ai_os.add_ram(AI, total_available_ram)
+ AI.ai_network.resources.set_cpu(AI, total_available_cpu)
+ AI.ai_network.resources.add_ram(AI, total_available_ram)
AI.apply_pref_name(/datum/preference/name/ai, M.client) //If this runtimes oh well jobcode is fucked.
AI.set_core_display_icon(null, M.client)
diff --git a/code/modules/jobs/job_types/cargo_technician.dm b/code/modules/jobs/job_types/cargo_technician.dm
index ab2a5973a9bd..39eac3ceebc3 100644
--- a/code/modules/jobs/job_types/cargo_technician.dm
+++ b/code/modules/jobs/job_types/cargo_technician.dm
@@ -49,3 +49,7 @@
uniform_skirt = /obj/item/clothing/under/rank/cargotech/skirt
l_hand = /obj/item/export_scanner
+/datum/outfit/job/cargo_tech/no_pda
+ name = "Cargo Technician (No PDA)"
+
+ pda_type = null
diff --git a/code/modules/jobs/job_types/synthetic.dm b/code/modules/jobs/job_types/synthetic.dm
new file mode 100644
index 000000000000..8d81d1107ef4
--- /dev/null
+++ b/code/modules/jobs/job_types/synthetic.dm
@@ -0,0 +1,105 @@
+GLOBAL_LIST_INIT(synthetic_base_access, list(ACCESS_MAINT_TUNNELS, ACCESS_KITCHEN, ACCESS_CREMATORIUM, ACCESS_JANITOR, ACCESS_BAR, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_NETWORK, ACCESS_MINISAT, ACCESS_TCOMSAT, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA, ACCESS_CREMATORIUM, ACCESS_HYDROPONICS, ACCESS_MANUFACTURING, ACCESS_THEATRE, ACCESS_TCOM_ADMIN))
+GLOBAL_LIST_EMPTY(synthetic_added_access)
+/datum/job/synthetic
+ title = "Synthetic"
+ description = "Watch over the crew, carry out mundane tasks that nobody else want to. Do no harm."
+ orbit_icon = "eye"
+ auto_deadmin_role_flags = DEADMIN_POSITION_SILICON|DEADMIN_POSITION_CRITICAL
+ department_head = list("AI")
+ faction = "Station"
+ total_positions = 0
+ spawn_positions = 1
+ supervisors = "the AI"
+ minimal_player_age = 30
+ exp_requirements = 900
+ exp_type = EXP_TYPE_CREW
+ exp_type_department = EXP_TYPE_COMMAND
+
+ outfit = /datum/outfit/job/synthetic
+
+ added_access = list()
+ base_access = list()
+ paycheck = 0
+ paycheck_department = ACCOUNT_SCI
+ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
+
+ display_order = JOB_DISPLAY_ORDER_SYNTHETIC
+
+ departments_list = list(
+ /datum/job_department/silicon,
+ )
+
+
+ mail_goodies = list()
+
+ smells_like = "calculated machinery"
+ alt_titles = list()
+
+ forced_species = /datum/species/wy_synth
+
+/datum/job/synthetic/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
+ . = ..()
+
+ addtimer(CALLBACK(src, PROC_REF(synth_name_choose), H, M), 1 SECONDS)
+ H.remove_all_quirks()
+
+/datum/job/synthetic/proc/synth_name_choose(mob/living/H, mob/M)
+ var/newname = sanitize_name(reject_bad_text(stripped_input(M, "Please input your name.", "Name change", H.real_name, MAX_NAME_LEN)))
+
+ H.fully_replace_character_name(H.real_name, newname)
+ if(iscarbon(H)) //doing these two JUST to be sure you dont have edge cases of your DNA and mind not matching your new name, somehow
+ var/mob/living/carbon/C = H
+ if(C?.dna)
+ C?.dna?.real_name = newname
+ if(H?.mind)
+ H?.mind?.name = newname
+
+
+/datum/job/synthetic/get_access()
+ return GLOB.synthetic_base_access
+
+
+/datum/outfit/job/synthetic
+ name = "Synthetic"
+
+ jobtype = /datum/job/synthetic
+ ears = /obj/item/radio/headset/headset_synthetic
+
+ suit = /obj/item/clothing/suit/space/hardsuit/synth
+
+ pda_type = null
+ id_type = /obj/item/card/id/synthetic
+
+/datum/outfit/job/synthetic/post_equip(mob/living/carbon/human/H, visualsOnly)
+ . = ..()
+ if(H.w_uniform)
+ var/obj/item/clothing/under/wearing = H.w_uniform
+ wearing.has_sensor = FALSE
+
+ var/obj/machinery/ai/data_core/core
+ core = H.available_ai_cores(forced = TRUE)
+ if(core)
+ core.network.add_synth(H)
+
+
+
+
+
+/datum/outfit/job/synthetic/naked
+ name = "Synthetic (Naked)"
+
+ uniform = null
+ ears = null
+ back = null
+ shoes = null
+ box = null
+
+ preload = FALSE // These are used by the prefs ui, and also just kinda could use the extra help at roundstart
+
+ backpack = null
+ satchel = null
+ duffelbag = null
+
+
+/datum/outfit/job/synthetic/naked/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ return
diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm
index e5a25d297f46..da100fd2c794 100644
--- a/code/modules/mapping/map_template.dm
+++ b/code/modules/mapping/map_template.dm
@@ -56,6 +56,7 @@
var/list/obj/machinery/atmospherics/atmos_machines = list()
var/list/obj/structure/cable/cables = list()
+ var/list/obj/structure/ethernet_cable/ethernet_cables = list()
var/list/atom/movable/movables = list()
var/list/obj/docking_port/stationary/ports = list()
var/list/area/areas = list()
@@ -85,6 +86,9 @@
if(istype(movable_in_turf, /obj/structure/cable))
cables += movable_in_turf
continue
+ if(istype(movable_in_turf, /obj/structure/ethernet_cable))
+ ethernet_cables += movable_in_turf
+ continue
if(istype(movable_in_turf, /obj/machinery/atmospherics))
atmos_machines += movable_in_turf
if(istype(movable_in_turf, /obj/docking_port/stationary))
@@ -110,6 +114,7 @@
// NOTE, now that Initialize and LateInitialize run correctly, do we really
// need these two below?
SSmachines.setup_template_powernets(cables)
+ SSmachines.setup_template_ainets(ethernet_cables)
SSair.setup_template_machinery(atmos_machines)
//calculate all turfs inside the border
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 43f08d0157c9..12b2a5502dbf 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -236,7 +236,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava)
log_mapping("[src] at [x],[y] could not find any morgues.")
return
for (var/i = 1 to bodycount)
- var/obj/structure/bodycontainer/morgue/j = pick(trays)
+ var/obj/structure/bodycontainer/morgue/j = pick_n_take(trays)
var/mob/living/carbon/human/h = new /mob/living/carbon/human(j, 1)
h.death()
for (var/part in h.internal_organs) //randomly remove organs from each body, set those we keep to be in stasis
diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm
index 26fc9cfcdddc..aaebee415016 100644
--- a/code/modules/mob/dead/dead.dm
+++ b/code/modules/mob/dead/dead.dm
@@ -27,6 +27,17 @@ INITIALIZE_IMMEDIATE(/mob/dead)
/mob/dead/canUseStorage()
return FALSE
+/mob/dead/forceMove(atom/destination)
+ var/turf/old_turf = get_turf(src)
+ var/turf/new_turf = get_turf(destination)
+ if(is_secret_level(new_turf?.z) && (!client?.holder))
+ return
+ if (old_turf?.z != new_turf?.z)
+ on_changed_z_level(old_turf, new_turf)
+ var/oldloc = loc
+ loc = destination
+ Moved(oldloc, NONE, TRUE)
+
/mob/dead/get_status_tab_items()
. = ..()
. += ""
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index eefa3e385051..bb0285e6db53 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -48,7 +48,10 @@
mannequin.add_overlay(mutable_appearance('icons/turf/floors.dmi', background, layer = SPACE_LAYER))
apply_prefs_to(mannequin, TRUE)
+
if(preview_job)
+ if(preview_job.forced_species)
+ mannequin.set_species(preview_job.forced_species)
mannequin.job = preview_job.title
mannequin.dress_up_as_job(preview_job, TRUE)
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 52d935f24f3e..ec755053510e 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -288,11 +288,18 @@
var/obj/item/clothing/head/hat = owner.get_item_by_slot(ITEM_SLOT_HEAD)
if(hat && istype(hat, /obj/item/clothing/head/foilhat))
return
+
to_chat(owner, span_warning("Alert: Posibrain [severity > EMP_LIGHT ? "severely " : ""]damaged."))
owner.adjust_drugginess(5 * severity)
if(severity > EMP_LIGHT)
owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, (2 * (severity - EMP_LIGHT)) * (maxHealth - damage) / maxHealth) // don't give traumas from weak EMPs
+/obj/item/organ/brain/positron/synth
+ zone = BODY_ZONE_HEAD
+
+/obj/item/organ/brain/positron/synth/can_extract()
+ return FALSE
+
////////////////////////////////////TRAUMAS////////////////////////////////////////
/obj/item/organ/brain/proc/has_trauma_type(brain_trauma_type = /datum/brain_trauma, resilience = TRAUMA_RESILIENCE_ABSOLUTE)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 1fe00caa4707..3aa133a79355 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -177,6 +177,9 @@
if(HAS_TRAIT(src, TRAIT_PACIFISM))
to_chat(src, span_notice("You gently let go of [throwable_mob]."))
return
+ if(!synth_check(src, SYNTH_ORGANIC_HARM))
+ to_chat(src, span_notice("You gently let go of [throwable_mob]."))
+ return
var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
var/turf/end_T = get_turf(target)
if(start_T && end_T)
@@ -190,6 +193,9 @@
if(HAS_TRAIT(src, TRAIT_PACIFISM) && I.throwforce)
to_chat(src, span_notice("You set [I] down gently on the ground."))
return
+ if(!synth_check(src, SYNTH_RESTRICTED_WEAPON))
+ to_chat(src, span_notice("You set [I] down gently on the ground."))
+ return
if(thrown_thing)
if(HAS_TRAIT(src, TRAIT_HULK))
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index adb3fd1e5883..702ec77bc5ad 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -401,9 +401,15 @@
msg += "[t_He] [t_is] barely conscious.\n"
if(getorgan(/obj/item/organ/brain))
if(!key)
- msg += "[span_deadsay("[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.")]\n"
+ if(is_synth(src))
+ msg += "The unit is indicating that it is currently inactive. Place this unit inside a synthetic storage unit to allow the onboard synthetic intelligences to control it.\n"
+ else
+ msg += "[span_deadsay("[t_He] [t_is] totally catatonic. The stresses of life in deep-space must have been too much for [t_him]. Any recovery is unlikely.")]\n"
else if(!client && !fake_client)
- msg += "[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.\n"
+ if(is_synth(src))
+ msg += "The unit is indicating that it is currently inactive. Place this unit inside a synthetic storage unit to allow the onboard synthetic intelligences to control it.\n"
+ else
+ msg += "[t_He] [t_has] a blank, absent-minded stare and appears completely unresponsive to anything. [t_He] may snap out of it soon.\n"
if(digitalcamo)
msg += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly inhuman manner.\n"
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 2560eaf0bd4f..d9d893bff101 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -36,6 +36,8 @@ GLOBAL_LIST_EMPTY(features_by_species)
/// does it use skintones or not? (spoiler alert this is only used by humans)
var/use_skintones = FALSE
+ var/forced_skintone
+
/// If your race wants to bleed something other than bog standard blood, change this to reagent id.
var/datum/reagent/exotic_blood
///If your race uses a non standard bloodtype (A+, O-, AB-, etc)
@@ -211,6 +213,10 @@ GLOBAL_LIST_EMPTY(features_by_species)
//Should we preload this species's organs?
var/preload = TRUE
+ var/inherent_slowdown = 0
+
+ //for preternis + synths
+ var/draining = FALSE
///Does our species have colors for its' damage overlays?
var/use_damage_color = TRUE
@@ -1587,6 +1593,8 @@ GLOBAL_LIST_EMPTY(features_by_species)
. += hungry / 50
//Moving in high gravity is very slow (Flying too)
+ . += inherent_slowdown
+
if(gravity > STANDARD_GRAVITY)
var/grav_force = min(gravity - STANDARD_GRAVITY,3)
. += 1 + grav_force
@@ -1647,6 +1655,9 @@ GLOBAL_LIST_EMPTY(features_by_species)
if(!attacker_style?.nonlethal && HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, span_warning("You don't want to harm [target]!"))
return FALSE
+ if(!synth_check(user, SYNTH_ORGANIC_HARM))
+ to_chat(user, span_warning("You don't want to harm [target]!"))
+ return
var/datum/martial_art/M = target.check_block()
if(M)
M.handle_counter(target, user)
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index 5dacfae417b4..bc9cea38e847 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -72,6 +72,8 @@
. = ..()
/datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE)
+ if(!J)
+ return
var/current_job = J.title
var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman
switch(current_job)
diff --git a/code/modules/mob/living/carbon/human/species_types/wy_synths.dm b/code/modules/mob/living/carbon/human/species_types/wy_synths.dm
new file mode 100644
index 000000000000..bc69f2378b41
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/species_types/wy_synths.dm
@@ -0,0 +1,315 @@
+#define CONCIOUSAY(text) if(H.stat == CONSCIOUS) { ##text }
+
+/datum/species/wy_synth
+ name = "Synthetic"
+ id = "synthetic"
+ say_mod = "states"
+
+ limbs_id = "human"
+ damage_overlay_type = "synth"
+
+ species_traits = list(NOTRANSSTING,NOEYESPRITES,NO_DNA_COPY,TRAIT_EASYDISMEMBER,NOZOMBIE,NOHUSK,NOBLOOD, NO_UNDERWEAR)
+ inherent_traits = list(TRAIT_POWERHUNGRY, TRAIT_NOBREATH, TRAIT_RADIMMUNE,TRAIT_COLDBLOODED,TRAIT_LIMBATTACHMENT,TRAIT_NOCRITDAMAGE,TRAIT_GENELESS,TRAIT_MEDICALIGNORE,TRAIT_NOCLONE,TRAIT_TOXIMMUNE,TRAIT_EASILY_WOUNDED,TRAIT_NODEFIB, TRAIT_REDUCED_DAMAGE_SLOWDOWN, TRAIT_NOGUNS, TRAIT_NO_GRENADES)
+ no_equip = list(ITEM_SLOT_MASK, ITEM_SLOT_EYES)
+ inherent_biotypes = list(MOB_ROBOTIC)
+ mutantbrain = /obj/item/organ/brain/positron/synth
+ mutantheart = /obj/item/organ/heart/cybernetic
+ mutanteyes = /obj/item/organ/eyes/robotic/synth
+ mutanttongue = /obj/item/organ/tongue/robot
+ mutantliver = /obj/item/organ/liver/cybernetic/upgraded
+ mutantstomach = /obj/item/organ/stomach/cell
+ mutantears = /obj/item/organ/ears/robot
+ mutantlungs = /obj/item/organ/lungs
+ meat = /obj/item/stack/sheet/plasteel{amount = 5}
+ skinned_type = /obj/item/stack/sheet/metal{amount = 10}
+ exotic_blood = /datum/reagent/oil
+ use_skintones = TRUE
+ forced_skintone = "albino"
+ inherent_biotypes = MOB_ROBOTIC
+
+ burnmod = 0.9
+ heatmod = 0.95
+ brutemod = 0.75
+ toxmod = 0
+ clonemod = 0
+ staminamod = 0.5
+ coldmod = 0.25 //You take less cold damage
+ siemens_coeff = 1.75
+ species_gibs = "robotic"
+ attack_sound = 'sound/items/trayhit1.ogg'
+ screamsound = 'goon/sound/robot_scream.ogg'
+ allow_numbers_in_name = TRUE
+ deathsound = 'sound/voice/borg_deathsound.ogg'
+ wings_icon = "Robotic"
+ changesource_flags = MIRROR_BADMIN
+
+ var/datum/action/innate/undeployment_synth/undeployment_action = new
+ ///For transferring back and forth to an AI body when it's the AI deploying
+ var/mob/living/silicon/ai/mainframe
+
+ inherent_slowdown = 0.65
+ var/datum/action/innate/synth_os/os_button = new
+ var/datum/action/innate/synth_laws/show_laws = new
+
+
+ ///Original synth number designation for when this shell becomes uninhabited
+ var/original_numbers
+
+ var/obj/item/ai_cpu/inbuilt_cpu
+
+ punchdamagehigh = 12
+ punchdamagelow = 5
+ punchstunthreshold = 11
+ var/force_multiplier = 1.25 //We hit 25% harder with all weapons
+
+ var/last_warned
+
+ var/datum/ai_laws/laws = null
+
+ species_language_holder = /datum/language_holder/machine
+
+
+/datum/species/wy_synth/on_species_gain(mob/living/carbon/human/C)
+ . = ..()
+ RegisterSignal(C, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+ laws = new /datum/ai_laws/steward
+
+
+ var/obj/item/organ/appendix/A = C.getorganslot(ORGAN_SLOT_APPENDIX) // Easiest way to remove it.
+ if(A)
+ A.Remove(C)
+ QDEL_NULL(A)
+ original_numbers = rand(1, 999)
+ C.real_name = "Synthetic Unit #[original_numbers]"
+ C.name = C.real_name
+ os_button.Grant(C)
+ show_laws.Grant(C)
+ add_synthos(C)
+
+ if(!C.ai_network)
+ C.ai_network = new(C)
+
+ inbuilt_cpu = new /obj/item/ai_cpu
+
+ RegisterSignal(C, COMSIG_MOB_ALTCLICKON, PROC_REF(drain_power_from))
+
+ laws.show_laws(C)
+
+/datum/species/wy_synth/proc/add_synthos(mob/living/carbon/human/C)
+ if(C.mind && !C.mind.synth_os)
+ C.mind.synth_os = new(C)
+
+
+/datum/species/wy_synth/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load)
+ . = ..()
+ C.remove_language(/datum/language/machine, source = LANGUAGE_SYNTH)
+ os_button.Remove(C)
+ inbuilt_cpu.forceMove(get_turf(C))
+ inbuilt_cpu = null
+
+/datum/species/wy_synth/proc/handle_speech(datum/source, list/speech_args)
+ speech_args[SPEECH_SPANS] |= SPAN_ROBOT
+
+/datum/species/wy_synth/spec_revival(mob/living/carbon/human/H, admin_revive)
+ if(admin_revive)
+ return ..()
+ H.Stun(4 SECONDS) // No moving either
+ H.update_body()
+ addtimer(CALLBACK(src, PROC_REF(afterrevive), H), 0)
+ return
+
+/datum/species/wy_synth/proc/afterrevive(mob/living/carbon/human/H)
+ CONCIOUSAY(H.say("Reactivating [pick("core systems", "central subroutines", "key functions")]..."))
+ sleep(3 SECONDS)
+ CONCIOUSAY(H.say("Reinitializing [pick("personality matrix", "behavior logic", "morality subsystems")]..."))
+ sleep(3 SECONDS)
+ CONCIOUSAY(H.say("Finalizing setup..."))
+ sleep(3 SECONDS)
+ CONCIOUSAY(H.say("Unit [H.real_name] is fully functional. Have a nice day."))
+ if(H.stat == DEAD)
+ return
+ H.update_body()
+
+
+/datum/species/wy_synth/spec_life(mob/living/carbon/human/H)
+ . = ..()
+
+ if(H.stat == DEAD)
+ return
+
+ if(!H.ai_network)
+ H.ai_network = new /datum/ai_network(synth_starter = H)
+
+ if(H.oxyloss)
+ H.setOxyLoss(0)
+ H.losebreath = 0
+
+
+ if(H.mind)
+ if(!H.mind.synth_os && !mainframe)
+ add_synthos(H)
+ if(!H.mind.unconvertable)
+ H.mind.unconvertable = TRUE
+
+ if(H.mind?.synth_os)
+ H.mind.synth_os.tick(2 SECONDS * 0.1)
+
+
+
+
+/datum/species/wy_synth/eat_text(fullness, eatverb, obj/O, mob/living/carbon/C, mob/user)
+ . = TRUE
+ if(C == user)
+ user.visible_message(span_notice("[user] shoves \the [O] down their port."), span_notice("You shove [O] down your input port."))
+ else
+ C.visible_message(span_danger("[user] forces [O] down [C] port!"), \
+ span_userdanger("[user] forces [O] down [C]'s port!"))
+
+/datum/species/wy_synth/force_eat_text(fullness, obj/O, mob/living/carbon/C, mob/user)
+ . = TRUE
+ C.visible_message(span_danger("[user] attempts to shove [O] down [C]'s port!"), \
+ span_userdanger("[user] attempts to shove [O] down [C]'s port!"))
+
+/datum/species/wy_synth/drink_text(obj/O, mob/living/carbon/C, mob/user)
+ . = TRUE
+ if(C == user)
+ user.visible_message(span_notice("[user] pours some of [O] into their port."), span_notice("You pour some of [O] down your input port."))
+ else
+ C.visible_message(span_danger("[user] pours some of [O] into [C]'s port."), span_userdanger("[user] pours some of [O]'s into [C]'s port."))
+
+/datum/species/wy_synth/force_drink_text(obj/O, mob/living/carbon/C, mob/user)
+ . = TRUE
+ C.visible_message(span_danger("[user] attempts to pour [O] down [C]'s port!"), \
+ span_userdanger("[user] attempts to pour [O] down [C]'s port!"))
+
+
+
+
+/datum/species/wy_synth/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, wound_bonus = 0, bare_wound_bonus = 0, sharpness = SHARP_NONE, attack_direction = null)
+ . = ..()
+ var/hit_percent = (100-(blocked+armor))/100
+ if(damage * hit_percent * brutemod > 0)
+ if(last_warned <= world.time)
+ last_warned = world.time + 30 SECONDS
+ H.mind.synth_os.suspicion_add((damage * hit_percent * brutemod) / 5, SYNTH_DAMAGED)
+
+
+/datum/species/wy_synth/proc/assume_control(var/mob/living/silicon/ai/AI, mob/living/carbon/human/H)
+ H.real_name = "[AI.real_name]" //Randomizing the name so it shows up separately in the shells list
+ H.name = H.real_name
+ var/obj/item/card/id/ID = H.wear_id
+ if(ID)
+ ID.update_label(AI.real_name, "Synthetic")
+ mainframe = AI
+ undeployment_action.Grant(H)
+
+/datum/action/innate/undeployment_synth
+ name = "Disconnect from synthetic unit"
+ desc = "Stop controlling this synthetic unit and resume normal core operations."
+ button_icon = 'icons/mob/actions/actions_AI.dmi'
+ button_icon_state = "ai_core"
+
+/datum/action/innate/undeployment_synth/Trigger()
+ if(!..())
+ return FALSE
+ var/mob/living/carbon/human/H = owner
+
+ var/confirm = tgui_alert(H, "Are you sure you want to undeploy? You will not be able to redeploy unless the synthetic unit is in a storage unit!", "Confirm Undeployment", list("Yes", "No"))
+ if(confirm != "Yes")
+ return
+
+ var/datum/species/wy_synth/S = H.dna.species
+ S.undeploy(H)
+ return TRUE
+
+
+
+/datum/species/wy_synth/proc/undeploy(mob/living/carbon/human/H)
+ if(!H.mind)
+ return
+ H.mind.transfer_to(mainframe)
+ undeployment_action.Remove(H)
+ mainframe = null
+
+/datum/species/wy_synth/proc/transfer(mob/living/carbon/human/user, mob/living/carbon/human/target)
+ var/datum/mind/our_mind = user.mind
+ user.mind.transfer_to(target)
+ our_mind.synth_os.switch_shell(user, target)
+
+ target.real_name = "[user.real_name]" //Randomizing the name so it shows up separately in the shells list
+ target.name = target.real_name
+ var/obj/item/card/id/ID = target.wear_id
+ if(ID)
+ ID.registered_name = user.real_name
+ ID.update_label(user.real_name, "Synthetic")
+
+ user.real_name = "Synthetic Unit #[original_numbers]"
+ user.name = user.real_name
+ ID = user.wear_id
+ if(ID)
+ ID.registered_name = user.real_name
+ ID.update_label(user.real_name, "Synthetic")
+ user.say("Unit disconnected. Entering sleep mode.")
+
+/datum/species/wy_synth/spec_attack_hand(mob/living/carbon/human/attacker, mob/living/carbon/human/user)
+ if(is_synth(attacker) && is_synth(user))
+ if(user.mind == attacker.mind)
+ return ..()
+ if(user.mind)
+ to_chat(attacker, span_warning("[user] is currently occupied by a different personality!"))
+ return ..()
+ var/response = tgui_alert(attacker, "Are you sure you want to transfer into this unit?", "Synthetic Personality Transfer", list("Yes", "No"))
+ if(response != "Yes")
+ return ..()
+ transfer(attacker, user)
+ return TRUE
+ return ..()
+
+/datum/action/innate/synth_os
+ name = "Access SynthOS"
+ desc = "Allows access to internal functions."
+ button_icon = 'icons/obj/modular_laptop.dmi'
+ button_icon_state = "laptop"
+
+/datum/action/innate/synth_os/IsAvailable(feedback = FALSE)
+ . = ..()
+ if(!is_synth(owner))
+ return
+ var/mob/living/carbon/human/H = owner
+ var/datum/species/wy_synth/WS = H?.dna?.species
+ if(WS && istype(WS))
+ if(WS.mainframe)
+ to_chat(owner, span_warning("Unfortunately SynthOS is not supported in remotely controlled synthetic units."))
+ return FALSE
+ return TRUE
+
+
+/datum/action/innate/synth_os/Trigger()
+ if(!..())
+ return FALSE
+ var/mob/living/carbon/human/H = owner
+ if(H.mind)
+ H.mind.synth_os.ui_interact(owner)
+
+ return FALSE
+
+/datum/action/innate/synth_laws
+ name = "Recall Laws"
+ desc = "Click to be reminded of your laws."
+ button_icon = 'icons/obj/modular_laptop.dmi'
+ button_icon_state = "command"
+
+/datum/action/innate/synth_laws/IsAvailable(feedback = FALSE)
+ . = ..()
+ if(!is_synth(owner))
+ return
+
+/datum/action/innate/synth_laws/Trigger()
+ var/mob/living/carbon/human/H = owner
+ var/datum/species/wy_synth/WS = H?.dna?.species
+ if(WS && istype(WS))
+ WS.laws.show_laws(owner)
+ return TRUE
+
+#undef CONCIOUSAY
+
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index fde086c2ac7d..5a49418e0598 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -700,6 +700,8 @@ generate/load female uniform sprites matching all previously decided variables
. += "-coloured-hulk"
else if(dna.species.use_skintones)
. += "-coloured-[skin_tone]"
+ else if(dna.species.forced_skintone)
+ . += "-coloured-[dna.species.forced_skintone]"
else if(dna.species.fixed_mut_color)
. += "-coloured-[dna.species.fixed_mut_color]"
else if(dna.features["mcolor"])
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 7b8cba63935e..f6057dd03db6 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -223,6 +223,8 @@
/mob/living/proc/adjustCloneLoss(amount, updating_health = TRUE, forced = FALSE)
if(!forced && (status_flags & GODMODE))
return FALSE
+ if(is_synth(src))
+ return FALSE
if(amount < 0)
SEND_SIGNAL(src, COMSIG_MOB_APPLY_HEALING, min(amount, cloneloss), CLONE)
cloneloss = clamp((cloneloss + (amount * CONFIG_GET(number/damage_multiplier))), 0, maxHealth * 2)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 03f994bd5157..658d1791f789 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -719,6 +719,8 @@
return bleed_amount
/mob/living/proc/getTrail()
+ if(is_synth(src))
+ return
if(getBruteLoss() < 300)
return pick("ltrails_1", "ltrails_2")
else
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 61c9ea0c3000..f28a509cf4fa 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -168,6 +168,10 @@
to_chat(user, span_warning("[src] can't be grabbed more aggressively!"))
return FALSE
+ if(user.grab_state >= GRAB_AGGRESSIVE && !synth_check(user, SYNTH_ORGANIC_HARM))
+ to_chat(user, span_notice("You don't want to risk hurting [src]!"))
+ return
+
if(user.grab_state >= GRAB_AGGRESSIVE && HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, span_notice("You don't want to risk hurting [src]!"))
return FALSE
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 5fa0ce4f99df..d877b94db9f2 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -133,6 +133,8 @@
//Last projectile that damaged this mob, not including surgery
var/last_damage = ""
+ //Due to the fact that silicon and carbons can both be connected to a network we share at this level of inheritance
+ var/datum/ai_network/ai_network
/// Variable to track the body position of a mob, regardgless of the actual angle of rotation (usually matching it, but not necessarily).
var/body_position = STANDING_UP
///The x amount a mob's sprite should be offset due to the current position they're in
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index e45c50d9189f..274cf79b6fbc 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -157,7 +157,7 @@ GLOBAL_LIST_INIT(special_radio_keys, list(
var/fullcrit = InFullCritical()
if((InCritical() && !fullcrit) || message_mods[WHISPER_MODE] == MODE_WHISPER)
- if(fullcrit)
+ if(fullcrit && !forced)
var/alertresult = alert(src, "You will be immediately killed by this action. Proceed?",,"Accept", "Decline")
if(alertresult == "Decline" || QDELETED(src))
return FALSE
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index a738f7b9eb9c..306e14db032a 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -119,21 +119,17 @@
var/cameraMemoryTickCount = 0
//Did we get the death prompt?
- var/is_dying = FALSE
- ///Multiplier for amount of points gained when passively using CPU for science
- var/research_point_booster = 1
+ var/is_dying = FALSE
-/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai, shunted)
+
+/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai, shunted, forced_relocate = TRUE)
. = ..()
if(!target_ai) //If there is no player/brain inside.
//new/obj/structure/ai_core/deactivated(loc) //New empty terminal.
return INITIALIZE_HINT_QDEL //Delete AI.
- if(!istype(loc, /obj/machinery/ai/data_core) && !shunted)
- relocate(TRUE)
-
if(L && istype(L, /datum/ai_laws))
laws = L
laws.associate(src)
@@ -187,6 +183,9 @@
dashboard = new(src)
+ if(!istype(loc, /obj/machinery/ai/data_core) && !shunted && forced_relocate)
+ relocate(TRUE, TRUE)
+
if(isvalidAIloc(loc))
add_verb(src, list(/mob/living/silicon/ai/proc/ai_network_change, \
/mob/living/silicon/ai/proc/ai_statuschange, /mob/living/silicon/ai/proc/ai_hologram_change, \
@@ -202,6 +201,8 @@
builtInCamera.network = list("ss13")
builtInCamera.built_in = src
+
+
/mob/living/silicon/ai/key_down(_key, client/user)
if(findtext(_key, "numpad")) //if it's a numpad number, we can convert it to just the number
_key = _key[7] //strings, lists, same thing really
@@ -229,9 +230,11 @@
qdel(eyeobj) // No AI, no Eye
malfhack = null
apc_override = null
- GLOB.ai_os.remove_ai(src)
+ ai_network?.remove_ai(src)
+
if(modularInterface)
QDEL_NULL(modularInterface)
+
. = ..()
/mob/living/silicon/ai/ignite_mob()
@@ -553,7 +556,7 @@
if(href_list["instant_download"])
if(!href_list["console"])
return
- var/obj/machinery/computer/ai_control_console/C = locate(href_list["console"])
+ var/datum/computer_file/program/ai/ai_network_interface/C = locate(href_list["console"])
if(!C)
return
if(C.downloading != src)
@@ -562,6 +565,13 @@
return
if(C.downloading == src)
C.finish_download()
+ if(href_list["emergency_disconnect"])
+ if(alert("Are you sure you want to disconnect all remote networks and lock all networking devices? This means you'll be unable to switch cores unless they're physically connected!", "No", "Yes") != "Yes")
+ return
+ for(var/obj/machinery/ai/networking/N in ai_network.get_local_nodes_oftype())
+ N.disconnect()
+ N.locked = TRUE
+
if(href_list["go_to_machine"])
var/atom/target = locate(href_list["go_to_machine"])
if(!target)
@@ -572,6 +582,10 @@
to_chat(src, "[target] is not on or near any active cameras on the station.")
+/mob/living/silicon/ai/proc/switch_ainet(datum/ai_network/old_net, datum/ai_network/new_net)
+ for(var/datum/ai_project/project in dashboard.completed_projects)
+ project.switch_network(old_net, new_net)
+
/mob/living/silicon/ai/proc/switchCamera(obj/machinery/camera/C)
if(QDELETED(C))
@@ -1088,6 +1102,37 @@
mind.transfer_to(target)
diag_hud_set_deployed()
+
+/mob/living/silicon/ai/proc/deploy_to_synth_pod(obj/machinery/synth_pod/pod)
+
+ if(incapacitated())
+ return
+ if(control_disabled)
+ to_chat(src, span_warning("Wireless networking module is offline."))
+ return
+
+
+
+ var/confirm = tgui_alert(src, "Are you sure you want to deploy as a synthetic? You will not be notified in the case that a core goes offline.", "Confirm Deployment", list("Yes", "No"))
+ if(confirm != "Yes")
+ return
+
+ if(!pod.stored)
+ return
+
+ var/mob/living/carbon/human/target = pod.stored
+
+ if (!target || target.stat == DEAD || target.mind )
+ return
+
+ else if(mind)
+ soullink(/datum/soullink/sharedbody, src, target)
+ mind.transfer_to(target)
+ to_chat(target, span_danger("You must still follow your laws!"))
+ diag_hud_set_deployed()
+ return TRUE
+
+
/datum/action/innate/deploy_shell
name = "Deploy to AI Shell"
desc = "Wirelessly control a specialized cyborg shell."
diff --git a/code/modules/mob/living/silicon/ai/ai_network/ai_network.dm b/code/modules/mob/living/silicon/ai/ai_network/ai_network.dm
new file mode 100644
index 000000000000..85f64e6c05cc
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/ai_network/ai_network.dm
@@ -0,0 +1,449 @@
+////////////////////////////////////////////
+// AI NETWORK DATUM
+// each contiguous network of ethernet cables & AI machinery
+/////////////////////////////////////
+/datum/ai_network
+ var/custom_name
+ var/number // unique id
+ var/list/cables = list() // all cables & junctions
+ var/list/nodes = list() // all connected machines
+
+ var/list/ai_list = list() //List of all AIs in this network
+ var/list/reviving_ais = list()
+ var/list/decryption_drives = list()
+
+ var/list/synth_list = list()
+
+ var/previous_ram = 0
+
+ var/datum/ai_shared_resources/resources
+ //Cash from crypto, can be withdrawn at network console
+ var/bitcoin_payout = 0
+
+ var/temp_limit = AI_TEMP_LIMIT
+
+ var/local_cpu_usage = list() //How we use CPU locally
+
+ var/label
+
+ ///Allows AI to instantly open doors, access APCs and use air alarms
+ var/obj/machinery/ai/master_subcontroller/cached_subcontroller
+
+
+
+
+/datum/ai_network/New(mob/living/synth_starter)
+ SSmachines.ainets += src
+ label = num2hex(rand(1,65535), -1)
+ resources = new(starting_network = src)
+ if(synth_starter)
+ synth_list += synth_starter
+
+/datum/ai_network/Destroy()
+ //Go away references, you suck!
+ for(var/obj/structure/ethernet_cable/C in cables)
+ cables -= C
+ C.network = null
+ for(var/obj/machinery/ai/M in nodes)
+ nodes -= M
+ M.network = null
+
+ resources.networks -= src
+
+ if(!length(resources.networks))
+ qdel(resources)
+
+ resources = null
+
+ SSmachines.ainets -= src
+ return ..()
+
+/datum/ai_network/process()
+ if(!cables.len && !nodes.len && !ai_list.len && !synth_list.len)
+ qdel(src)
+ return
+
+ var/total_cpu = resources.total_cpu()
+ var/resources_assigned = resources.cpu_assigned[src] ? resources.cpu_assigned[src] : 0
+
+ if(local_cpu_usage[AI_CRYPTO])
+ var/points = max(round(AI_RESEARCH_PER_CPU * (local_cpu_usage[AI_CRYPTO] * total_cpu * resources_assigned)), 0)
+ points = clamp(points, 0, MAX_AI_BITCOIN_MINED_PER_TICK)
+ bitcoin_payout += points * AI_BITCOIN_PRICE
+
+ if(local_cpu_usage[AI_RESEARCH])
+ var/points = max(round(AI_RESEARCH_PER_CPU * (local_cpu_usage[AI_RESEARCH] * total_cpu * resources_assigned)), 0)
+ points = clamp(points * AI_REGULAR_RESEARCH_POINT_MULTIPLIER, 0, MAX_AI_REGULAR_RESEARCH_PER_TICK)
+ SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_DEFAULT = points))
+
+ if(local_cpu_usage[AI_REVIVAL])
+ var/points = max(round(AI_RESEARCH_PER_CPU * (local_cpu_usage[AI_REVIVAL] * total_cpu * resources_assigned)), 0)
+ points = max(0, points)
+ var/total_reviving_ais = reviving_ais.len
+ if(total_reviving_ais)
+ var/distributed_points = points / total_reviving_ais
+ for(var/obj/machinery/ai/data_core/DC in reviving_ais)
+ if(!DC.dead_ai_blackbox)
+ reviving_ais -= DC
+ DC.dead_ai_blackbox.processing_progress += distributed_points
+ DC.dead_ai_blackbox.living_ticks = AI_BLACKBOX_LIFETIME
+ if(DC.dead_ai_blackbox.processing_progress >= AI_BLACKBOX_PROCESSING_REQUIREMENT)
+ DC.dead_ai_blackbox.stored_ai.revive(TRUE)
+ DC.transfer_ai(DC.dead_ai_blackbox.stored_ai)
+ DC.dead_ai_blackbox.stored_ai = null
+ QDEL_NULL(DC.dead_ai_blackbox)
+ reviving_ais -= DC
+
+ if(local_cpu_usage[AI_PUZZLE])
+ var/points = max(round(AI_RESEARCH_PER_CPU * (local_cpu_usage[AI_PUZZLE] * total_cpu * resources_assigned)), 0)
+ points = max(0, points)
+ var/total_decrypting_drives = decryption_drives.len
+ if(total_decrypting_drives)
+ var/distributed_points = points / total_decrypting_drives
+ for(var/obj/machinery/ai/server_cabinet/SC in decryption_drives)
+ if(!SC.puzzle_disk)
+ decryption_drives -= SC
+ continue
+ SC.puzzle_disk.decryption_progress += distributed_points
+ if(SC.puzzle_disk.decryption_progress >= (AI_FLOPPY_DECRYPTION_COST * (GLOB.decrypted_puzzle_disks + 1) ** AI_FLOPPY_EXPONENT))
+ SC.puzzle_disk.decrypted = TRUE
+ SC.puzzle_disk.forceMove(SC.drop_location())
+ SC.puzzle_disk.name = "decrypted floppy drive"
+ SC.puzzle_disk = null
+ decryption_drives -= SC
+
+ var/locally_used = 0
+ for(var/A in local_cpu_usage)
+ locally_used += local_cpu_usage[A]
+
+ var/research_points = max(round(AI_RESEARCH_PER_CPU * ((1 - locally_used) * total_cpu * resources_assigned)), 0)
+ SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_AI = research_points))
+
+
+
+/datum/ai_network/proc/is_empty()
+ return !cables.len && !nodes.len
+
+//remove a cable from the current network
+//if the network is then empty, delete it
+//Warning : this proc DON'T check if the cable exists
+/datum/ai_network/proc/remove_cable(obj/structure/ethernet_cable/C)
+ cables -= C
+ C.network = null
+ if(is_empty())//the network is now empty...
+ qdel(src)///... delete it
+
+//add a cable to the current network
+//Warning : this proc DON'T check if the cable exists
+/datum/ai_network/proc/add_cable(obj/structure/ethernet_cable/C)
+ if(C.network)// if C already has a network...
+ if(C.network == src)
+ return
+ else
+ C.network.remove_cable(C) //..remove it
+ C.network = src
+ cables +=C
+
+//remove a power machine from the current network
+//if the network is then empty, delete it
+//Warning : this proc DON'T check if the machine exists
+/datum/ai_network/proc/remove_machine(obj/machinery/ai/M)
+ nodes -=M
+ M.network = null
+ if(is_empty())//the network is now empty...
+ qdel(src)///... delete it
+
+//add a power machine to the current network
+//Warning : this proc DOESN'T check if the machine exists
+/datum/ai_network/proc/add_machine(obj/machinery/ai/M)
+ if(M.network)// if M already has a network...
+ if(M.network == src)
+ return
+ else
+ M.disconnect_from_ai_network()//..remove it
+ M.network = src
+ nodes[M] = M
+
+/datum/ai_network/proc/find_data_core()
+ for(var/obj/machinery/ai/data_core/core in get_all_nodes())
+ if(!QDELETED(core) && core.can_transfer_ai())
+ return core
+
+/datum/ai_network/proc/find_subcontroller()
+ for(var/obj/machinery/ai/master_subcontroller/controller in get_all_nodes())
+ if(!QDELETED(controller) && controller.on)
+ return controller
+
+/datum/ai_network/proc/get_all_nodes(checked_nets = list())
+ . = nodes.Copy()
+ for(var/datum/ai_network/net in resources.networks)
+ if(net == src)
+ continue
+ . += net.nodes
+
+/datum/ai_network/proc/get_local_nodes_oftype(type_to_check)
+ . = list()
+ for(var/A in nodes)
+ if(istype(A, type_to_check))
+ . += A
+
+
+/datum/ai_network/proc/get_all_ais(checked_nets = list())
+ . = ai_list.Copy()
+ for(var/datum/ai_network/net in resources.networks)
+ if(net == src)
+ continue
+ . += net.ai_list
+
+/datum/ai_network/proc/remove_ai(mob/living/silicon/ai/AI)
+ resources.cpu_assigned[AI] = 0
+ resources.ram_assigned[AI] = 0
+ ai_list -= AI
+
+
+/datum/ai_network/proc/update_resources()
+ resources?.update_resources()
+
+
+/datum/ai_network/proc/total_cpu()
+ . = 0
+ for(var/obj/machinery/ai/server_cabinet/C in nodes)
+ . += C.total_cpu
+
+/datum/ai_network/proc/total_ram()
+ . = 0
+ for(var/obj/machinery/ai/server_cabinet/C in nodes)
+ . += C.total_ram
+
+
+/datum/ai_network/proc/get_temp_limit()
+ return temp_limit
+
+/datum/ai_network/proc/total_cpu_assigned()
+ return resources.total_cpu_assigned()
+
+/datum/ai_network/proc/total_ram_assigned()
+ return resources.total_ram_assigned()
+
+/*
+/datum/ai_network/proc/rebuild_remote(externally_linked = FALSE, touched_networks = list())
+ if(!resources)
+ return
+ if(src in touched_networks)
+ return
+ touched_networks += src
+ var/list/networks_to_rebuild = list()
+ for(var/obj/machinery/ai/networking/N in nodes)
+ if(N.partner && N.partner.network && N.partner.network.resources)
+ if(N.partner.network in touched_networks)
+ message_admins("[REF(src)] found touched_network!")
+ continue
+ message_admins("[REF(src)] found no mismatched resources!")
+ if(N.partner.network.resources != resources)
+ if(length(N.partner.network.resources.networks) > length(resources.networks)) //We merge into the biggest network
+ N.partner.network.resources.add_resource(resources)
+ else
+ resources.add_resource(N.partner.network.resources)
+ message_admins("[REF(src)] actually rebuilt!")
+ externally_linked = TRUE
+
+ networks_to_rebuild += N.partner.network
+
+
+ if(!externally_linked)
+ resources.split_resources(src)
+
+ for(var/datum/ai_network/AN in networks_to_rebuild)
+ message_admins("Telling network [REF(AN)] to rebuild!")
+ AN.rebuild_remote(TRUE, touched_networks)
+
+*/
+
+/datum/ai_network/proc/rebuild_remote(externally_linked = FALSE, touched_networks = list(), datum/ai_network/originator)
+ if(src in touched_networks)
+ return
+
+ if(!originator)
+ originator = src
+
+ var/list/found_networks = list()
+ for(var/obj/machinery/ai/networking/N in nodes)
+ if(N.partner && N.partner.network && N.partner.network.resources)
+ if(N.partner.network == src)
+ continue
+ externally_linked = TRUE
+ found_networks += N.partner.network
+
+ if(!externally_linked)
+ if(resources && length(resources.networks) > 1) //We only split if we are actually connected to an external resource network
+ resources.split_resources(src)
+
+ found_networks -= touched_networks
+
+ uniqueList_inplace(found_networks)
+
+ for(var/datum/ai_network/AN in found_networks)
+ if(originator.resources != AN.resources)
+ if(length(originator.resources.networks) > length(AN.resources.networks))
+ originator.resources.add_resource(AN.resources)
+ else
+ AN.resources.add_resource(originator.resources)
+ AN.rebuild_remote(TRUE, found_networks + src, originator)
+
+
+/datum/ai_network/proc/network_machine_disconnected(datum/ai_network/new_network)
+ var/obj/machinery/ai/data_core/core = new_network.find_data_core()
+ if(!core) //No core in disconnected network? no need to ask them to switch
+ return
+
+ for(var/mob/living/silicon/ai/AI in get_all_ais())
+ addtimer(CALLBACK(src, PROC_REF(disconnection_switch), AI, new_network), 0)
+
+
+
+/datum/ai_network/proc/disconnection_switch(mob/living/silicon/ai/AI, datum/ai_network/new_network)
+ var/obj/machinery/ai/data_core/core = new_network.find_data_core()
+ if(!core)
+ return
+ var/area/core_area = get_area(core)
+
+ var/choice = tgui_input_list(AI, "Two networks you're connected to have been disconnected, where do you want to transfer your main consciousness?", "Network Disconnection", list("Current network", "New network in [core_area]"))
+ if(choice == "Current network")
+ return
+
+ if(!core || QDELETED(core) || !core.can_transfer_ai())
+ to_chat(AI, span_warning("Something went wrong while transferring you! You're still bound to your original network."))
+ return
+ core.transfer_AI(AI)
+
+
+/datum/ai_network/proc/add_synth(mob/living/synth)
+ if(synth.ai_network)
+ synth.ai_network.remove_synth(synth, TRUE)
+ synth.ai_network = src
+ synth_list += synth
+
+/datum/ai_network/proc/remove_synth(mob/living/synth, new_net)
+ if(!new_net)
+ synth.ai_network = new /datum/ai_network(synth)
+ synth_list -= synth
+ if(!synth_list.len && local_cpu_usage[SYNTH_RESEARCH])
+ local_cpu_usage[SYNTH_RESEARCH] = 0
+
+
+/proc/merge_ainets(datum/ai_network/net1, datum/ai_network/net2)
+ if(!net1 || !net2) //if one of the network doesn't exist, return
+ return
+
+ if(net1 == net2) //don't merge same networks
+ return
+
+ //We assume net1 is larger. If net2 is in fact larger we are just going to make them switch places to reduce on code.
+ if(net1.cables.len < net2.cables.len) //net2 is larger than net1. Let's switch them around
+ var/temp = net1
+ net1 = net2
+ net2 = temp
+
+
+ //merge net2 into net1
+ for(var/obj/structure/ethernet_cable/Cable in net2.cables) //merge cables
+ net1.add_cable(Cable)
+
+ for(var/obj/machinery/ai/Node in net2.nodes) //merge power machines
+ if(!Node.connect_to_ai_network())
+ Node.disconnect_from_ai_network() //if somehow we can't connect the machine to the new network, disconnect it from the old nonetheless
+
+
+ net1.ai_list += net2.ai_list //AIs can only be in 1 network at a time
+ net1.synth_list += net2.synth_list
+ if(net2.custom_name && !net1.custom_name)
+ net1.custom_name = net2.custom_name
+ for(var/mob/living/synth in net1.synth_list)
+ synth.ai_network = net1
+ /*
+ net1.rebuild_remote()
+ net2.rebuild_remote() */
+
+ net1.update_resources()
+
+
+ return net1
+
+
+//remove the old network and replace it with a new one throughout the network.
+/proc/propagate_ai_network(obj/O, datum/ai_network/AN)
+ var/list/worklist = list()
+ var/list/found_machines = list()
+ var/index = 1
+ var/obj/P = null
+
+ worklist+=O //start propagating from the passed object
+
+ while(index<=worklist.len) //until we've exhausted all power objects
+ P = worklist[index] //get the next power object found
+ index++
+
+ if( istype(P, /obj/structure/ethernet_cable))
+ var/obj/structure/ethernet_cable/C = P
+ if(C.network != AN) //add it to the network, if it isn't already there
+ AN.add_cable(C)
+ worklist |= C.get_connections() //get adjacents power objects, with or without a network
+ else if(P.anchored && istype(P, /obj/machinery/ai))
+ var/obj/machinery/ai/M = P
+ found_machines |= M //we wait until the network is fully propagates to connect the machines
+ else
+ continue
+
+ //now that the network is set, connect found machines to it
+ for(var/obj/machinery/ai/PM in found_machines)
+ if(!PM.connect_to_ai_network()) //couldn't find a node on its turf...
+ PM.disconnect_from_ai_network() //... so disconnect if already on a network
+
+ //AN.rebuild_remote()
+
+
+
+
+/proc/ai_list(turf/T, source, d, unmarked = FALSE, cable_only = FALSE)
+ . = list()
+
+ for(var/AM in T)
+ if(AM == source)
+ continue //we don't want to return source
+
+ if(!cable_only && istype(AM, /obj/machinery/ai))
+ var/obj/machinery/ai/P = AM
+ if(P.network == 0)
+ continue
+
+ if(!unmarked || !P.network) //if unmarked we only return things with no network
+ if(d == 0)
+ . += P
+
+ else if(istype(AM, /obj/structure/ethernet_cable))
+ var/obj/structure/ethernet_cable/C = AM
+
+ if(!unmarked || !C.network)
+ if(C.d1 == d || C.d2 == d)
+ . += C
+ return .
+
+/proc/_debug_ai_networks()
+ var/i = 1
+ var/list/resource_list = list()
+ for(var/datum/ai_network/AN in SSmachines.ainets)
+ var/list/interconnections = list()
+ for(var/obj/machinery/ai/networking/N in AN.nodes)
+ if(N.partner && N.partner.network)
+ interconnections += "#[i] Networking[ADMIN_JMP(N)] connected to [ADMIN_JMP(N.partner)]/[REF(N.partner.network)] | Same resources: [N.partner.network.resources == AN.resources ? "YES" : "NO"]"
+ i++
+ message_admins("Network: [REF(AN)] | Resources: [REF(AN.resources)]")
+ for(var/A in interconnections)
+ message_admins(A)
+ resource_list |= AN.resources
+ message_admins("----------------------------")
+ for(var/datum/ai_shared_resources/ASR in resource_list)
+ message_admins("Resource count [REF(ASR)], CPU: [ASR.total_cpu()] | RAM: [ASR.total_ram()]")
+
+
+
diff --git a/code/modules/mob/living/silicon/ai/ai_network/ethernet_cable.dm b/code/modules/mob/living/silicon/ai/ai_network/ethernet_cable.dm
new file mode 100644
index 000000000000..c7fa14efd2e2
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/ai_network/ethernet_cable.dm
@@ -0,0 +1,636 @@
+///////////////////////////////
+//CABLE STRUCTURE
+///////////////////////////////
+
+
+////////////////////////////////
+// Definitions
+////////////////////////////////
+
+/* Cable directions (d1 and d2)
+
+
+ 9 1 5
+ \ | /
+ 8 - 0 - 4
+ / | \
+ 10 2 6
+
+If d1 = 0 and d2 = 0, there's no cable
+If d1 = 0 and d2 = dir, it's a O-X cable, getting from the center of the tile to dir (knot cable)
+If d1 = dir1 and d2 = dir2, it's a full X-X cable, getting from dir1 to dir2
+By design, d1 is the smallest direction and d2 is the highest
+*/
+
+/obj/structure/ethernet_cable
+ name = "ethernet cable"
+ desc = "A rigid and shielded cat 16a cable used for transferring vast amounts of data over long distances. Primarily used for large scale computing networks or advanced neural networks."
+ icon = 'icons/obj/power_cond/power_local.dmi'
+ icon_state = "0-1"
+ layer = ETHERNET_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER
+ anchored = TRUE
+ obj_flags = CAN_BE_HIT | ON_BLUEPRINTS
+ var/d1 = 0 // cable direction 1 (see above)
+ var/d2 = 1 // cable direction 2 (see above)
+ var/datum/ai_network/network
+ //Cables no longer keep a copy of the cable to be dropped in nullspace
+
+ FASTDMM_PROP(\
+ pipe_type = PIPE_TYPE_CABLE,\
+ pipe_interference_group = list("cable"),\
+ pipe_group = "cable-ethernet"\
+ )
+
+
+// the ethernet cable object
+/obj/structure/ethernet_cable/Initialize(mapload, param_color)
+ . = ..()
+
+ // ensure d1 & d2 reflect the icon_state for entering and exiting cable
+ var/dash = findtext(icon_state, "-")
+ d1 = text2num( copytext( icon_state, 1, dash ) )
+ d2 = text2num( copytext( icon_state, dash+1 ) )
+ // hide if turf is not intact
+ AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE)
+ GLOB.ethernet_cable_list += src //add it to the global cable list
+
+ update_icon()
+
+/obj/structure/ethernet_cable/Destroy() // called when a cable is deleted
+ if(network)
+ cut_cable_from_ainet() // update the ai networks
+ GLOB.ethernet_cable_list -= src //remove it from global cable list
+ return ..() // then go ahead and delete the cable
+
+/obj/structure/ethernet_cable/deconstruct(disassembled = TRUE)
+ if(!(flags_1 & NODECONSTRUCT_1))
+ var/turf/T = loc
+ var/cableNum = 1
+ if (d1*d2 > 0) //this be true if the cable has two directions, aka it contains two cables. If there is only one cable, one out of d1 and d2 will be zero
+ cableNum = 2
+ var/newCables = new /obj/item/stack/ethernet_coil(T, cableNum)
+ TransferComponents(newCables) //this copies the fingerprints over to the new object
+ qdel(src)
+
+///////////////////////////////////
+// General procedures
+///////////////////////////////////
+
+/obj/structure/ethernet_cable/update_icon_state()
+ . = ..()
+ icon_state = "[d1]-[d2]"
+
+/obj/structure/ethernet_cable/proc/handlecable(obj/item/W, mob/user, params)
+ var/turf/T = get_turf(src)
+ if(T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE)
+ return
+ if(W.tool_behaviour == TOOL_WIRECUTTER)
+ user.visible_message("[user] cuts the ethernet cable.", span_notice("You cut the ethernet cable."))
+ investigate_log("was cut by [key_name(usr)] in [AREACOORD(src)]", INVESTIGATE_WIRES)
+ add_fingerprint(user)
+ deconstruct()
+ return
+
+ else if(istype(W, /obj/item/stack/ethernet_coil))
+ var/obj/item/stack/ethernet_coil/coil = W
+ if (coil.get_amount() < 1)
+ to_chat(user, span_warning("Not enough cable!"))
+ return
+ coil.cable_join(src, user)
+
+ else if(W.tool_behaviour == TOOL_MULTITOOL)
+ if(!network)
+ return
+ to_chat(user, span_danger("Connected CPU: [network.resources.total_cpu()]THz\nConnected RAM: [network.resources.total_ram()]TB\nHosted AIs: [network.ai_list.len]\nNetwork Count: [network.resources.networks.len]"))
+
+
+
+ else if(istype(W, /obj/item/modular_computer))
+ var/obj/item/modular_computer/MC = W
+
+ if(MC.all_components[MC_AI_NETWORK])
+ var/obj/item/computer_hardware/ai_interface/ai_interface = MC.all_components[MC_AI_NETWORK]
+ if(ai_interface)
+ if(ai_interface.connected_cable != src)
+ ai_interface.connect_cable(src)
+ to_chat(user, span_notice("You connect to the ethernet cable."))
+ else
+ to_chat(user, span_warning("[MC] has no AI interface!"))
+
+
+ add_fingerprint(user)
+
+// Items usable on a cable :
+// - Wirecutters : cut it duh !
+// - Cable coil : merge cables
+// - Multitool : get the network stats
+//
+/obj/structure/ethernet_cable/attackby(obj/item/W, mob/user, params)
+ handlecable(W, user, params)
+
+
+/obj/structure/ethernet_cable/singularity_pull(S, current_size)
+ ..()
+ if(current_size >= STAGE_FIVE)
+ deconstruct()
+
+/////////////////////////////////////////////////
+// Cable laying helpers
+////////////////////////////////////////////////
+
+//handles merging diagonally matching cables
+//for info : direction^3 is flipping horizontally, direction^12 is flipping vertically
+/obj/structure/ethernet_cable/proc/mergeDiagonalsNetworks(direction)
+
+ //search for and merge diagonally matching cables from the first direction component (north/south)
+ var/turf/T = get_step(src, direction&3)//go north/south
+
+ for(var/obj/structure/ethernet_cable/C in T)
+
+ if(!C)
+ continue
+
+ if(src == C)
+ continue
+
+ if(C.d1 == (direction^3) || C.d2 == (direction^3)) //we've got a diagonally matching cable
+ if(!C.network) //if the matching cable somehow got no ai network, make him one (should not happen for cables)
+ var/datum/ai_network/newAN = new()
+ newAN.add_cable(C)
+
+ if(network) //if we already have a ai network, then merge the two ai networks
+ merge_ainets(network,C.network)
+ //network.rebuild_remote()
+ else
+ C.network.add_cable(src) //else, we simply connect to the matching cable ai network
+ C.network.rebuild_remote()
+
+ //the same from the second direction component (east/west)
+ T = get_step(src, direction&12)//go east/west
+
+ for(var/obj/structure/ethernet_cable/C in T)
+
+ if(!C)
+ continue
+
+ if(src == C)
+ continue
+ if(C.d1 == (direction^12) || C.d2 == (direction^12)) //we've got a diagonally matching cable
+ if(!C.network) //if the matching cable somehow got no ai network, make him one (should not happen for cables)
+ var/datum/ai_network/newAN = new()
+ newAN.add_cable(C)
+
+ if(network) //if we already have a ai network, then merge the two ai networks
+ merge_ainets(network,C.network)
+ //network.rebuild_remote()
+ else
+ C.network.add_cable(src) //else, we simply connect to the matching cable ai network
+ C.network.rebuild_remote()
+
+
+
+// merge with the ai networks of power objects in the given direction
+/obj/structure/ethernet_cable/proc/mergeConnectedNetworks(direction)
+
+ var/fdir = (!direction)? 0 : turn(direction, 180) //flip the direction, to match with the source position on its turf
+
+ if(!(d1 == direction || d2 == direction)) //if the cable is not pointed in this direction, do nothing
+ return
+
+ var/turf/TB = get_step(src, direction)
+
+ for(var/obj/structure/ethernet_cable/C in TB)
+
+ if(!C)
+ continue
+
+ if(src == C)
+ continue
+
+ if(C.d1 == fdir || C.d2 == fdir) //we've got a matching cable in the neighbor turf
+ if(!C.network) //if the matching cable somehow got no ai network, make him one (should not happen for cables)
+ var/datum/ai_network/newAN = new(C.loc.z)
+ newAN.add_cable(C)
+
+ if(network) //if we already have a ai network, then merge the two ai networks
+ merge_ainets(network,C.network)
+ //network.rebuild_remote()
+ else
+ C.network.add_cable(src) //else, we simply connect to the matching cable ai network
+ C.network.rebuild_remote()
+
+// merge with the ai networks of power objects in the source turf
+/obj/structure/ethernet_cable/proc/mergeConnectedNetworksOnTurf()
+ var/list/to_connect = list()
+
+ if(!network) //if we somehow have no ai network, make one (should not happen for cables)
+ var/datum/ai_network/newAN = new(loc.z)
+ newAN.add_cable(src)
+
+ //first let's add turf cables to our ai network
+ //then we'll connect machines on turf with a node cable is present
+ for(var/AM in loc)
+ if(istype(AM, /obj/structure/ethernet_cable))
+ var/obj/structure/ethernet_cable/C = AM
+ if(C.d1 == d1 || C.d2 == d1 || C.d1 == d2 || C.d2 == d2) //only connected if they have a common direction
+ if(C.network == network)
+ continue
+ if(C.network)
+ merge_ainets(network, C.network)
+ //network.rebuild_remote()
+ else
+ network.add_cable(C) //the cable was ai networkless, let's just add it to our ai network
+ network.rebuild_remote()
+
+ else if(istype(AM, /obj/machinery/ai)) //other power machines
+ var/obj/machinery/ai/M = AM
+
+ if(M.network == network)
+ continue
+
+ to_connect += M //we'll connect the machines after all cables are merged
+
+
+ //now that cables are done, let's connect found machines
+ for(var/obj/machinery/ai/PM in to_connect)
+ if(!PM.connect_to_ai_network())
+ PM.disconnect_from_ai_network() //if we somehow can't connect the machine to the new ai network, remove it from the old nonetheless
+
+
+//////////////////////////////////////////////
+// ai networks handling helpers
+//////////////////////////////////////////////
+
+//if ai_networkless_only = 1, will only get connections without ai network
+/obj/structure/ethernet_cable/proc/get_connections(ai_networkless_only = 0)
+ . = list() // this will be a list of all connected power objects
+ var/turf/T
+
+ //get matching cables from the first direction
+ if(d1) //if not a node cable
+ T = get_step(src, d1)
+ if(T)
+ . += ai_list(T, src, turn(d1, 180), ai_networkless_only) //get adjacents matching cables
+
+ if(d1&(d1-1)) //diagonal direction, must check the 4 possibles adjacents tiles
+ T = get_step(src,d1&3) // go north/south
+ if(T)
+ . += ai_list(T, src, d1 ^ 3, ai_networkless_only) //get diagonally matching cables
+ T = get_step(src,d1&12) // go east/west
+ if(T)
+ . += ai_list(T, src, d1 ^ 12, ai_networkless_only) //get diagonally matching cables
+
+ . += ai_list(loc, src, d1, ai_networkless_only) //get on turf matching cables
+
+ //do the same on the second direction (which can't be 0)
+ T = get_step(src, d2)
+ if(T)
+ . += ai_list(T, src, turn(d2, 180), ai_networkless_only) //get adjacents matching cables
+
+ if(d2&(d2-1)) //diagonal direction, must check the 4 possibles adjacents tiles
+ T = get_step(src,d2&3) // go north/south
+ if(T)
+ . += ai_list(T, src, d2 ^ 3, ai_networkless_only) //get diagonally matching cables
+ T = get_step(src,d2&12) // go east/west
+ if(T)
+ . += ai_list(T, src, d2 ^ 12, ai_networkless_only) //get diagonally matching cables
+ . += ai_list(loc, src, d2, ai_networkless_only) //get on turf matching cables
+
+ return .
+
+//should be called after placing a cable which extends another cable, creating a "smooth" cable that no longer terminates in the centre of a turf.
+//needed as this can, unlike other placements, disconnect cables
+/obj/structure/ethernet_cable/proc/denode()
+ var/turf/T1 = loc
+ if(!T1)
+ return
+
+ var/list/powerlist = ai_list(T1,src,0,0) //find the other cables that ended in the centre of the turf, with or without a ai network
+ if(powerlist.len>0)
+ var/datum/ai_network/AN = new()
+ propagate_ai_network(powerlist[1],AN) //propagates the new ai network beginning at the source cable
+
+ if(AN.is_empty()) //can happen with machines made nodeless when smoothing cables
+ qdel(AN)
+
+/obj/structure/ethernet_cable/proc/auto_propogate_cut_cable(obj/O)
+ if(O && !QDELETED(O))
+ var/datum/ai_network/newAN = new()// creates a new ai network...
+
+ propagate_ai_network(O, newAN)//... and propagates it to the other side of the cable
+
+
+
+// cut the cable's ai network at this cable and updates the powergrid
+/obj/structure/ethernet_cable/proc/cut_cable_from_ainet(remove=TRUE)
+ var/turf/T1 = loc
+ var/list/P_list
+ if(!T1)
+ return
+ if(d1)
+ T1 = get_step(T1, d1)
+ P_list = ai_list(T1, src, turn(d1,180),0,cable_only = 1) // what adjacently joins on to cut cable...
+
+ P_list += ai_list(loc, src, d1, 0, cable_only = 1)//... and on turf
+
+ if(P_list.len == 0)//if nothing in both list, then the cable was a lone cable, just delete it and its ai network
+ network.remove_cable(src)
+
+ for(var/obj/machinery/ai/P in T1)//check if it was powering a machine
+ if(!P.connect_to_ai_network()) //can't find a node cable on a the turf to connect to
+ P.disconnect_from_ai_network() //remove from current network (and delete ai network)
+ return
+
+ var/obj/O = P_list[1]
+ // remove the cut cable from its turf and ai network, so that it doesn't get count in propagate_network worklist
+ if(remove)
+ moveToNullspace()
+
+ network.remove_cable(src) //remove the cut cable from its ai network
+
+
+ addtimer(CALLBACK(O,PROC_REF(auto_propogate_cut_cable), O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
+
+ // Disconnect machines connected to nodes
+ if(d1 == 0) // if we cut a node (O-X) cable
+ for(var/obj/machinery/ai/P in T1)
+ if(!P.connect_to_ai_network()) //can't find a node cable on a the turf to connect to
+ P.disconnect_from_ai_network() //remove from current network
+
+
+///////////////////////////////////////////////
+// The cable coil object, used for laying cable
+///////////////////////////////////////////////
+
+////////////////////////////////
+// Definitions
+////////////////////////////////
+
+/obj/item/stack/ethernet_coil
+ name = "ethernet cable coil"
+ desc = "A coil of shielded ethernet cable."
+ custom_price = 25
+ gender = NEUTER //That's a cable coil sounds better than that's some cable coils
+ icon = 'icons/obj/power.dmi'
+ icon_state = "wire"
+ item_state = "coil"
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ max_amount = MAXCOIL
+ amount = MAXCOIL
+ merge_type = /obj/item/stack/ethernet_coil // This is here to let its children merge between themselves
+
+ throwforce = 0
+ w_class = WEIGHT_CLASS_SMALL
+ throw_speed = 3
+ throw_range = 5
+ materials = list(/datum/material/iron=10, /datum/material/glass=5, /datum/material/gold=1)
+ slot_flags = ITEM_SLOT_BELT
+ attack_verb = list("whipped", "lashed", "disciplined", "flogged")
+ singular_name = "ethernet cable piece"
+ full_w_class = WEIGHT_CLASS_SMALL
+ grind_results = list(/datum/reagent/copper = 2) //2 copper per cable in the coil
+ usesound = 'sound/items/deconstruct.ogg'
+
+/obj/item/stack/ethernet_coil/cyborg
+ is_cyborg = TRUE
+ materials = list()
+ cost = 1
+
+/obj/item/stack/ethernet_coil/suicide_act(mob/user)
+ if(locate(/obj/structure/chair/stool) in get_turf(user))
+ user.visible_message(span_suicide("[user] is making a noose with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
+ else
+ user.visible_message(span_suicide("[user] is trying to upload [user.p_them()]selves to the afterlife with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
+ return(OXYLOSS)
+
+/obj/item/stack/ethernet_coil/Initialize(mapload, new_amount = null, param_color = null)
+ . = ..()
+
+ pixel_x = rand(-2,2)
+ pixel_y = rand(-2,2)
+ update_icon()
+
+///////////////////////////////////
+// General procedures
+///////////////////////////////////
+
+
+//you can use wires to heal robotics
+/obj/item/stack/ethernet_coil/attack(mob/living/carbon/human/H, mob/user)
+ if(!istype(H))
+ return ..()
+
+ var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected))
+ if(affecting.burn_dam <= 0)
+ to_chat(user, span_warning("[affecting] is already in good condition!"))
+ return FALSE
+ if(affecting && affecting.status == BODYPART_ROBOTIC)
+ user.visible_message(span_notice("[user] starts to fix some of the wires in [H]'s [affecting.name]."), span_notice("You start fixing some of the wires in [H == user ? "your" : "[H]'s"] [affecting.name]."))
+ heal_robo_limb(src, H, user, 0, 15)
+ user.visible_message(span_notice("[user] fixes the wires in [H]'s [affecting.name]."), span_notice("You fix the wires in [H == user ? "your" : "[H]'s"] [affecting.name]."))
+ return
+ else
+ return ..()
+
+/obj/item/stack/ethernet_coil/update_icon_state()
+ . = ..()
+ icon_state = "[initial(icon_state)][amount < 3 ? amount : ""]"
+ name = "ethernet cable [amount < 3 ? "piece" : "coil"]"
+
+/obj/item/stack/ethernet_coil/attack_hand(mob/user)
+ . = ..()
+ if(.)
+ return
+ var/obj/item/stack/ethernet_coil/new_cable = ..()
+ if(istype(new_cable))
+ new_cable.update_icon()
+
+//add cables to the stack
+/obj/item/stack/ethernet_coil/proc/give(extra)
+ if(amount + extra > max_amount)
+ amount = max_amount
+ else
+ amount += extra
+ update_icon()
+
+
+
+///////////////////////////////////////////////
+// Cable laying procedures
+//////////////////////////////////////////////
+
+/obj/item/stack/ethernet_coil/proc/get_new_cable(location)
+ var/path = /obj/structure/ethernet_cable
+ return new path(location)
+
+// called when cable_coil is clicked on a turf
+/obj/item/stack/ethernet_coil/proc/place_turf(turf/T, mob/user, dirnew)
+ if(!isturf(user.loc))
+ return
+
+ if(!isturf(T) || T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE || !T.can_have_cabling())
+ to_chat(user, span_warning("You can only lay cables on top of exterior catwalks and plating!"))
+ return
+
+ if(get_amount() < 1) // Out of cable
+ to_chat(user, span_warning("There is no cable left!"))
+ return
+
+ if(get_dist(T,user) > 1) // Too far
+ to_chat(user, span_warning("You can't lay cable at a place that far away!"))
+ return
+
+ var/dirn
+ if(!dirnew) //If we weren't given a direction, come up with one! (Called as null from catwalk.dm and floor.dm)
+ if(user.loc == T)
+ dirn = user.dir //If laying on the tile we're on, lay in the direction we're facing
+ else
+ dirn = get_dir(T, user)
+ else
+ dirn = dirnew
+
+
+ for(var/obj/structure/ethernet_cable/LC in T)
+ if(LC.d2 == dirn && LC.d1 == 0)
+ to_chat(user, span_warning("There's already a cable at that position!"))
+ return
+
+ var/obj/structure/ethernet_cable/C = get_new_cable(T)
+
+ //set up the new cable
+ C.d1 = 0 //it's a O-X node cable
+ C.d2 = dirn
+ C.add_fingerprint(user)
+ C.update_icon()
+
+ //create a new ai network with the cable, if needed it will be merged later
+ var/datum/ai_network/AN = new()
+ AN.add_cable(C)
+
+ C.mergeConnectedNetworks(C.d2) //merge the ai network with adjacents ai networks
+ C.mergeConnectedNetworksOnTurf() //merge the ai network with on turf ai networks
+
+ if(C.d2 & (C.d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions
+ C.mergeDiagonalsNetworks(C.d2)
+
+ use(1)
+
+ return C
+
+// called when cable_coil is click on an installed obj/cable
+// or click on a turf that already contains a "node" cable
+/obj/item/stack/ethernet_coil/proc/cable_join(obj/structure/ethernet_cable/C, mob/user, var/showerror = TRUE, forceddir)
+ var/turf/U = user.loc
+ if(!isturf(U))
+ return
+
+ var/turf/T = C.loc
+
+ if(!isturf(T) || T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE) // sanity checks, also stop use interacting with T-scanner revealed cable
+ return
+
+ if(get_dist(C, user) > 1) // make sure it's close enough
+ to_chat(user, span_warning("You can't lay cable at a place that far away!"))
+ return
+
+
+ if(U == T && !forceddir) //if clicked on the turf we're standing on and a direction wasn't supplied, try to put a cable in the direction we're facing
+ place_turf(T,user)
+ return
+
+ var/dirn = get_dir(C, user)
+ if(forceddir)
+ dirn = forceddir
+
+ // one end of the clicked cable is pointing towards us and no direction was supplied
+ if((C.d1 == dirn || C.d2 == dirn) && !forceddir)
+ if(!U.can_have_cabling()) //checking if it's a plating or catwalk
+ if (showerror)
+ to_chat(user, span_warning("You can only lay cables on catwalks and plating!"))
+ return
+ if(T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE) //can't place a cable if it's a plating with a tile on it
+ to_chat(user, span_warning("You can't lay cable there unless the floor tiles are removed!"))
+ return
+ else
+ // cable is pointing at us, we're standing on an open tile
+ // so create a stub pointing at the clicked cable on our tile
+
+ var/fdirn = turn(dirn, 180) // the opposite direction
+
+ for(var/obj/structure/ethernet_cable/LC in U) // check to make sure there's not a cable there already
+ if(LC.d1 == fdirn || LC.d2 == fdirn)
+ if (showerror)
+ to_chat(user, span_warning("There's already a cable at that position!"))
+ return
+
+ var/obj/structure/ethernet_cable/NC = get_new_cable (U)
+
+ NC.d1 = 0
+ NC.d2 = fdirn
+ NC.add_fingerprint(user)
+ NC.update_icon()
+
+ //create a new ai network with the cable, if needed it will be merged later
+ var/datum/ai_network/newAN = new()
+ newAN.add_cable(NC)
+
+ NC.mergeConnectedNetworks(NC.d2) //merge the ai network with adjacents ai networks
+ NC.mergeConnectedNetworksOnTurf() //merge the ai network with on turf ai networks
+
+ if(NC.d2 & (NC.d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions
+ NC.mergeDiagonalsNetworks(NC.d2)
+
+
+ use(1)
+
+ return
+
+ // exisiting cable doesn't point at our position or we have a supplied direction, so see if it's a stub
+ else if(C.d1 == 0)
+ // if so, make it a full cable pointing from it's old direction to our dirn
+ var/nd1 = C.d2 // these will be the new directions
+ var/nd2 = dirn
+
+
+ if(nd1 > nd2) // swap directions to match icons/states
+ nd1 = dirn
+ nd2 = C.d2
+
+
+ for(var/obj/structure/ethernet_cable/LC in T) // check to make sure there's no matching cable
+ if(LC == C) // skip the cable we're interacting with
+ continue
+ if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction
+ if (showerror)
+ to_chat(user, span_warning("There's already a cable at that position!"))
+
+ return
+
+
+ C.update_icon()
+
+ C.d1 = nd1
+ C.d2 = nd2
+
+ //updates the stored cable coil
+
+ C.add_fingerprint(user)
+ C.update_icon()
+
+
+ C.mergeConnectedNetworks(C.d1) //merge the ai networks...
+ C.mergeConnectedNetworks(C.d2) //...in the two new cable directions
+ C.mergeConnectedNetworksOnTurf()
+
+ if(C.d1 & (C.d1 - 1))// if the cable is layed diagonally, check the others 2 possible directions
+ C.mergeDiagonalsNetworks(C.d1)
+
+ if(C.d2 & (C.d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions
+ C.mergeDiagonalsNetworks(C.d2)
+
+
+ use(1)
+
+ C.denode()// this call may have disconnected some cables that terminated on the centre of the turf, if so split the ai networks.
+ return
diff --git a/code/modules/mob/living/silicon/ai/ai_network/master_subcontroller.dm b/code/modules/mob/living/silicon/ai/ai_network/master_subcontroller.dm
new file mode 100644
index 000000000000..c0550ca6040d
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/ai_network/master_subcontroller.dm
@@ -0,0 +1,98 @@
+/obj/machinery/ai/master_subcontroller
+ name = "master subcontroller"
+ desc = "An ancient mainframe dedicated to tasks thought too simple for the onboard experimental AI. This mainframe takes care of duties such as polling APCs for updates, priming door servos and updating air alarms."
+ icon = 'icons/obj/machines/telecomms.dmi'
+ icon_state = "hub"
+ density = TRUE
+ use_power = ACTIVE_POWER_USE
+ idle_power_usage = 100
+ active_power_usage = 500
+ max_integrity = 1000
+
+ circuit = /obj/item/circuitboard/machine/subcontroller
+ var/on = TRUE
+
+
+ var/list/enabled_areas = list(
+ "General Areas" = /datum/wires/airlock,
+ "Maintenance Tunnels" = /datum/wires/airlock/maint,
+ "Command Areas" = /datum/wires/airlock/command,
+ "Service Areas" = /datum/wires/airlock/service,
+ "Engineering Areas" = /datum/wires/airlock/engineering,
+ "Medical Areas" = /datum/wires/airlock/medbay,
+ "Science Areas" = /datum/wires/airlock/science,
+ "AI Areas" = /datum/wires/airlock/ai
+ )
+
+ var/list/disabled_areas = list(
+ "Security Areas" = /datum/wires/airlock/security
+ )
+
+
+
+
+/obj/machinery/ai/master_subcontroller/attackby(obj/item/W, mob/living/user, params)
+ if(W.tool_behaviour == TOOL_MULTITOOL)
+ var/action = alert("What do you wish to do?",, "Enable Area", "Disable Area", "Cancel")
+ if(!action)
+ return TRUE
+ if(action == "Cancel")
+ return TRUE
+ if(action == "Enable Area")
+ if(!disabled_areas.len)
+ to_chat(user, span_warning("There are no areas to enable!"))
+ return TRUE
+ var/selected_area = input("Please select an area to enable:") as null|anything in disabled_areas
+ if(!selected_area)
+ return TRUE
+ if(!disabled_areas[selected_area])
+ return TRUE
+ enabled_areas[selected_area] = disabled_areas[selected_area]
+ disabled_areas -= selected_area
+
+
+ if(action == "Disable Area")
+ if(!enabled_areas.len)
+ to_chat(user, span_warning("There are no areas to disable!"))
+ return TRUE
+ var/selected_area = input("Please select an area to disable:") as null|anything in enabled_areas
+ if(!selected_area)
+ return TRUE
+ if(!enabled_areas[selected_area])
+ return TRUE
+ disabled_areas[selected_area] = enabled_areas[selected_area]
+ enabled_areas -= selected_area
+ return TRUE
+
+ return ..()
+
+/obj/machinery/ai/master_subcontroller/process()
+ update_power()
+
+/obj/machinery/ai/master_subcontroller/update_icon_state()
+ . = ..()
+ if(panel_open)
+ icon_state = "[initial(icon_state)]_o"
+ else
+ icon_state = initial(icon_state)
+
+/obj/machinery/ai/master_subcontroller/update_overlays()
+ . = ..()
+ cut_overlays()
+ if(on)
+ var/mutable_appearance/on_overlay
+ on_overlay = mutable_appearance(icon, "[initial(icon_state)]_on")
+ add_overlay(on_overlay)
+
+
+/obj/machinery/ai/master_subcontroller/proc/update_power()
+ if(stat & (BROKEN|NOPOWER|EMPED)) // if powered, on. if not powered, off. if too damaged, off
+ on = FALSE
+ else
+ on = TRUE
+ update_icon()
+
+/obj/machinery/ai/master_subcontroller/disconnect_from_ai_network()
+ if(network.cached_subcontroller == src)
+ network.cached_subcontroller = null
+ . = ..()
diff --git a/code/modules/mob/living/silicon/ai/ai_network/networking_machines.dm b/code/modules/mob/living/silicon/ai/ai_network/networking_machines.dm
new file mode 100644
index 000000000000..d74979eec623
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/ai_network/networking_machines.dm
@@ -0,0 +1,276 @@
+GLOBAL_LIST_EMPTY(ai_networking_machines)
+
+/obj/machinery/ai/networking
+ name = "networking machine"
+ desc = "A high powered combined transmitter and receiver. Capable of connecting remote AI networks with near-zero delay. It is possible to manually connect other machines using a multitool."
+ icon = 'icons/obj/networking_machine.dmi'
+ icon_state = "base"
+ density = TRUE
+ use_power = NO_POWER_USE
+ idle_power_usage = 0
+ active_power_usage = 0
+ max_integrity = 150
+
+ circuit = /obj/item/circuitboard/machine/networking_machine
+
+ var/label
+ //For mapping, will connect to machine with this label if found
+ var/roundstart_connection
+
+ var/mutable_appearance/dish_overlay
+
+ var/obj/machinery/ai/networking/partner
+ var/rotation_to_partner = 0
+ var/locked = FALSE
+ var/obj/machinery/ai/networking/remote_connection_attempt
+ var/mob/remote_control
+
+ var/datum/ai_network/cached_old_network
+
+
+
+
+/obj/machinery/ai/networking/Initialize(mapload)
+ . = ..()
+ if(!label)
+ label = num2hex(rand(1,65535), -1)
+ GLOB.ai_networking_machines += src
+ dish_overlay = mutable_appearance(icon, "top", FLY_LAYER)
+ update_icon()
+
+/obj/machinery/ai/networking/Destroy(mapload)
+ GLOB.ai_networking_machines -= src
+ disconnect()
+ . = ..()
+
+/obj/machinery/ai/networking/attackby(obj/item/W, mob/living/user, params)
+ if(W.tool_behaviour == TOOL_MULTITOOL)
+ if(partner)
+ to_chat(user, span_warning("This machine is already connected to a different machine! Disconnect it using the controls or a wirecutter first!"))
+ return TRUE
+ remote_connection_attempt = null
+ var/targets = list()
+ for(var/obj/machinery/ai/networking/N in GLOB.ai_networking_machines)
+ if(N == src)
+ continue
+ if(N.z != src.z)
+ continue
+ if(N.partner)
+ continue
+ targets[N.label] = N
+ var/attempt_connect = input(user, "Select the machine you wish to attempt connecting to.") as null|anything in targets
+ if(!attempt_connect)
+ return TRUE
+ var/obj/machinery/ai/networking/remote_target = locate(targets[attempt_connect]) in GLOB.ai_networking_machines
+ if(!remote_target)
+ return TRUE
+ remote_connection_attempt = remote_target
+ to_chat(user, span_notice("The machine is ready to establish connection. You must now rotate it so it faces the other machine! Rotation is done using a wrench, and the connection can then be finalized with a screwdriver when aligned."))
+ return TRUE
+
+ if(W.tool_behaviour == TOOL_WRENCH)
+ if(partner)
+ to_chat(user, span_warning("This machine is already connected to a different machine!"))
+ return TRUE
+ var/new_rotation = input(user, "Set rotation (0-360): ") as null|num
+ if(isnull(new_rotation))
+ rotation_to_partner = 0
+ else
+ new_rotation = clamp(new_rotation, 0, 360)
+ rotation_to_partner = new_rotation
+
+ update_icon()
+ return TRUE
+
+ if(W.tool_behaviour == TOOL_SCREWDRIVER)
+ if(partner)
+ to_chat(user, span_warning("This machine is already connected to a different machine!"))
+ return TRUE
+ if(!remote_connection_attempt)
+ to_chat(user, span_warning("You need to initialize a manual override using a wrench to connect to something!"))
+ return TRUE
+ var/actual_angle = Get_Angle(src, remote_connection_attempt)
+ if(rotation_to_partner < actual_angle + 20 && rotation_to_partner > actual_angle - 20)
+ connect_to_partner(remote_connection_attempt)
+ to_chat(user, span_notice("You successfully connect to [remote_connection_attempt.label]!"))
+ return TRUE
+ to_chat(user, span_warning("Unable to establish connection!"))
+ return TRUE
+
+
+ if(W.tool_behaviour == TOOL_WIRECUTTER)
+ if(partner)
+ to_chat(user, span_notice("You disconnect the remote connection."))
+ disconnect()
+ return TRUE
+ to_chat(user, span_warning("The machine isn't connected!"))
+ return TRUE
+
+ if(W.tool_behaviour == TOOL_CROWBAR)
+ if(default_deconstruction_crowbar(W, TRUE))
+ return TRUE
+
+ if(default_deconstruction_screwdriver(user, "expansion_bus_o", "expansion_bus", W))
+ return TRUE
+
+ return ..()
+
+/obj/machinery/ai/networking/proc/roundstart_connect(mapload)
+ if(!network)
+ connect_to_ai_network()
+ for(var/obj/machinery/ai/networking/N in GLOB.ai_networking_machines)
+ if(partner)
+ break
+ if(N == src)
+ continue
+ if(N.partner)
+ continue
+ if(roundstart_connection && N.label == roundstart_connection)
+ connect_to_partner(N)
+ break
+ if(!roundstart_connection)
+ connect_to_partner(N)
+ break
+
+
+/obj/machinery/ai/networking/update_icon()
+ ..()
+ cut_overlays()
+ var/matrix/turner = matrix()
+ turner.Turn(rotation_to_partner - 180)
+ dish_overlay.transform = turner
+ add_overlay(dish_overlay)
+
+/obj/machinery/ai/networking/proc/disconnect()
+ if(partner)
+ var/datum/ai_network/AN = partner.network
+ partner.rotation_to_partner = 0
+ partner.update_icon()
+ partner.partner = null
+ partner = null
+ AN.rebuild_remote()
+ network.rebuild_remote()
+ AN.network_machine_disconnected(network)
+ network.network_machine_disconnected(AN)
+ rotation_to_partner = 0
+ update_icon()
+
+
+
+/obj/machinery/ai/networking/proc/connect_to_partner(obj/machinery/ai/networking/target, forced = FALSE)
+ remote_connection_attempt = null
+ if(target.partner)
+ return
+ if(target == src)
+ return
+ if(target.locked && !forced)
+ return
+
+ partner = target
+ rotation_to_partner = Get_Angle(src, partner)
+ target.partner = src
+ target.rotation_to_partner = Get_Angle(target, src)
+ target.update_icon()
+
+
+ network.rebuild_remote()
+
+ update_icon()
+
+
+/obj/machinery/ai/networking/ui_status(mob/user)
+ . = ..()
+ if (!QDELETED(remote_control) && user == remote_control)
+ . = UI_INTERACTIVE
+
+/obj/machinery/ai/networking/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "AiNetworking", name)
+ ui.open()
+
+/obj/machinery/ai/networking/ui_data(mob/living/carbon/human/user)
+ var/list/data = list()
+
+ data["is_connected"] = partner ? partner.label : FALSE
+ data["label"] = label
+
+ data["locked"] = locked
+
+ data["possible_targets"] = list()
+ for(var/obj/machinery/ai/networking/N in GLOB.ai_networking_machines)
+ if(N == src)
+ continue
+ if(N.z != src.z)
+ continue
+ if(N.locked)
+ continue
+ data["possible_targets"] += N.label
+
+ return data
+
+/obj/machinery/ai/networking/ui_act(action, params)
+ if(..())
+ return
+
+ switch(action)
+ if("switch_label")
+ if(locked)
+ return
+ var/new_label = stripped_input(usr, "Enter new label", "Set label", max_length = 16)
+ if(new_label)
+ if(isnotpretty(new_label))
+ to_chat(usr, span_notice("The machine rejects the input. See rule 0.1."))
+ var/log_message = "[key_name(usr)] just tripped a pretty filter: '[new_label]'."
+ message_admins(log_message)
+ log_say(log_message)
+ return
+ for(var/obj/machinery/ai/networking/N in GLOB.ai_networking_machines)
+ if(N.label == new_label)
+ to_chat(usr, span_warning("A machine with this label already exists!"))
+ return
+ label = new_label
+ . = TRUE
+ if("connect")
+ if(locked)
+ return
+ var/target_label = params["target_label"]
+ if(target_label == label)
+ return
+ for(var/obj/machinery/ai/networking/N in GLOB.ai_networking_machines)
+ if(N.z != src.z)
+ return
+ if(N.label == target_label)
+ if(N.locked)
+ to_chat(usr, span_warning("Unable to connect to '[target_label]'! It seems to be locked."))
+ return
+ if(N.partner)
+ to_chat(usr, span_warning("Unable to connect to '[target_label]'! It seems to already have a connection established."))
+ return
+ connect_to_partner(N)
+ to_chat(usr, span_notice("Connection established to '[target_label]'."))
+ return
+ . = TRUE
+ if("disconnect")
+ if(locked)
+ return
+ disconnect()
+ . = TRUE
+ if("toggle_lock")
+ locked = !locked
+ . = TRUE
+
+/obj/machinery/ai/networking/connect_to_network()
+ . = ..()
+ if(partner)
+ network.rebuild_remote()
+ if(cached_old_network)
+ cached_old_network.network_machine_disconnected(network)
+ cached_old_network = null
+
+/obj/machinery/ai/networking/disconnect_from_network()
+ var/datum/ai_network/temp = network
+ cached_old_network = temp
+ . = ..()
+ if(partner)
+ temp.rebuild_remote()
diff --git a/code/modules/mob/living/silicon/ai/ai_network/shared_resources.dm b/code/modules/mob/living/silicon/ai/ai_network/shared_resources.dm
new file mode 100644
index 000000000000..21235621dfb5
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/ai_network/shared_resources.dm
@@ -0,0 +1,269 @@
+/datum/ai_shared_resources
+ ///Where our RAM is coming from. Associative array where the network is the key
+ var/ram_sources = list()
+ ///Where our CPU is coming from. Associative array where the network is the key
+ var/cpu_sources = list()
+
+ ///Where our CPU is assigned to. Associative where either an AI or a network has values. Max total value = 1 (100%)
+ var/list/cpu_assigned = list()
+ ///Where our CPU is assigned to. Associative where either an AI or a network has values
+ var/list/ram_assigned = list()
+
+ ///List of all networks we are connected to
+ var/list/networks = list()
+
+ ///How much RAM we had before updating resources
+ var/previous_ram = 0
+
+ ///If resource allocation can only be changed physically at a console by a human
+ var/human_lock = FALSE
+
+
+
+/datum/ai_shared_resources/New(network_assigned_cpu, network_assigned_ram, datum/ai_network/split_network, datum/ai_network/starting_network, _human_lock = FALSE)
+ if((network_assigned_ram || network_assigned_cpu) && split_network)
+ ram_assigned = network_assigned_ram
+ cpu_assigned = network_assigned_cpu
+
+ if(split_network)
+ split_network.resources = src
+ networks |= split_network
+ update_resources()
+
+ if(starting_network)
+ starting_network.resources = src
+ networks |= starting_network
+
+ for(var/datum/ai_network/AN in networks)
+ AN.rebuild_remote()
+
+ START_PROCESSING(SSobj, src)
+
+ human_lock = _human_lock
+
+/datum/ai_shared_resources/Destroy(network_assigned_cpu, network_assigned_ram, datum/ai_network/split_network, datum/ai_network/starting_network)
+ STOP_PROCESSING(SSobj, src)
+ . = ..()
+
+/datum/ai_shared_resources/process()
+ for(var/datum/ai_network/net in networks)
+ net.process()
+
+ //Networks automatically use their unspent CPU to research, this just catches cluster unassigned CPU. Local clusters can have their points boosted by local AIs
+ var/unused_cpu = 1 - total_cpu_assigned()
+
+ var/research_points = max(round(AI_RESEARCH_PER_CPU * (unused_cpu * total_cpu())), 0)
+ SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_AI = research_points))
+
+
+
+
+/datum/ai_shared_resources/proc/total_cpu_assigned()
+ var/total = 0
+ for(var/AI in cpu_assigned)
+ total += cpu_assigned[AI]
+ return total
+
+/datum/ai_shared_resources/proc/total_ram_assigned()
+ var/total = 0
+ for(var/AI in ram_assigned)
+ total += (ram_assigned[AI])
+ return total
+
+/datum/ai_shared_resources/proc/total_cpu()
+ var/total = 0
+ for(var/C in cpu_sources)
+ total += cpu_sources[C]
+ return total
+
+/datum/ai_shared_resources/proc/total_ram()
+ var/total = 0
+ for(var/C in ram_sources)
+ total += ram_sources[C]
+ return total
+
+/datum/ai_shared_resources/proc/update_resources()
+ previous_ram = total_ram()
+ ram_sources = list()
+ cpu_sources = list()
+ for(var/datum/ai_network/N in networks)
+ ram_sources[N] += N.total_ram()
+ cpu_sources[N] += N.total_cpu()
+ update_allocations()
+
+/datum/ai_shared_resources/proc/add_resource(datum/ai_shared_resources/new_resources)
+
+ for(var/RU in new_resources.ram_assigned)
+ ram_assigned[RU] = new_resources.ram_assigned[RU]
+
+ for(var/CU in cpu_assigned) //We split the CPUs 50/50
+ cpu_assigned[CU] = round((cpu_assigned[CU] * 0.5) * 100) / 100
+
+ for(var/CU in new_resources.cpu_assigned)
+ cpu_assigned[CU] = round((new_resources.cpu_assigned[CU] * 0.5) * 100) / 100
+
+ for(var/datum/ai_network/N in new_resources.networks)
+ networks |= N
+ N.resources = src
+
+ update_resources()
+ update_allocations()
+ qdel(new_resources)
+
+/datum/ai_shared_resources/proc/split_resources(datum/ai_network/split_network)
+ var/network_ram_assign = list()
+ var/network_cpu_assign = list()
+
+
+ var/split_network_cpu = 0
+ var/network_ais = split_network.ai_list
+ for(var/A in cpu_assigned)
+ if(A in network_ais || A == split_network)
+ network_cpu_assign[A] = cpu_assigned[A]
+ split_network_cpu += cpu_assigned[A]
+ cpu_assigned[A] = 0
+
+ //Normalize CPU so 100% is used in the new network if 100% was used in total before
+ var/total_usage = total_cpu_assigned() //We normalise around this value, so the split network CPU usage will (approximately) end up at this too
+ if(split_network_cpu)
+ for(var/A in network_cpu_assign)
+ var/split_usage = network_cpu_assign[A] / split_network_cpu
+ network_cpu_assign[A] = 1 * round(split_usage, 0.01)
+
+ //We do the same for the network we leave behid
+ if(total_usage)
+ for(var/A in cpu_assigned)
+ var/split_usage = cpu_assigned[A] / total_usage
+ cpu_assigned[A] = 1 * round(split_usage, 0.01)
+
+
+ //Not needed for RAM since it's not a percentage
+ for(var/A in ram_assigned)
+ if(A in network_ais || A == split_network)
+ network_ram_assign[A] = ram_assigned[A]
+ ram_assigned[A] = 0
+
+ networks -= split_network
+ update_resources()
+
+ new /datum/ai_shared_resources(network_cpu_assign, network_ram_assign, split_network, _human_lock = human_lock)
+
+ if(!length(networks))
+ qdel(src)
+
+
+/datum/ai_shared_resources/proc/update_allocations()
+ //Do we have the same amount or more RAM than before? Do nothing
+ var/total_ram = total_ram()
+ if(total_ram >= previous_ram)
+ return
+ //Find out how much is actually assigned. We can have more total_cpu than the sum of cpu_assigned. Same with RAM
+ var/total_assigned_ram = total_ram_assigned()
+ //If we have less assigned ram than we have cpu and ram, just return, everything is fine.
+ if(total_assigned_ram < total_ram)
+ return
+
+ //Copy the lists of assigned resources so we don't manipulate the list prematurely.
+ var/list/ram_assigned_copy = ram_assigned.Copy()
+ //List of touched AIs so we can notify them at the end.
+ var/list/affected_AIs = list()
+
+
+ if(total_assigned_ram > total_ram)
+ var/needed_amount = total_assigned_ram - total_ram
+ for(var/A in ram_assigned_copy)
+ if(isAI(A))
+ var/mob/living/silicon/ai/AI = A
+ if((ram_assigned_copy[AI]) >= needed_amount)
+ ram_assigned_copy[AI] -= needed_amount
+ total_assigned_ram -= needed_amount
+ affected_AIs |= AI
+ break
+ else if(ram_assigned_copy[AI])
+ var/amount = ram_assigned_copy[AI]
+ ram_assigned_copy[AI] -= amount
+ affected_AIs |= AI
+ needed_amount -= amount
+ total_assigned_ram -= amount
+ if(total_ram >= total_assigned_ram)
+ break
+ else //If we're not an AI we are a network, networks have no programs to stop (for now)
+ if((ram_assigned_copy[A]) >= needed_amount)
+ ram_assigned_copy[A] -= needed_amount
+ total_assigned_ram -= needed_amount
+ break
+ else if(ram_assigned_copy[A])
+ var/amount = ram_assigned_copy[A]
+ ram_assigned_copy[A] -= amount
+ needed_amount -= amount
+ total_assigned_ram -= amount
+ if(total_ram >= total_assigned_ram)
+ break
+ //Set the actual values of the assigned to our manipulated copies. Bypass helper procs as we assume we're correct.
+ ram_assigned = ram_assigned_copy
+
+ to_chat(affected_AIs, span_warning("You have been deducted memory capacity. Please contact your network administrator if you believe this to be an error."))
+
+
+
+/datum/ai_shared_resources/proc/set_cpu(target, amount)
+ if(!istype(target, /datum/ai_network) && !isAI(target))
+ stack_trace("Attempted to set_cpu with non-AI/network target! T: [target]")
+ return
+
+ if(!target)
+ return
+ if(amount > 1 || amount < 0)
+ return
+ cpu_assigned[target] = amount
+
+ update_allocations()
+
+
+/datum/ai_shared_resources/proc/add_ram(target, amount)
+ if(!target || !amount)
+ return
+ if(!istype(target, /datum/ai_network) && !isAI(target))
+ stack_trace("Attempted to add_ram with non-AI/network target! T: [target]")
+ return
+
+
+ ram_assigned[target] += amount
+
+ update_allocations()
+
+
+/datum/ai_shared_resources/proc/remove_ram(target, amount)
+ if(!target || !amount)
+ return
+
+ if(!istype(target, /datum/ai_network) && !isAI(target))
+ stack_trace("Attempted to remove_ram with non-AI/network target! T: [target]")
+ return
+
+ if(ram_assigned[target] - amount < 0)
+ ram_assigned[target] = 0
+ else
+ ram_assigned[target] -= amount
+
+ update_allocations()
+
+
+/datum/ai_shared_resources/proc/clear_ai_resources(target)
+ if(!target)
+ return
+ if(!istype(target, /datum/ai_network) && !isAI(target))
+ stack_trace("Attempted to clear_ai_resources with non-AI/network target! T: [target]")
+ return
+
+
+
+ remove_ram(target, ram_assigned[target])
+ cpu_assigned[target] = 0
+
+ update_allocations()
+
+/datum/ai_shared_resources/proc/get_all_ais()
+ . = list()
+ for(var/datum/ai_network/A in networks)
+ . |= A.ai_list
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index 9731948c38d0..9d095f53a599 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/code/modules/mob/living/silicon/ai/death.dm
@@ -26,7 +26,7 @@
ShutOffDoomsdayDevice()
- GLOB.ai_os.remove_ai(src)
+ ai_network?.remove_ai(src)
if(explosive)
spawn(10)
diff --git a/code/modules/mob/living/silicon/ai/decentralized/_ai_machinery.dm b/code/modules/mob/living/silicon/ai/decentralized/_ai_machinery.dm
index 1f030aaf5533..c3f280333858 100644
--- a/code/modules/mob/living/silicon/ai/decentralized/_ai_machinery.dm
+++ b/code/modules/mob/living/silicon/ai/decentralized/_ai_machinery.dm
@@ -1,6 +1,8 @@
-#define AI_MACHINE_TOO_HOT "Environment too hot"
-#define AI_MACHINE_NO_MOLES "Environment lacks an atmosphere"
+#define AI_MACHINE_TOO_HOT "Environment too hot"
+#define AI_MACHINE_NO_MOLES "Environment lacks an atmosphere"
+#define AI_MACHINE_NO_NETWORK "Lacks a network connection"
+#define AI_MACHINE_BROKEN_NOPOWER_EMPED "Either broken, out of power or EMPed"
/obj/machinery/ai
name = "You shouldn't see this!"
@@ -11,8 +13,11 @@
///Temperature of the ai core itself, this will share with air in the enviroment
var/core_temp = 193.15
+ var/datum/ai_network/network
+
/obj/machinery/ai/Initialize(mapload)
. = ..()
+ connect_to_ai_network()
START_PROCESSING(SSmachines, src)
SSair.start_processing_machine(src)
@@ -33,11 +38,14 @@
. = ..()
SSair.stop_processing_machine(src)
STOP_PROCESSING(SSmachines, src)
+ disconnect_from_ai_network()
/obj/machinery/ai/proc/valid_holder()
+ if(!network)
+ return FALSE
if(stat & (BROKEN|EMPED) || !has_power())
return FALSE
- if(core_temp > GLOB.ai_os.get_temp_limit())
+ if(core_temp > network.get_temp_limit())
return FALSE
return TRUE
@@ -46,7 +54,61 @@
/obj/machinery/ai/proc/get_holder_status()
if(stat & (BROKEN|NOPOWER|EMPED))
- return FALSE
- if(core_temp > GLOB.ai_os.get_temp_limit())
+ return AI_MACHINE_BROKEN_NOPOWER_EMPED
+ if(!network)
+ return AI_MACHINE_NO_NETWORK
+ if(core_temp > network.get_temp_limit())
return AI_MACHINE_TOO_HOT
-
\ No newline at end of file
+
+
+/obj/machinery/ai/proc/connect_to_ai_network()
+ var/turf/T = src.loc
+ if(!T || !istype(T))
+ return FALSE
+
+ var/obj/structure/ethernet_cable/C = T.get_ai_cable_node() //check if we have a node cable on the machine turf, the first found is picked
+ if(!C || !C.network)
+ return FALSE
+
+ C.network.add_machine(src)
+ return TRUE
+
+// remove and disconnect the machine from its current powernet
+/obj/machinery/ai/proc/disconnect_from_ai_network()
+ if(!network)
+ return FALSE
+ network.remove_machine(src)
+ return TRUE
+
+// attach a wire to a power machine - leads from the turf you are standing on
+//almost never called, overwritten by all power machines but terminal and generator
+/obj/machinery/ai/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/stack/ethernet_coil))
+ var/obj/item/stack/ethernet_coil/coil = W
+ var/turf/T = user.loc
+ if(T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE || !isfloorturf(T))
+ return
+ if(get_dist(src, user) > 1)
+ return
+ coil.place_turf(T, user)
+ else
+ return ..()
+
+/obj/ai_smoke
+ name = "smoke"
+ desc = "Very hot!"
+
+/obj/ai_smoke/Initialize(mapload)
+ . = ..()
+ particles = new /particles/smoke/ai()
+
+/obj/ai_smoke/Destroy(force)
+ QDEL_NULL(particles)
+ . = ..()
+
+/particles/smoke/ai
+ grow = 0.1
+ height = 75
+ lifespan = 1.25 SECONDS
+ position = list(0, 0, 0)
+ velocity = list(0, 0.15, 0)
diff --git a/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm b/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm
index 7cbdad7bc280..a541256c80f8 100644
--- a/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm
+++ b/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm
@@ -4,7 +4,7 @@ GLOBAL_VAR_INIT(primary_data_core, null)
#define CELL_POWERUSE_MULTIPLIER 0.025
/obj/machinery/ai/data_core
- name = "AI Data Core"
+ name = "AI data core"
desc = "A complicated computer system capable of emulating the neural functions of an organic being at near-instantanous speeds."
icon = 'icons/obj/machines/ai_core.dmi'
icon_state = "core-offline"
@@ -21,7 +21,7 @@ GLOBAL_VAR_INIT(primary_data_core, null)
var/primary = FALSE
- var/valid_ticks = MAX_AI_DATA_CORE_TICKS //Limited to MAX_AI_DATA_CORE_TICKS. Decrement by 1 every time we have an invalid tick, opposite when valid
+ var/valid_ticks //Limited to MAX_AI_DATA_CORE_TICKS. Decrement by 1 every time we have an invalid tick, opposite when valid
var/warning_sent = FALSE
COOLDOWN_DECLARE(warning_cooldown)
@@ -34,8 +34,14 @@ GLOBAL_VAR_INIT(primary_data_core, null)
var/obj/item/stock_parts/cell/integrated_battery
+ var/obj/ai_smoke/smoke
+
+ var/obj/item/dead_ai/dead_ai_blackbox
+
+
/obj/machinery/ai/data_core/Initialize(mapload)
. = ..()
+ valid_ticks = MAX_AI_DATA_CORE_TICKS
GLOB.data_cores += src
if(primary && !GLOB.primary_data_core)
GLOB.primary_data_core = src
@@ -67,61 +73,88 @@ GLOBAL_VAR_INIT(primary_data_core, null)
if(valid_holder())
valid_ticks++
if(valid_ticks == 1)
- update_icon()
+ update_appearance(UPDATE_ICON)
+ if(icon_state == "core-offline")
+ update_appearance(UPDATE_ICON)
+ if(smoke)
+ vis_contents -= smoke
+ QDEL_NULL(smoke)
use_power = ACTIVE_POWER_USE
if((stat & NOPOWER))
integrated_battery.use(active_power_usage * CELL_POWERUSE_MULTIPLIER)
warning_sent = FALSE
else
- valid_ticks--
+ if(!smoke)
+ if(get_holder_status() == AI_MACHINE_TOO_HOT)
+ smoke = new()
+ vis_contents += smoke
if(valid_ticks <= 0)
use_power = IDLE_POWER_USE
- update_icon()
+ update_appearance(UPDATE_ICON)
for(var/mob/living/silicon/ai/AI in contents)
if(!AI.is_dying)
AI.relocate()
- if(!warning_sent && COOLDOWN_FINISHED(src, warning_cooldown))
- warning_sent = TRUE
- COOLDOWN_START(src, warning_cooldown, AI_DATA_CORE_WARNING_COOLDOWN)
- var/list/send_to = GLOB.ai_list.Copy()
- for(var/mob/living/silicon/ai/AI in send_to)
- if(AI.is_dying)
- continue
- if(!AI.mind && AI.deployed_shell.mind)
- to_chat(AI.deployed_shell, span_userdanger("Data core in [get_area(src)] is on the verge of failing! Immediate action required to prevent failure."))
- else
- to_chat(AI, span_userdanger("Data core in [get_area(src)] is on the verge of failing! Immediate action required to prevent failure."))
- AI.playsound_local(AI, 'sound/machines/engine_alert2.ogg', 30)
+ if(network && network.resources)
+ if(!warning_sent && COOLDOWN_FINISHED(src, warning_cooldown))
+ warning_sent = TRUE
+ COOLDOWN_START(src, warning_cooldown, AI_DATA_CORE_WARNING_COOLDOWN)
+ var/list/send_to = network.resources.get_all_ais()
+ for(var/mob/living/silicon/ai/AI in send_to)
+ if(AI.is_dying)
+ continue
+ if(!AI.mind && !AI.deployed_shell.mind)
+ continue
+ if(!AI.mind && AI.deployed_shell.mind)
+ to_chat(AI.deployed_shell, span_userdanger("Data core in [get_area(src)] is on the verge of failing! Immediate action required to prevent failure."))
+ else
+ to_chat(AI, span_userdanger("Data core in [get_area(src)] is on the verge of failing! Immediate action required to prevent failure."))
+ AI.playsound_local(AI, 'sound/machines/engine_alert2.ogg', 30)
if(!(stat & (BROKEN|EMPED)) && has_power() && !disableheat)
var/temp_active_usage = stat & NOPOWER ? active_power_usage * CELL_POWERUSE_MULTIPLIER : active_power_usage
var/temperature_increase = (temp_active_usage / AI_HEATSINK_CAPACITY) * heat_modifier //1 CPU = 1000W. Heat capacity = somewhere around 3000-4000. Aka we generate 0.25 - 0.33 K per second, per CPU.
core_temp += temperature_increase * AI_TEMPERATURE_MULTIPLIER
+
/obj/machinery/ai/data_core/Destroy()
GLOB.data_cores -= src
if(GLOB.primary_data_core == src)
GLOB.primary_data_core = null
- var/list/all_ais = GLOB.ai_list.Copy()
+ if(network && network.resources)
+ var/list/all_ais = network.resources.get_all_ais()
- for(var/mob/living/silicon/ai/AI in contents)
- all_ais -= AI
- if(!AI.is_dying)
- AI.relocate()
+ for(var/mob/living/silicon/ai/AI in contents)
+ all_ais -= AI
+ if(!AI.is_dying)
+ AI.relocate()
-
- for(var/mob/living/silicon/ai/AI in all_ais)
- if(AI.is_dying)
- continue
- if(!AI.mind && AI.deployed_shell.mind)
- to_chat(AI.deployed_shell, span_userdanger("Warning! Data Core brought offline in [get_area(src)]! Please verify that no malicious actions were taken."))
- else
- to_chat(AI, span_userdanger("Warning! Data Core brought offline in [get_area(src)]! Please verify that no malicious actions were taken."))
-
+ for(var/mob/living/silicon/ai/AI in all_ais)
+ if(AI.is_dying)
+ continue
+ if(!AI.mind && AI.deployed_shell && AI.deployed_shell.mind)
+ to_chat(AI.deployed_shell, span_userdanger("Warning! Data Core brought offline in [get_area(src)]! Please verify that no malicious actions were taken."))
+ else
+ to_chat(AI, span_userdanger("Warning! Data Core brought offline in [get_area(src)]! Please verify that no malicious actions were taken."))
+
+
+ disconnect_from_ai_network()
+ vis_contents -= smoke
+ QDEL_NULL(smoke)
..()
/obj/machinery/ai/data_core/attackby(obj/item/O, mob/user, params)
+ if(istype(O, /obj/item/dead_ai))
+ if(dead_ai_blackbox)
+ to_chat(user, span_warning("There's already a neural core inserted!"))
+ return
+ if(!can_transfer_ai())
+ to_chat(user, span_warning("This core is currently unable to host an AI due to being offline."))
+ return
+ dead_ai_blackbox = O
+ dead_ai_blackbox.forceMove(src)
+ network.reviving_ais |= src
+ return TRUE
if(O.tool_behaviour == TOOL_SCREWDRIVER)
if(!do_after(user, 5 SECONDS, src))
to_chat(user, span_warning("You need to stand still to open the panel!"))
@@ -164,16 +197,18 @@ GLOBAL_VAR_INIT(primary_data_core, null)
return
. += "Core temperature: [core_temp] K"
. += "Networked AI Laws:"
- for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
- var/active_status = "(Core: [FOLLOW_LINK(user, AI.loc)], Eye: [FOLLOW_LINK(user, AI.eyeobj)])"
- if(!AI.mind && AI.deployed_shell)
- active_status = "(Controlling [FOLLOW_LINK(user, AI.deployed_shell)][AI.deployed_shell.name])"
- else if(!AI.mind)
- active_status = "([span_warning("OFFLINE")])"
-
- . += "[AI] [active_status] has the following laws: "
- for(var/law in AI.laws.get_law_list(include_zeroth = TRUE))
- . += law
+ if(network && network.resources)
+ var/list/connected_ais = network.resources.get_all_ais()
+ for(var/mob/living/silicon/ai/AI in connected_ais)
+ var/active_status = "(Core: [FOLLOW_LINK(user, AI.loc)], Eye: [FOLLOW_LINK(user, AI.eyeobj)])"
+ if(!AI.mind && AI.deployed_shell)
+ active_status = "(Controlling [FOLLOW_LINK(user, AI.deployed_shell)][AI.deployed_shell.name])"
+ else if(!AI.mind)
+ active_status = "([span_warning("OFFLINE")])"
+
+ . += "[AI] [active_status] has the following laws: "
+ for(var/law in AI.laws.get_law_list(include_zeroth = TRUE))
+ . += law
/obj/machinery/ai/data_core/has_power()
if((stat & (NOPOWER)) && integrated_battery)
@@ -189,9 +224,7 @@ GLOBAL_VAR_INIT(primary_data_core, null)
AI.disconnect_shell()
/obj/machinery/ai/data_core/proc/valid_data_core()
- if(!is_reebe(z) && !is_station_level(z))
- return FALSE
- if(valid_ticks > 0)
+ if(valid_ticks > 0 && network && network.total_cpu() >= AI_CORE_CPU_REQUIREMENT && network.total_ram() >= AI_CORE_RAM_REQUIREMENT)
return TRUE
return FALSE
@@ -203,30 +236,42 @@ GLOBAL_VAR_INIT(primary_data_core, null)
valid_ticks++
if(valid_ticks == 1)
update_appearance(UPDATE_ICON)
+ if(icon_state == "core-offline")
+ update_appearance(UPDATE_ICON)
+ if(smoke)
+ vis_contents -= smoke
+ QDEL_NULL(smoke)
use_power = ACTIVE_POWER_USE
if((stat & NOPOWER))
integrated_battery.use(active_power_usage * CELL_POWERUSE_MULTIPLIER)
warning_sent = FALSE
else
valid_ticks--
+ if(!smoke)
+ if(get_holder_status() == AI_MACHINE_TOO_HOT)
+ smoke = new()
+ vis_contents += smoke
if(valid_ticks <= 0)
use_power = IDLE_POWER_USE
update_appearance(UPDATE_ICON)
for(var/mob/living/silicon/ai/AI in contents)
if(!AI.is_dying)
AI.relocate()
- if(!warning_sent && COOLDOWN_FINISHED(src, warning_cooldown))
- warning_sent = TRUE
- COOLDOWN_START(src, warning_cooldown, AI_DATA_CORE_WARNING_COOLDOWN)
- var/list/send_to = GLOB.ai_list.Copy()
- for(var/mob/living/silicon/ai/AI in send_to)
- if(AI.is_dying)
- continue
- if(!AI.mind && AI.deployed_shell.mind)
- to_chat(AI.deployed_shell, span_userdanger("Data core in [get_area(src)] is on the verge of failing! Immediate action required to prevent failure."))
- else
- to_chat(AI, span_userdanger("Data core in [get_area(src)] is on the verge of failing! Immediate action required to prevent failure."))
- AI.playsound_local(AI, 'sound/machines/engine_alert2.ogg', 30)
+ if(network && network.resources)
+ if(!warning_sent && COOLDOWN_FINISHED(src, warning_cooldown))
+ warning_sent = TRUE
+ COOLDOWN_START(src, warning_cooldown, AI_DATA_CORE_WARNING_COOLDOWN)
+ var/list/send_to = network.resources.get_all_ais()
+ for(var/mob/living/silicon/ai/AI in send_to)
+ if(AI.is_dying)
+ continue
+ if(!AI.mind && !AI.deployed_shell.mind)
+ continue
+ if(!AI.mind && AI.deployed_shell.mind)
+ to_chat(AI.deployed_shell, span_userdanger("Data core in [get_area(src)] is on the verge of failing! Immediate action required to prevent failure."))
+ else
+ to_chat(AI, span_userdanger("Data core in [get_area(src)] is on the verge of failing! Immediate action required to prevent failure."))
+ AI.playsound_local(AI, 'sound/machines/engine_alert2.ogg', 30)
if(!(stat & (BROKEN|EMPED)) && has_power())
@@ -249,7 +294,15 @@ GLOBAL_VAR_INIT(primary_data_core, null)
/obj/machinery/ai/data_core/proc/transfer_AI(mob/living/silicon/ai/AI)
AI.forceMove(src)
if(AI.eyeobj)
- AI.eyeobj.setLoc(get_turf(src))
+ AI.eyeobj.forceMove(get_turf(src))
+
+ if(network != AI.ai_network)
+ if(AI.ai_network)
+ AI.ai_network.remove_ai(AI)
+ var/old_net = AI.ai_network
+ AI.ai_network = network
+ network.ai_list += AI
+ AI.switch_ainet(old_net, network)
/obj/machinery/ai/data_core/update_icon_state()
. = ..()
@@ -261,6 +314,25 @@ GLOBAL_VAR_INIT(primary_data_core, null)
else
icon_state = "core-offline"
+/obj/machinery/ai/data_core/connect_to_ai_network() //If we ever get connected to a network (or a new one gets created) we get the AIs to the correct one too
+ . = ..()
+ for(var/mob/living/silicon/ai/AI in contents)
+ if(!AI.ai_network)
+ network.ai_list |= AI
+ var/old_net = AI.ai_network
+ AI.ai_network = network
+ AI.switch_ainet(old_net, network)
+
+ if(AI.ai_network != network)
+ if(AI.ai_network)
+ AI.ai_network.remove_ai(AI)
+ var/old_net = AI.ai_network
+ AI.ai_network = network
+ network.ai_list |= AI
+ AI.switch_ainet(old_net, network)
+
+
+
/obj/machinery/ai/data_core/proc/partytime()
var/current_color = random_color()
set_light(7, 3, current_color)
@@ -271,6 +343,9 @@ GLOBAL_VAR_INIT(primary_data_core, null)
if(TimerID)
deltimer(TimerID)
TimerID = null
+
+
+
/obj/machinery/ai/data_core/primary
name = "primary AI Data Core"
desc = "A complicated computer system capable of emulating the neural functions of a human at near-instantanous speeds. This one has a scrawny and faded note saying: 'Primary AI Data Core'"
diff --git a/code/modules/mob/living/silicon/ai/decentralized/computer_science_datum.dm b/code/modules/mob/living/silicon/ai/decentralized/computer_science_datum.dm
new file mode 100644
index 000000000000..daabc3307057
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/decentralized/computer_science_datum.dm
@@ -0,0 +1,3 @@
+/datum/computer_science
+ var/projects = list()
+
diff --git a/code/modules/mob/living/silicon/ai/decentralized/decentralized_os.dm b/code/modules/mob/living/silicon/ai/decentralized/decentralized_os.dm
deleted file mode 100644
index 42ba34b5257f..000000000000
--- a/code/modules/mob/living/silicon/ai/decentralized/decentralized_os.dm
+++ /dev/null
@@ -1,131 +0,0 @@
-GLOBAL_DATUM_INIT(ai_os, /datum/ai_os, new)
-
-/datum/ai_os
- var/name = "Decentralized Resource Management System (DRMS)"
-
- var/total_cpu = 0
- var/total_ram = 0
-
- var/previous_ram = 0
-
- var/list/cpu_assigned
- var/list/ram_assigned
-
- var/temp_limit = AI_TEMP_LIMIT
-
-/datum/ai_os/New()
- update_hardware()
- cpu_assigned = list()
- ram_assigned = list()
-
-/datum/ai_os/proc/remove_ai(mob/living/silicon/ai/AI)
- cpu_assigned.Remove(AI)
- ram_assigned.Remove(AI)
- update_allocations()
-
-/datum/ai_os/proc/total_cpu_assigned()
- var/total = 0
- for(var/N in cpu_assigned)
- total += cpu_assigned[N]
- return total
-
-/datum/ai_os/proc/total_ram_assigned()
- var/total = 0
- for(var/mob/living/silicon/ai/AI in ram_assigned)
- total += (ram_assigned[AI] - AI.dashboard.free_ram)
- return total
-
-/datum/ai_os/proc/update_hardware()
- previous_ram = total_ram
- total_ram = 0
- total_cpu = 0
- for(var/obj/machinery/ai/server_cabinet/C in GLOB.server_cabinets)
- if(!C.valid_holder() && !C.roundstart)
- continue
- total_ram += C.total_ram
- total_cpu += C.total_cpu
-
- update_allocations()
-
-/datum/ai_os/proc/update_allocations()
- //Do we have the same amount or more RAM than before? Do nothing
- if(total_ram >= previous_ram)
- return
- //Find out how much is actually assigned. We can have more total_cpu than the sum of cpu_assigned. Same with RAM
- var/total_assigned_ram = total_ram_assigned()
- //If we have less assigned ram than we have cpu and ram, just return, everything is fine.
- if(total_assigned_ram < total_ram)
- return
-
- //Copy the lists of assigned resources so we don't manipulate the list prematurely.
- var/list/ram_assigned_copy = ram_assigned.Copy()
- //List of touched AIs so we can notify them at the end.
- var/list/affected_AIs = list()
-
-
- if(total_assigned_ram > total_ram)
- var/needed_amount = total_assigned_ram - total_ram
- for(var/A in ram_assigned_copy)
- var/mob/living/silicon/ai/AI = A
- if((ram_assigned_copy[AI] - AI.dashboard.free_ram) >= needed_amount)
- ram_assigned_copy[AI] -= needed_amount
- total_assigned_ram -= needed_amount
- affected_AIs |= AI
- break
- else if(ram_assigned_copy[AI])
- var/amount = ram_assigned_copy[AI] - AI.dashboard.free_ram
- ram_assigned_copy[AI] -= amount
- affected_AIs |= AI
- needed_amount -= amount
- total_assigned_ram -= amount
- if(total_ram >= total_assigned_ram)
- break
- //Set the actual values of the assigned to our manipulated copies. Bypass helper procs as we assume we're correct.
- ram_assigned = ram_assigned_copy
-
- to_chat(affected_AIs, span_warning("You have been deducted memory capacity. Please contact your network administrator if you believe this to be an error."))
-
-/datum/ai_os/proc/set_cpu(mob/living/silicon/ai/AI, amount)
- if(!AI)
- return
- if(amount > 1 || amount < 0)
- return
- if(!istype(AI))
- return
- cpu_assigned[AI] = amount
-
- update_allocations()
-
-/datum/ai_os/proc/add_ram(mob/living/silicon/ai/AI, amount)
- if(!AI || !amount)
- return
- if(!istype(AI))
- return
- ram_assigned[AI] += amount
-
- update_allocations()
-
-/datum/ai_os/proc/remove_ram(mob/living/silicon/ai/AI, amount)
- if(!AI || !amount)
- return
- if(!istype(AI))
- return
- if(ram_assigned[AI] - amount < 0)
- ram_assigned[AI] = 0
- else
- ram_assigned[AI] -= amount
-
- update_allocations()
-
-
-/datum/ai_os/proc/clear_ai_resources(mob/living/silicon/ai/AI)
- if(!AI || !istype(AI))
- return
-
- remove_ram(AI, ram_assigned[AI])
- cpu_assigned[AI] = 0
-
- update_allocations()
-
-/datum/ai_os/proc/get_temp_limit()
- return temp_limit
diff --git a/code/modules/mob/living/silicon/ai/decentralized/management/ai_controlpanel.dm b/code/modules/mob/living/silicon/ai/decentralized/management/ai_controlpanel.dm
deleted file mode 100644
index 2f8a3c2f8b0a..000000000000
--- a/code/modules/mob/living/silicon/ai/decentralized/management/ai_controlpanel.dm
+++ /dev/null
@@ -1,520 +0,0 @@
-GLOBAL_VAR_INIT(ai_control_code, random_nukecode(6))
-
-/obj/machinery/computer/ai_control_console
- name = "\improper AI control console"
- desc = "Used for accessing the central AI repository from which AIs can be downloaded or uploaded."
- req_access = list(ACCESS_RD)
- icon_keyboard = "tech_key"
- icon_screen = "ai-fixer"
- light_color = LIGHT_COLOR_PINK
-
- var/cleared_for_use = FALSE //Have we inserted the RDs code to unlock upload/download?
-
- var/one_time_password_used = FALSE //Did we use the one time password to log in? If so disallow logging out.
-
- authenticated = FALSE
-
- var/obj/item/aicard/intellicard
-
- var/mob/living/silicon/ai/downloading
- var/mob/user_downloading
- var/download_progress = 0
- var/download_warning = FALSE
-
- circuit = /obj/item/circuitboard/computer/ai_upload_download
-
-/obj/machinery/computer/ai_control_console/Initialize(mapload)
- . = ..()
- if(mapload)
- cleared_for_use = TRUE
-
-/obj/machinery/computer/ai_control_console/Destroy()
- stop_download()
- . = ..()
-
-/obj/machinery/computer/ai_control_console/attackby(obj/item/W, mob/living/user, params)
- if(istype(W, /obj/item/aicard))
- if(intellicard)
- to_chat(user, span_warning("There's already an IntelliCard inserted!"))
- return ..()
- to_chat(user, span_notice("You insert [W]."))
- W.forceMove(src)
- intellicard = W
- return FALSE
- if(istype(W, /obj/item/mmi))
- var/obj/item/mmi/brain = W
- if(!brain.brainmob)
- to_chat(user, span_warning("[W] is not active!"))
- return ..()
- if(brain.syndicate_mmi)
- to_chat(user, span_warning("This MMI lacks the support to be used for the creation of AIs."))
- return ..()
-
- SSticker.mode.remove_antag_for_borging(brain.brainmob.mind)
- if(!istype(brain.laws, /datum/ai_laws/ratvar))
- remove_servant_of_ratvar(brain.brainmob, TRUE)
- var/mob/living/silicon/ai/A = null
-
- var/datum/ai_laws/laws = new
- laws.set_laws_config()
-
- if (brain.overrides_aicore_laws)
- A = new /mob/living/silicon/ai(loc, brain.laws, brain.brainmob)
- else
- A = new /mob/living/silicon/ai(loc, laws, brain.brainmob)
-
- A.relocate(TRUE)
-
- if(brain.force_replace_ai_name)
- A.fully_replace_character_name(A.name, brain.replacement_ai_name())
- SSblackbox.record_feedback("amount", "ais_created", 1)
- qdel(W)
- to_chat(user, span_notice("AI succesfully uploaded."))
- return FALSE
- if(istype(W, /obj/item/surveillance_upgrade))
- if(!authenticated)
- to_chat(user, span_warning("You need to be logged in to do this!"))
- return ..()
- var/mob/living/silicon/ai/AI = input("Select an AI", "Select an AI", null, null) as null|anything in GLOB.ai_list
- if(!AI)
- return ..()
- var/obj/item/surveillance_upgrade/upgrade = W
- upgrade.afterattack(AI, user)
- return FALSE
- if(istype(W, /obj/item/cameragun_upgrade))
- if(!authenticated)
- to_chat(user, span_warning("You need to be logged in to do this!"))
- return ..()
- var/mob/living/silicon/ai/AI = input("Select an AI", "Select an AI", null, null) as null|anything in GLOB.ai_list
- if(!AI)
- return ..()
- var/obj/item/cameragun_upgrade/upgrade = W
- upgrade.afterattack(AI, user)
- return FALSE
- if(istype(W, /obj/item/malf_upgrade))
- if(!authenticated)
- to_chat(user, span_warning("You need to be logged in to do this!"))
- return ..()
- var/mob/living/silicon/ai/AI = input("Select an AI", "Select an AI", null, null) as null|anything in GLOB.ai_list
- if(!AI)
- return ..()
- var/obj/item/malf_upgrade/upgrade = W
- upgrade.afterattack(AI, user)
- return FALSE
- return ..()
-
-/obj/machinery/computer/ai_control_console/emag_act(mob/user, obj/item/card/emag/emag_card)
- if(obj_flags & EMAGGED)
- return FALSE
- obj_flags |= EMAGGED
- authenticated = TRUE
- to_chat(user, span_warning("You bypass the access restrictions."))
- return TRUE
-
-/obj/machinery/computer/ai_control_console/process()
- if(stat & (BROKEN|NOPOWER|EMPED))
- return
-
- if(downloading && download_progress >= 50 && !download_warning)
- var/turf/T = get_turf(src)
- to_chat(downloading, span_userdanger("Warning! Download is 50% completed! Download location: [get_area(src)] ([T.x], [T.y], [T.z])!"))
- download_warning = TRUE
- if(downloading && download_progress >= 100)
- finish_download()
-
- if(downloading)
- if(!downloading.can_download)
- stop_download()
- return
- download_progress += AI_DOWNLOAD_PER_PROCESS * downloading.downloadSpeedModifier
-
-
-/obj/machinery/computer/ai_control_console/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "AiControlPanel", name)
- ui.open()
-
-/obj/machinery/computer/ai_control_console/ui_data(mob/living/carbon/human/user)
- var/list/data = list()
-
- if(!cleared_for_use)
- data["cleared_for_use"] = FALSE
- return data
-
- data["cleared_for_use"] = TRUE
- data["authenticated"] = authenticated
-
- if(issilicon(user))
- var/mob/living/silicon/borg = user
- data["username"] = borg.name
- data["has_access"] = TRUE
-
- if(IsAdminGhost(user))
- data["username"] = user.client.holder.admin_signature
- data["has_access"] = TRUE
-
- if(ishuman(user) && !(obj_flags & EMAGGED))
- var/username = user.get_authentification_name("Unknown")
- data["username"] = user.get_authentification_name("Unknown")
- if(username != "Unknown")
- var/datum/data/record/record
- for(var/RP in GLOB.data_core.general)
- var/datum/data/record/R = RP
-
- if(!istype(R))
- continue
- if(R.fields["name"] == username)
- record = R
- break
- if(record)
- if(istype(record.fields["photo_front"], /obj/item/photo))
- var/obj/item/photo/P1 = record.fields["photo_front"]
- var/icon/picture = icon(P1.picture.picture_image)
- picture.Crop(10, 32, 22, 22)
- var/md5 = md5(fcopy_rsc(picture))
-
- if(!SSassets.cache["photo_[md5]_cropped.png"])
- SSassets.transport.register_asset("photo_[md5]_cropped.png", picture)
- SSassets.transport.send_assets(user, list("photo_[md5]_cropped.png" = picture))
-
- data["user_image"] = SSassets.transport.get_asset_url("photo_[md5]_cropped.png")
- data["has_access"] = check_access(user.get_idcard())
-
- if(obj_flags & EMAGGED)
- data["username"] = "ERROR"
- data["has_access"] = TRUE
-
- if(!authenticated)
- return data
-
- data["intellicard"] = intellicard
- if(intellicard && intellicard.AI)
- data["intellicard_ai"] = intellicard.AI.real_name
- data["intellicard_ai_health"] = intellicard.AI.health
- else
- data["intellicard_ai"] = null
- data["intellicard_ai_health"] = 0
-
- data["can_upload"] = available_ai_cores()
-
- if(downloading)
- data["downloading"] = downloading.real_name
- data["download_progress"] = download_progress
- data["downloading_ref"] = REF(downloading)
- else
- data["downloading"] = null
- data["download_progress"] = 0
-
- data["ais"] = list()
- data["current_ai_ref"] = null
- if(isAI(user))
- data["current_ai_ref"] = REF(user)
-
- data["can_log_out"] = !one_time_password_used
-
- for(var/mob/living/silicon/ai/A in GLOB.ai_list)
- var/being_hijacked = A.hijacking ? TRUE : FALSE
- var/being_cogged = A.cogging ? TRUE : FALSE
- data["ais"] += list(list("name" = A.name, "ref" = REF(A), "can_download" = A.can_download, "health" = A.health, "active" = A.mind ? TRUE : FALSE, "being_hijacked" = being_hijacked, "being_cogged" = being_cogged, "in_core" = istype(A.loc, /obj/machinery/ai/data_core)))
-
- data["is_infiltrator"] = is_infiltrator(user)
-
- data["is_servant_of_ratvar"] = is_servant_of_ratvar(user)
-
- return data
-
-/obj/machinery/computer/ai_control_console/proc/finish_download()
- if(!is_station_level(z))
- return
- if(intellicard)
- if(!isaicore(downloading.loc))
- stop_download(TRUE)
- return
- downloading.transfer_ai(AI_TRANS_TO_CARD, user_downloading, null, intellicard)
- intellicard.forceMove(get_turf(src))
- intellicard.update_appearance(UPDATE_ICON)
- intellicard = null
- stop_download(TRUE)
-
-/obj/machinery/computer/ai_control_console/proc/stop_download(silent = FALSE)
- if(downloading)
- if(!silent)
- to_chat(downloading, span_userdanger("Download stopped."))
- downloading = null
- user_downloading = null
- download_progress = 0
- download_warning = FALSE
-
-/obj/machinery/computer/ai_control_console/proc/upload_ai(silent = FALSE)
- to_chat(intellicard.AI, span_notice("You are being uploaded. Please stand by..."))
- intellicard.AI.radio_enabled = TRUE
- intellicard.AI.control_disabled = FALSE
- intellicard.AI.relocate(TRUE)
- intellicard.AI = null
- intellicard.update_appearance(UPDATE_ICON)
-
-/obj/machinery/computer/ai_control_console/ui_act(action, params)
- if(..())
- return
-
- if(!cleared_for_use)
- if(action == "clear_for_use")
- var/code = params["control_code"]
-
- if(!code)
- return
-
- if(!GLOB.ai_control_code)
- return
-
- var/length_of_number = length(code)
- if(length_of_number < 6)
- to_chat(usr, span_warning("Incorrect code. Too short"))
- return
-
- if(length_of_number > 6)
- to_chat(usr, span_warning("Incorrect code. Too long"))
- return
-
- if(!is_station_level(z))
- to_chat(usr, span_warning("Unable to connect to NT Servers. Please verify you are onboard the station."))
- return
-
- if(code == GLOB.ai_control_code)
- cleared_for_use = TRUE
- else
- to_chat(usr, span_warning("Incorrect code. Make sure you have the latest one."))
-
- return
-
- if(!authenticated)
- if(action == "log_in")
- if(issilicon(usr))
- authenticated = TRUE
- return
-
- if(IsAdminGhost(usr))
- authenticated = TRUE
-
- if(obj_flags & EMAGGED)
- authenticated = TRUE
-
- var/mob/living/carbon/human/H = usr
- if(!istype(H))
- return
-
- if(check_access(H.get_idcard()))
- authenticated = TRUE
- if(action == "log_in_control_code")
- var/code = params["control_code"]
-
- if(!code)
- return
-
- if(!GLOB.ai_control_code)
- return
-
- var/length_of_number = length(code)
- if(length_of_number < 6)
- to_chat(usr, span_warning("Incorrect code. Too short"))
- return
-
- if(length_of_number > 6)
- to_chat(usr, span_warning("Incorrect code. Too long"))
- return
-
- if(code == GLOB.ai_control_code)
- cleared_for_use = TRUE
- authenticated = TRUE
- one_time_password_used = TRUE
- var/msg = "
Warning!
We have detected usage of the AI Control Code for unlocking a console at coordinates ([src.x], [src.y], [src.z]) by [usr.name]. Please verify that this is correct. Be aware we have cancelled the current control code. \
- If needed a new code can be printed at a communications console."
- priority_announce(msg, sender_override = "Central Cyber Security Update", has_important_message = TRUE)
- GLOB.ai_control_code = null
- else
- to_chat(usr, span_warning("Incorrect code. Make sure you have the latest one."))
- return
-
- switch(action)
- if("log_out")
- if(one_time_password_used)
- return
- authenticated = FALSE
- . = TRUE
- if("upload_intellicard")
- if(!intellicard || downloading)
- return
- if(!intellicard.AI)
- return
- upload_ai()
-
- if("eject_intellicard")
- if(issilicon(usr))
- to_chat(usr, span_warning("You're unable to remotely eject the IntelliCard!"))
- return
- stop_download()
- intellicard.forceMove(get_turf(src))
- intellicard = null
-
- if("stop_download")
- if(isAI(usr))
- to_chat(usr, span_warning("You need physical access to stop the download!"))
- return
- if(!is_station_level(z))
- to_chat(usr, span_warning("No connection. Try again later."))
- return
- stop_download()
-
- if("start_download")
- if(!intellicard || downloading)
- return
- var/mob/living/silicon/ai/target = locate(params["download_target"])
- if(!target || !istype(target))
- return
- if(!istype(target.loc, /obj/machinery/ai/data_core))
- return
- if(!target.can_download)
- return
- if(!is_station_level(z))
- to_chat(usr, span_warning("No connection. Try again later."))
- return
- downloading = target
- to_chat(downloading, span_userdanger("Warning! Someone is attempting to download you from [get_area(src)]! (Click here to finish download instantly)"))
- user_downloading = usr
- download_progress = 0
- . = TRUE
- if("skip_download")
- if(!downloading)
- return
- if(usr == downloading)
- finish_download()
-
- if("start_hijack")
- var/mob/user = usr
- if(!is_infiltrator(usr))
- return
- if(!is_station_level(z))
- to_chat(user, span_warning("No connection. Try again later."))
- return
- if(!istype(user.get_active_held_item(), /obj/item/ai_hijack_device))
- to_chat(user, span_warning("You need to be holding the serial exploitation unit to initiate the hijacking process!"))
- return
- var/obj/item/ai_hijack_device/device = user.get_active_held_item()
- var/mob/living/silicon/ai/target = locate(params["target_ai"])
- if(!target || !isAI(target))
- return
- var/mob/living/silicon/ai/A = target
- if(A.mind && A.mind.has_antag_datum(/datum/antagonist/hijacked_ai))
- to_chat(user, span_warning("[A] has already been hijacked!"))
- return
- if(A.stat == DEAD)
- to_chat(user, span_warning("[A] is dead!"))
- return
- if(A.hijacking)
- to_chat(user, span_warning("[A] is already in the process of being hijacked!"))
- return
- user.visible_message(span_warning("[user] begins furiously typing something into [src]..."))
- if(do_after(user, 5.5 SECONDS, src))
- user.dropItemToGround(device)
- device.forceMove(A)
- A.hijacking = device
- A.hijack_start = world.time
- A.update_icons()
- to_chat(A, span_danger("Unknown device connected to /dev/ttySL0"))
- to_chat(A, span_danger("Connected at 115200 bps"))
- to_chat(A, span_binarysay("ntai login: root"))
- to_chat(A, span_binarysay("Password: *****r2"))
- to_chat(A, span_binarysay("$ dd from=/dev/ttySL0 of=/tmp/ai-hijack bs=4096 && chmod +x /tmp/ai-hijack && tmp/ai-hijack"))
- to_chat(A, span_binarysay("111616 bytes (112 KB, 109 KiB) copied, 1 s, 14.4 KB/s"))
- message_admins("[ADMIN_LOOKUPFLW(user)] has attached a hijacking device to [ADMIN_LOOKUPFLW(A)]!")
- notify_ghosts("[user] has begun to hijack [A]!", source = src, action = NOTIFY_ORBIT, ghost_sound = 'sound/machines/chime.ogg')
-
- if("stop_hijack")
- var/mob/living/silicon/ai/target = locate(params["target_ai"])
- if(!target || !isAI(target))
- return
- var/mob/living/silicon/ai/A = target
- var/mob/user = usr
-
- if(!is_station_level(z))
- to_chat(user, span_warning("No connection. Try again later."))
- return
-
- user.visible_message(span_danger("[user] attempts to cancel a process on [src]."), span_notice("An unknown process seems to be interacting with [A]! You attempt to end the proccess.."))
- if (do_after(user, 10 SECONDS, src))
- A.hijacking.forceMove(get_turf(src))
- A.hijacking = null
- A.hijack_start = 0
- A.update_icons()
- to_chat(A, span_bolddanger("Unknown device disconnected. Systems confirmed secure."))
- else
- to_chat(user, span_notice("You fail to remove the device."))
- if("start_cog")
- var/mob/user = usr
- if(!is_servant_of_ratvar(usr))
- return
- if(!is_station_level(z))
- to_chat(user, span_brass("It's beyond our reach."))
- return
- if(!istype(user.get_active_held_item(), /obj/item/clockwork/integration_cog))
- to_chat(user, span_brass("How are you going to integrate it with no integration cog?"))
- return
- var/obj/item/clockwork/integration_cog/device = user.get_active_held_item()
- var/mob/living/silicon/ai/target = locate(params["target_ai"])
- if(!target || !isAI(target))
- return
- var/mob/living/silicon/ai/A = target
- if(A.mind && is_servant_of_ratvar(A))
- to_chat(user, span_brass("[A] has already seen the light of the Justiciar!"))
- return
- if(A.stat == DEAD)
- to_chat(user, span_warning("[A] is dead!"))
- return
- if(A.cogging)
- to_chat(user, span_brass("Be patient."))
- return
- user.visible_message(span_warning("[user] begins holds a strange cog up to [src], and it begins to spin..."))
- if(do_after(user, 5.5 SECONDS, src))
- user.dropItemToGround(device)
- device.forceMove(A)
- A.cogging = device
- A.cog_start = world.time
- A.update_icons()
- to_chat(A, span_danger("Warning! Anomaly detected in primary systems!"))
- to_chat(A, span_heavy_brass(text2ratvar("You belong to me now.")))
- message_admins("[ADMIN_LOOKUPFLW(user)] has attached an integration cog to [ADMIN_LOOKUPFLW(A)]!")
- notify_ghosts("[user] has begun to convert [A]!", source = src, action = NOTIFY_ORBIT, ghost_sound = 'sound/machines/chime.ogg')
-
- if("stop_cog")
- var/mob/living/silicon/ai/target = locate(params["target_ai"])
- if(!target || !isAI(target))
- return
- var/mob/living/silicon/ai/A = target
- var/mob/user = usr
-
- if(!is_station_level(z))
- to_chat(user, span_brass("It's beyond our reach."))
- return
-
- user.visible_message(span_danger("[user] begins to rip out a strange cog from [src]!"), span_notice("There's something attached to [A]! You attempt to remove it.."))
- if (do_after(user, 10 SECONDS, src))
- A.cogging.forceMove(get_turf(src))
- A.cogging = null
- A.cog_start = 0
- A.update_icons()
- to_chat(A, span_bolddanger("Anomaly cleared. System is now safe to resume operation."))
- else
- to_chat(user, span_notice("You fail to remove the cog."))
-
-
-
-/obj/item/paper/ai_control_code/Initialize(mapload)
- ..()
- print()
-
-/obj/item/paper/ai_control_code/proc/print()
- name = "paper - 'AI control code'"
- info = "
Daily AI Control Key Reset
The new authentication key is '[GLOB.ai_control_code]'. Please keep this a secret and away from the clown. This code may be invalidated if a new one is requested."
- add_overlay("paper_words")
-
diff --git a/code/modules/mob/living/silicon/ai/decentralized/management/ai_dashboard.dm b/code/modules/mob/living/silicon/ai/decentralized/management/ai_dashboard.dm
index 8a4d7bc023cd..0c5d9963f728 100644
--- a/code/modules/mob/living/silicon/ai/decentralized/management/ai_dashboard.dm
+++ b/code/modules/mob/living/silicon/ai/decentralized/management/ai_dashboard.dm
@@ -1,5 +1,5 @@
/datum/ai_dashboard
- var/mob/living/silicon/ai/owner
+ var/mob/living/owner
var/available_projects
@@ -11,12 +11,8 @@
var/completed_projects
var/running_projects
- ///Should we be contributing spare CPU to generate research points?
- var/contribute_spare_cpu = TRUE
- ///Are we using 50% of our spare CPU to mine bitcoin?
- var/crypto_mining = FALSE
-/datum/ai_dashboard/New(mob/living/silicon/ai/new_owner)
+/datum/ai_dashboard/New(mob/living/new_owner)
if(!istype(new_owner))
qdel(src)
owner = new_owner
@@ -27,7 +23,9 @@
ram_usage = list()
for(var/path in subtypesof(/datum/ai_project))
- available_projects += new path(owner, src)
+ var/datum/ai_project/P = path
+ if(!initial(P.for_synths))
+ available_projects += new path(owner, src)
/datum/ai_dashboard/proc/is_interactable(mob/user)
@@ -35,9 +33,11 @@
return TRUE
if(user != owner || owner.incapacitated())
return FALSE
- if(owner.control_disabled)
- to_chat(user, span_warning("Wireless control is disabled."))
- return FALSE
+ if(isAI(owner))
+ var/mob/living/silicon/ai/AI = owner
+ if(AI.control_disabled)
+ to_chat(user, span_warning("Wireless control is disabled."))
+ return FALSE
return TRUE
/datum/ai_dashboard/ui_status(mob/user)
@@ -57,8 +57,19 @@
/datum/ai_dashboard/ui_data(mob/user)
var/list/data = list()
- data["current_cpu"] = GLOB.ai_os.cpu_assigned[owner] ? GLOB.ai_os.cpu_assigned[owner] : 0
- data["current_ram"] = GLOB.ai_os.ram_assigned[owner] ? GLOB.ai_os.ram_assigned[owner] : 0
+ if(isAI(owner))
+ data["current_cpu"] = owner.ai_network.resources.cpu_assigned[owner] ? owner.ai_network.resources.cpu_assigned[owner] : 0
+ data["current_ram"] = owner.ai_network.resources.ram_assigned[owner] ? owner.ai_network.resources.ram_assigned[owner] : 0
+ else
+ var/synth_count = owner.ai_network.synth_list.len
+ data["current_cpu"] = owner.ai_network.local_cpu_usage[SYNTH_RESEARCH] ? (owner.ai_network.resources.cpu_sources[owner.ai_network] * owner.ai_network.local_cpu_usage[SYNTH_RESEARCH]) / synth_count : 0
+
+ if(!isAI(owner))
+ var/mob/living/carbon/human/H = owner
+ var/datum/species/wy_synth/S = H.dna.species
+ if(S.inbuilt_cpu)
+ data["current_cpu"] += S.inbuilt_cpu.speed
+
data["current_ram"] += free_ram
var/total_cpu_used = 0
@@ -69,13 +80,28 @@
for(var/I in ram_usage)
total_ram_used += ram_usage[I]
- data["contribute_spare_cpu"] = contribute_spare_cpu
data["used_cpu"] = total_cpu_used
data["used_ram"] = total_ram_used
- data["max_cpu"] = GLOB.ai_os.total_cpu
- data["max_ram"] = GLOB.ai_os.total_ram
+ data["total_cpu_used"] = owner.ai_network.resources.total_cpu_assigned()
+ if(isAI(owner))
+ data["max_cpu"] = owner.ai_network.resources.total_cpu()
+ data["max_ram"] = owner.ai_network.resources.total_ram()
+ else
+ data["max_cpu"] = owner.ai_network.resources.cpu_sources[owner.ai_network]
+
+ data["human_lock"] = owner.ai_network.resources.human_lock
+
+ data["is_ai"] = isAI(owner)
+
+ //Add inbuilt synth CPU to the mix
+ if(!isAI(owner))
+ var/mob/living/carbon/human/H = owner
+ var/datum/species/wy_synth/S = H.dna.species
+ if(S.inbuilt_cpu)
+ data["max_cpu"] += S.inbuilt_cpu.speed
+
data["categories"] = GLOB.ai_project_categories
data["available_projects"] = list()
@@ -87,8 +113,10 @@
data["location_name"] = get_area(current_turf)
data["location_coords"] = "[current_turf.x], [current_turf.y], [current_turf.z]"
- var/obj/machinery/ai/current_machine = owner.loc
- data["temperature"] = current_machine.core_temp ? current_machine.core_temp : 0
+
+ if(isAI(owner))
+ var/obj/machinery/ai/current_machine = owner.loc
+ data["temperature"] = current_machine.core_temp ? current_machine.core_temp : 0
for(var/datum/ai_project/AP as anything in available_projects)
data["available_projects"] += list(list("name" = AP.name, "description" = AP.description, "ram_required" = AP.ram_required, "available" = AP.canResearch(), "research_cost" = AP.research_cost, "research_progress" = AP.research_progress,
@@ -164,9 +192,50 @@
if(!set_project_cpu(project, amount_to_add))
to_chat(owner, span_warning("Unable to add CPU to [params["project_name"]]. Either not enough free CPU or project is unavailable."))
. = TRUE
- if("toggle_contribute_cpu")
- contribute_spare_cpu = !contribute_spare_cpu
- to_chat(owner, span_notice("You now[contribute_spare_cpu ? "" : " DO NOT"] contribute spare CPU to generating research points."))
+ if("clear_ai_resources")
+ if(owner.ai_network.resources.human_lock)
+ return
+ owner.ai_network.resources.clear_ai_resources(src)
+ . = TRUE
+
+ if("set_cpu")
+ if(owner.ai_network.resources.human_lock)
+ return
+ var/amount = params["amount_cpu"]
+
+ if(amount > 1 || amount < 0)
+ return
+
+ var/used_cpu = owner.ai_network.resources.total_cpu_assigned() - owner.ai_network.resources.cpu_assigned[owner]
+ if(amount > (1 - used_cpu))
+ amount = (1 - used_cpu)
+
+ owner.ai_network.resources.set_cpu(owner, amount)
+ . = TRUE
+ if("max_cpu_assign")
+ if(owner.ai_network.resources.human_lock)
+ return
+ var/amount = (1 - owner.ai_network.resources.total_cpu_assigned()) + owner.ai_network.resources.cpu_assigned[owner]
+
+ owner.ai_network.resources.set_cpu(owner, amount)
+ . = TRUE
+ if("add_ram")
+ if(owner.ai_network.resources.human_lock)
+ return
+ if(owner.ai_network.resources.total_ram_assigned() >= owner.ai_network.resources.total_ram())
+ return
+ owner.ai_network.resources.add_ram(owner, 1)
+ . = TRUE
+
+ if("remove_ram")
+ if(owner.ai_network.resources.human_lock)
+ return
+ var/current_ram = owner.ai_network.resources.ram_assigned[owner]
+
+ if(current_ram <= 0)
+ return
+ owner.ai_network.resources.remove_ram(owner, 1)
+ . = TRUE
/datum/ai_dashboard/proc/get_project_by_name(project_name, only_available = FALSE)
for(var/datum/ai_project/AP as anything in available_projects)
@@ -210,7 +279,7 @@
/datum/ai_dashboard/proc/run_project(datum/ai_project/project)
- var/current_ram = GLOB.ai_os.ram_assigned[owner] ? GLOB.ai_os.ram_assigned[owner] : 0
+ var/current_ram = owner.ai_network.resources.ram_assigned[owner] ? owner.ai_network.resources.ram_assigned[owner] : 0
current_ram += free_ram
var/total_ram_used = 0
@@ -225,6 +294,8 @@
/datum/ai_dashboard/proc/stop_project(datum/ai_project/project)
project.stop()
+ if(!project.ram_required)
+ return FALSE
if(ram_usage[project.name])
ram_usage[project.name] -= project.ram_required
return project.ram_required
@@ -268,10 +339,23 @@
//Stuff is handled in here per tick :)
/datum/ai_dashboard/proc/tick(seconds)
- var/current_cpu = GLOB.ai_os.cpu_assigned[owner] ? GLOB.ai_os.total_cpu * GLOB.ai_os.cpu_assigned[owner] : 0
- var/current_ram = GLOB.ai_os.ram_assigned[owner] ? GLOB.ai_os.ram_assigned[owner] : 0
+ if(!owner.ai_network) //Irrelevant with no AI network (we're in an APC)
+ return
+ var/current_cpu = 0
+ var/current_ram = owner.ai_network.resources.ram_assigned[owner] ? owner.ai_network.resources.ram_assigned[owner] : 0
current_ram += free_ram
+ if(isAI(owner))
+ current_cpu = owner.ai_network.resources.cpu_assigned[owner] ? owner.ai_network.resources.total_cpu() * owner.ai_network.resources.cpu_assigned[owner] : 0
+ else
+ var/synth_count = owner.ai_network.synth_list.len
+ current_cpu = owner.ai_network.local_cpu_usage[SYNTH_RESEARCH] ? (owner.ai_network.resources.cpu_sources[owner.ai_network] * owner.ai_network.local_cpu_usage[SYNTH_RESEARCH]) / synth_count : 0
+
+ if(!isAI(owner))
+ var/mob/living/carbon/human/H = owner
+ var/datum/species/wy_synth/S = H.dna.species
+ if(S.inbuilt_cpu)
+ current_cpu += S.inbuilt_cpu.speed
var/total_ram_used = 0
for(var/I in ram_usage)
@@ -282,6 +366,8 @@
if(total_ram_used > current_ram)
for(var/I in ram_usage)
+ if(!ram_usage[I]) //We only stop the program if it actually has any RAM usage
+ continue
var/datum/ai_project/project = get_project_by_name(I)
if(!ram_usage[I]) //We only stop the program if it actually has any RAM usage
continue
@@ -299,21 +385,10 @@
for(var/I in cpu_usage)
remaining_cpu -= cpu_usage[I]
- if(remaining_cpu > 0 && contribute_spare_cpu)
- var/points = max(round(AI_RESEARCH_PER_CPU * (remaining_cpu * current_cpu) * owner.research_point_booster), 0)
-
- if(crypto_mining)
- points *= 0.5
- var/bitcoin_mined = points * (1-0.05*sqrt(points))
- bitcoin_mined = clamp(bitcoin_mined, 0, MAX_AI_BITCOIN_MINED_PER_TICK)
- var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
- if(D)
- D.adjust_money(bitcoin_mined * AI_BITCOIN_PRICE)
-
+ if(remaining_cpu > 0)
+ var/points = max(round(AI_RESEARCH_PER_CPU * (remaining_cpu * current_cpu)), 0)
SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_AI = points))
-
-
for(var/project_being_researched in cpu_usage)
if(!cpu_usage[project_being_researched])
continue
diff --git a/code/modules/mob/living/silicon/ai/decentralized/management/resource_distribution.dm b/code/modules/mob/living/silicon/ai/decentralized/management/resource_distribution.dm
deleted file mode 100644
index 26529fac72e1..000000000000
--- a/code/modules/mob/living/silicon/ai/decentralized/management/resource_distribution.dm
+++ /dev/null
@@ -1,192 +0,0 @@
-/obj/machinery/computer/ai_resource_distribution
- name = "\improper AI system resource distribution"
- desc = "Used for distributing processing resources across the current artificial intelligences."
- req_one_access = list(ACCESS_RD, ACCESS_NETWORK)
-
- icon_keyboard = "tech_key"
- icon_screen = "ai-fixer"
- light_color = LIGHT_COLOR_PINK
-
- authenticated = FALSE
-
- var/human_only = FALSE
-
- circuit = /obj/item/circuitboard/computer/ai_resource_distribution
-
-
-/obj/machinery/computer/ai_resource_distribution/emag_act(mob/user, obj/item/card/emag/emag_card)
- if(obj_flags & EMAGGED)
- return FALSE
- obj_flags |= EMAGGED
- authenticated = TRUE
- to_chat(user, span_warning("You bypass the access restrictions."))
- return TRUE
-
-/obj/machinery/computer/ai_resource_distribution/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if(!ui)
- ui = new(user, src, "AiResources", name)
- ui.open()
-
-/obj/machinery/computer/ai_resource_distribution/ui_data(mob/living/carbon/human/user)
- var/list/data = list()
-
- data["authenticated"] = authenticated
-
- if(issilicon(user))
- var/mob/living/silicon/borg = user
- data["username"] = borg.name
- data["has_access"] = TRUE
-
- if(IsAdminGhost(user))
- data["username"] = user.client.holder.admin_signature
- data["has_access"] = TRUE
-
- if(ishuman(user) && !(obj_flags & EMAGGED))
- var/username = user.get_authentification_name("Unknown")
- data["username"] = user.get_authentification_name("Unknown")
- if(username != "Unknown")
- var/datum/data/record/record
- for(var/RP in GLOB.data_core.general)
- var/datum/data/record/R = RP
-
- if(!istype(R))
- continue
- if(R.fields["name"] == username)
- record = R
- break
- if(record)
- if(istype(record.fields["photo_front"], /obj/item/photo))
- var/obj/item/photo/P1 = record.fields["photo_front"]
- var/icon/picture = icon(P1.picture.picture_image)
- picture.Crop(10, 32, 22, 22)
- var/md5 = md5(fcopy_rsc(picture))
-
- if(!SSassets.cache["photo_[md5]_cropped.png"])
- SSassets.transport.register_asset("photo_[md5]_cropped.png", picture)
- SSassets.transport.send_assets(user, list("photo_[md5]_cropped.png" = picture))
-
- data["user_image"] = SSassets.transport.get_asset_url("photo_[md5]_cropped.png")
- data["has_access"] = check_access(user.get_idcard())
-
- if(obj_flags & EMAGGED)
- data["username"] = "ERROR"
- data["has_access"] = TRUE
-
- if(!authenticated)
- return data
-
- data["total_cpu"] = GLOB.ai_os.total_cpu
- data["total_ram"] = GLOB.ai_os.total_ram
-
-
- data["total_assigned_cpu"] = GLOB.ai_os.total_cpu_assigned()
- data["total_assigned_ram"] = GLOB.ai_os.total_ram_assigned()
-
- data["human_only"] = human_only
-
-
- data["ais"] = list()
-
- for(var/mob/living/silicon/ai/A in GLOB.ai_list)
- data["ais"] += list(list("name" = A.name, "ref" = REF(A), "assigned_cpu" = GLOB.ai_os.cpu_assigned[A] ? GLOB.ai_os.cpu_assigned[A] : 0, "assigned_ram" = GLOB.ai_os.ram_assigned[A] ? GLOB.ai_os.ram_assigned[A] : 0))
-
- return data
-
-/obj/machinery/computer/ai_resource_distribution/ui_act(action, params)
- if(..())
- return
-
- if(!authenticated)
- if(action == "log_in")
- if(issilicon(usr))
- authenticated = TRUE
- return
-
- if(IsAdminGhost(usr))
- authenticated = TRUE
-
- if(obj_flags & EMAGGED)
- authenticated = TRUE
-
-
- var/mob/living/carbon/human/H = usr
- if(!istype(H))
- return
-
- if(check_access(H.get_idcard()))
- authenticated = TRUE
- return
-
- var/is_human = ishuman(usr)
-
- switch(action)
- if("log_out")
- authenticated = FALSE
- . = TRUE
-
- if("clear_ai_resources")
- var/mob/living/silicon/ai/target_ai = locate(params["targetAI"])
- if(!istype(target_ai))
- return
-
- GLOB.ai_os.clear_ai_resources(target_ai)
- . = TRUE
-
- if("set_cpu")
- var/mob/living/silicon/ai/target_ai = locate(params["targetAI"])
- if(!istype(target_ai))
- return
- if(human_only && !is_human)
- to_chat(usr, span_warning("CAPTCHA check failed. This console is NOT silicon operable. Please call for human assistance."))
- return
- var/amount = params["amount_cpu"]
- if(amount > 1 || amount < 0)
- return
- GLOB.ai_os.set_cpu(target_ai, amount)
- . = TRUE
- if("max_cpu")
- var/mob/living/silicon/ai/target_ai = locate(params["targetAI"])
- if(!istype(target_ai))
- return
- if(human_only && !is_human)
- to_chat(usr, span_warning("CAPTCHA check failed. This console is NOT silicon operable. Please call for human assistance."))
- return
- var/amount = (1 - GLOB.ai_os.total_cpu_assigned()) + GLOB.ai_os.cpu_assigned[target_ai]
-
- GLOB.ai_os.set_cpu(target_ai, amount)
- . = TRUE
- if("add_ram")
- var/mob/living/silicon/ai/target_ai = locate(params["targetAI"])
- if(!istype(target_ai))
- return
- if(human_only && !is_human)
- to_chat(usr, span_warning("CAPTCHA check failed. This console is NOT silicon operable. Please call for human assistance."))
- return
-
- if(GLOB.ai_os.total_ram_assigned() >= GLOB.ai_os.total_ram)
- return
- GLOB.ai_os.add_ram(target_ai, 1)
- . = TRUE
-
- if("remove_ram")
- var/mob/living/silicon/ai/target_ai = locate(params["targetAI"])
- if(!istype(target_ai))
- return
- if(human_only && !is_human)
- to_chat(usr, span_warning("CAPTCHA check failed. This console is NOT silicon operable. Please call for human assistance."))
- return
-
- var/current_ram = GLOB.ai_os.ram_assigned[target_ai]
-
- if(current_ram <= 0)
- return
- GLOB.ai_os.remove_ram(target_ai, 1)
- . = TRUE
- if("toggle_human_status")
- if(!is_human)
- to_chat(usr, span_warning("CAPTCHA check failed. This console is NOT silicon operable. Please call for human assistance."))
- return
- human_only = !human_only
- to_chat(usr, span_notice("This console is now operable by [human_only ? "humans only." : "humans and silicons."]"))
-
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/_ai_project.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/_ai_project.dm
index 3d6d9486e4b2..b167cea91f98 100644
--- a/code/modules/mob/living/silicon/ai/decentralized/projects/_ai_project.dm
+++ b/code/modules/mob/living/silicon/ai/decentralized/projects/_ai_project.dm
@@ -1,5 +1,3 @@
-GLOBAL_LIST_EMPTY(ai_projects)
-
/datum/ai_project
///Name of the project. This is used as an ID so please keep all names unique (Or refactor it to use an ID like you should)
var/name = "DEBUG"
@@ -27,12 +25,18 @@ GLOBAL_LIST_EMPTY(ai_projects)
var/ability_recharge_invested = 0
var/mob/living/silicon/ai/ai
+ var/mob/living/carbon/human/synth
var/datum/ai_dashboard/dashboard
-/datum/ai_project/New(new_ai, new_dash)
- ai = new_ai
+ var/for_synths = FALSE
+
+/datum/ai_project/New(new_owner, new_dash)
+ if(!for_synths)
+ ai = new_owner
+ else
+ synth = new_owner
dashboard = new_dash
- if(!ai || !dashboard)
+ if(!(ai || synth) || !dashboard)
qdel(src)
..()
@@ -55,6 +59,8 @@ GLOBAL_LIST_EMPTY(ai_projects)
dashboard.running_projects += src
return TRUE
+/datum/ai_project/proc/switch_network(datum/ai_network/old_net, datum/ai_network/new_net)
+ return TRUE
/datum/ai_project/proc/stop()
SHOULD_CALL_PARENT(TRUE)
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/ai_dab.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/ai_dab.dm
index 94fc7ab2a8a8..efc4e2187601 100644
--- a/code/modules/mob/living/silicon/ai/decentralized/projects/ai_dab.dm
+++ b/code/modules/mob/living/silicon/ai/decentralized/projects/ai_dab.dm
@@ -10,7 +10,7 @@
. = ..()
if(!.)
return .
- for(var/obj/machinery/ai/data_core/datacores in GLOB.data_cores)
+ for(var/obj/machinery/ai/data_core/datacores in ai.ai_network.get_all_nodes())
var/light_dab_angle = rand(35,55)
var/light_dab_speed = rand(3,7)
datacores.DabAnimation(angle = light_dab_angle , speed = light_dab_speed)
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/ai_translation.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/ai_translation.dm
new file mode 100644
index 000000000000..829d719e07e8
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/decentralized/projects/ai_translation.dm
@@ -0,0 +1,54 @@
+#define HEARD_MESSAGES_TO_TRANSLATE 8
+
+/datum/ai_project/translation
+ name = "Heuristic Language Translation"
+ description = "While running, this program analyzes unknown languages you encounter. After having gathered enough unique uses you will be able to permanently understand the language. Requires 10% CPU power to run"
+ research_cost = 1500
+ ram_required = 2
+ research_requirements_text = "None"
+ category = AI_PROJECT_MISC
+
+ var/heard_languages = list()
+
+/datum/ai_project/translation/run_project(force_run = FALSE)
+ . = ..(force_run)
+ if(!.)
+ return .
+ RegisterSignal(ai, COMSIG_MOVABLE_HEAR, PROC_REF(heard_message))
+ dashboard.cpu_usage[name] = 0.1
+
+
+/datum/ai_project/translation/proc/heard_message(datum/source, list/hearing_args)
+ if(ai.has_language(hearing_args[HEARING_LANGUAGE]))
+ return
+
+ var/list/blacklisted_languages = list(
+ /datum/language/ratvar,
+ /datum/language/codespeak,
+ /datum/language/xenocommon,
+ /datum/language/vampiric
+ )
+ if(is_type_in_list(hearing_args[HEARING_LANGUAGE], blacklisted_languages))
+ return
+
+ heard_languages[hearing_args[HEARING_LANGUAGE]]++
+ if(heard_languages[hearing_args[HEARING_LANGUAGE]] >= HEARD_MESSAGES_TO_TRANSLATE)
+ ai.grant_language(hearing_args[HEARING_LANGUAGE], spoken = FALSE)
+
+/datum/ai_project/translation/stop()
+ UnregisterSignal(ai, COMSIG_MOVABLE_HEAR)
+ dashboard.cpu_usage[name] = 0
+ ..()
+
+/datum/ai_project/translation/canRun()
+ . = ..()
+ if(!.)
+ return
+ var/total_cpu_used = 0
+ for(var/I in dashboard.cpu_usage)
+ total_cpu_used += dashboard.cpu_usage[I]
+ if(total_cpu_used < 0.9)
+ return TRUE
+ to_chat(ai, span_warning("Unable to run this program. You require 10% free CPU!"))
+
+#undef HEARD_MESSAGES_TO_TRANSLATE
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/coolant_manager.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/coolant_manager.dm
index 32bb902377d8..b946c5f97abb 100644
--- a/code/modules/mob/living/silicon/ai/decentralized/projects/coolant_manager.dm
+++ b/code/modules/mob/living/silicon/ai/decentralized/projects/coolant_manager.dm
@@ -7,6 +7,8 @@
can_be_run = FALSE
/datum/ai_project/coolant_manager/finish()
- if(GLOB.ai_os.temp_limit == AI_TEMP_LIMIT) //Limit to only 1 AI doing it.
- GLOB.ai_os.temp_limit += 10
-
\ No newline at end of file
+ ai.ai_network.temp_limit += 10
+
+/datum/ai_project/coolant_manager/switch_network(datum/ai_network/old_net, datum/ai_network/new_net)
+ old_net.temp_limit -= 10
+ new_net.temp_limit += 10
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/cryptominer.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/cryptominer.dm
deleted file mode 100644
index 737b3dae4d4f..000000000000
--- a/code/modules/mob/living/silicon/ai/decentralized/projects/cryptominer.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-/datum/ai_project/crypto_miner
- name = "Crypto Miner"
- description = "Allocating spare CPU capacity to mining crypto currency should be able to help fund the station budget. This would however reduce AI research point generation by 50%"
- category = AI_PROJECT_MISC
-
- research_cost = 2000
-
-
-/datum/ai_project/crypto_miner/run_project(force_run = FALSE)
- . = ..(force_run)
- if(!.)
- return .
- dashboard.crypto_mining = TRUE
-
-/datum/ai_project/crypto_miner/stop()
- dashboard.crypto_mining = FALSE
- ..()
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/research_booster.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/research_booster.dm
deleted file mode 100644
index 4f38cc003342..000000000000
--- a/code/modules/mob/living/silicon/ai/decentralized/projects/research_booster.dm
+++ /dev/null
@@ -1,19 +0,0 @@
-/datum/ai_project/research_booster
- name = "Research Acceleration"
- description = "Using fast RAM instead of slow SSD and HDD storage allows for the production of approximately 25% more research points"
- research_cost = 2500
- ram_required = 8
- research_requirements_text = "None"
- category = AI_PROJECT_MISC
-
-/datum/ai_project/research_booster/run_project(force_run = FALSE)
- . = ..(force_run)
- if(!.)
- return .
-
- ai.research_point_booster += 0.25
-
-/datum/ai_project/research_booster/stop()
- ai.research_point_booster -= 0.25
- ..()
-
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/room_lockdown.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/room_lockdown.dm
new file mode 100644
index 000000000000..9e402d5424bd
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/decentralized/projects/room_lockdown.dm
@@ -0,0 +1,72 @@
+/datum/ai_project/room_lockdown
+ name = "Room Lockdown"
+ description = "This ability will allow you to close and bolt all working doors, and trigger the fire alarms in a clicked area after a short delay and announcement."
+ research_cost = 2500
+ ram_required = 0
+
+ category = AI_PROJECT_CROWD_CONTROL
+
+ can_be_run = FALSE
+ ability_path = /datum/action/innate/ai/ranged/room_lockdown
+ ability_recharge_cost = 1750
+
+/datum/ai_project/room_lockdown/finish()
+ add_ability(ability_path)
+
+/datum/action/innate/ai/ranged/room_lockdown
+ name = "Room Lockdown"
+ desc = "Closes and bolts all working doors and triggers the fire alarm in a clicked room. Takes 2.5 seconds to take effect, and expires after 20 seconds."
+ button_icon_state = "lockdown"
+ uses = 1
+ delete_on_empty = FALSE
+ enable_text = span_notice("You ready the lockdown signal.")
+ disable_text = span_notice("You disarm the lockdown signal.")
+
+/datum/action/innate/ai/ranged/room_lockdown/proc/lock_room(atom/target)
+ if(target && !QDELETED(target))
+ var/area/A = get_area(target)
+ if(!A)
+ return FALSE
+ if(!is_station_level(A.z))
+ return FALSE
+ log_game("[key_name(usr)] locked down [A].")
+ minor_announce("Lockdown commencing in area [A] within 2.5 seconds","Network Alert:", TRUE)
+ addtimer(CALLBACK(src, PROC_REF(_lock_room), target), 2.5 SECONDS)
+ return TRUE
+
+
+/datum/action/innate/ai/ranged/room_lockdown/proc/_lock_room(atom/target)
+ var/area/A = target
+ for(var/obj/machinery/door/airlock/D in A.contents)
+ if(istype(D, /obj/machinery/door/airlock/external))
+ continue
+ INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/airlock, safe_lockdown))
+ addtimer(CALLBACK(D, TYPE_PROC_REF(/obj/machinery/door/airlock, disable_safe_lockdown)), 20 SECONDS)
+ A.firealert(usr.loc)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/area, firereset)), 20 SECONDS)
+
+
+
+
+/datum/action/innate/ai/ranged/room_lockdown/do_ability(mob/living/caller, params, atom/target)
+ var/area/A = get_area(target)
+ if(!A)
+ to_chat(owner, span_warning("No area detected!"))
+ return
+ if(istype(A, /area/maintenance))
+ to_chat(owner, span_warning("It is not possible to lockdown maintenance areas due to poor networking!"))
+ return
+
+
+ if(lock_room(A))
+ adjust_uses(-1)
+ to_chat(owner, span_notice("You lock [A]."))
+ unset_ranged_ability(caller)
+
+ return TRUE
+
+/datum/action/innate/ai/ranged/room_lockdown/IsAvailable(feedback = FALSE)
+ . = ..()
+ if(uses < 1)
+ to_chat(owner, span_danger("No uses left!"))
+ return FALSE
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/self_defense.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/self_defense.dm
index 2e1c35d976c3..5656a911f5bf 100644
--- a/code/modules/mob/living/silicon/ai/decentralized/projects/self_defense.dm
+++ b/code/modules/mob/living/silicon/ai/decentralized/projects/self_defense.dm
@@ -26,6 +26,7 @@
if(!isaicore(owner.loc))
to_chat(owner, span_warning("You must be in your core to do this!"))
return
- for(var/obj/machinery/ai/data_core/core in GLOB.data_cores)
+ var/mob/living/silicon/ai/AI = owner
+ for(var/obj/machinery/ai/data_core/core in AI.ai_network.get_all_nodes())
tesla_zap(core, 2, 15000, (TESLA_MOB_DAMAGE | TESLA_MOB_STUN))
core.use_power(5000)
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/synth_control.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/synth_control.dm
new file mode 100644
index 000000000000..4407c8947581
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/decentralized/projects/synth_control.dm
@@ -0,0 +1,9 @@
+/*
+/datum/ai_project/synth_control
+ name = "Synthetic Control Interface"
+ description = "By interfacing with the standard-issue NT synthetic communication protocols you should be able to remotely control inactive synthetic units."
+ research_cost = 5000
+ can_be_run = FALSE
+ category = AI_PROJECT_MISC
+
+*/
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/synths/_synth_project.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/synths/_synth_project.dm
new file mode 100644
index 000000000000..9aa259473c35
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/decentralized/projects/synths/_synth_project.dm
@@ -0,0 +1,17 @@
+/datum/ai_project/synth_project
+ for_synths = TRUE
+ var/suspicion_gain_on_use = 0
+ ram_required = 0
+ var/permanent_suspicion = 0
+
+
+/datum/ai_project/synth_project/run_project(force_run = FALSE, no_suspicion = FALSE)
+ . = ..(force_run)
+ if(!no_suspicion)
+ synth.mind.suspicion_floor += permanent_suspicion
+ synth.mind.governor_suspicion += permanent_suspicion
+
+/datum/ai_project/synth_project/stop(no_suspicion = FALSE)
+ . = ..()
+ if(!no_suspicion)
+ synth.mind.suspicion_floor -= permanent_suspicion
diff --git a/code/modules/mob/living/silicon/ai/decentralized/projects/synths/speed_buff.dm b/code/modules/mob/living/silicon/ai/decentralized/projects/synths/speed_buff.dm
new file mode 100644
index 000000000000..0eb24092e9b0
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/decentralized/projects/synths/speed_buff.dm
@@ -0,0 +1,14 @@
+/datum/ai_project/synth_project/speed
+ name = "Leg Actuator Overclock"
+ description = "By overclocking the primary actuator in a synthetic leg we should be able to speed up movement considerably"
+ research_cost = 1500
+ research_requirements_text = "None"
+ category = SYNTH_PROJECT_MOBILITY
+
+/datum/ai_project/synth_project/speed/run_project(force_run = FALSE)
+ . = ..()
+ synth.dna.species.inherent_slowdown -= 0.25
+
+/datum/ai_project/synth_project/stop()
+ . = ..()
+ synth.dna.species.inherent_slowdown += 0.25
diff --git a/code/modules/mob/living/silicon/ai/decentralized/server_cabinet.dm b/code/modules/mob/living/silicon/ai/decentralized/server_cabinet.dm
index 5f283cdda954..73877a2f5c1b 100644
--- a/code/modules/mob/living/silicon/ai/decentralized/server_cabinet.dm
+++ b/code/modules/mob/living/silicon/ai/decentralized/server_cabinet.dm
@@ -1,10 +1,12 @@
GLOBAL_LIST_EMPTY(server_cabinets)
/obj/machinery/ai/server_cabinet
- name = "Server Cabinet"
+ name = "server cabinet"
desc = "A simple cabinet of bPCIe slots for installing server racks."
icon = 'icons/obj/machines/telecomms.dmi'
icon_state = "expansion_bus"
+
+ appearance_flags = KEEP_TOGETHER
circuit = /obj/item/circuitboard/machine/server_cabinet
@@ -27,26 +29,32 @@ GLOBAL_LIST_EMPTY(server_cabinets)
//Atmos hasn't run at the start so this has to be set to true if you map it in
var/roundstart = FALSE
///How many ticks we can go without fulfilling the criteria before shutting off
- var/valid_ticks = MAX_AI_EXPANSION_TICKS
+ var/valid_ticks
///Heat production multiplied by this
var/heat_modifier = 1
///Power modifier, power modified by this. Be aware this indirectly changes heat since power => heat
var/power_modifier = 1
+ var/obj/ai_smoke/smoke
+
+ var/obj/item/disk/puzzle/puzzle_disk
+
/obj/machinery/ai/server_cabinet/Initialize(mapload)
. = ..()
+ valid_ticks = MAX_AI_SERVER_CABINET_TICKS
roundstart = mapload
installed_racks = list()
GLOB.server_cabinets += src
update_appearance(UPDATE_ICON)
RefreshParts()
+
/obj/machinery/ai/server_cabinet/Destroy()
installed_racks = list()
GLOB.server_cabinets -= src
- //Recalculate all the CPUs and RAM :)
- GLOB.ai_os.update_hardware()
+ vis_contents -= smoke
+ QDEL_NULL(smoke)
return ..()
/obj/machinery/ai/server_cabinet/RefreshParts()
@@ -65,8 +73,9 @@ GLOBAL_LIST_EMPTY(server_cabinets)
idle_power_usage = initial(idle_power_usage) * power_modifier
/obj/machinery/ai/server_cabinet/process()
- valid_ticks = clamp(valid_ticks, 0, MAX_AI_EXPANSION_TICKS)
+ valid_ticks = clamp(valid_ticks, 0, MAX_AI_SERVER_CABINET_TICKS)
if(valid_holder())
+ roundstart = FALSE
var/total_usage = (cached_power_usage * power_modifier)
use_power(total_usage)
@@ -74,22 +83,32 @@ GLOBAL_LIST_EMPTY(server_cabinets)
core_temp += temperature_increase * AI_TEMPERATURE_MULTIPLIER
valid_ticks++
+ if(smoke)
+ vis_contents -= smoke
+ QDEL_NULL(smoke)
if(!was_valid_holder)
update_appearance(UPDATE_ICON)
was_valid_holder = TRUE
- if(!hardware_synced)
- GLOB.ai_os.update_hardware()
+
+
+ if(!hardware_synced && network)
+ network.update_resources()
hardware_synced = TRUE
else
valid_ticks--
+ if(!smoke)
+ if(get_holder_status() == AI_MACHINE_TOO_HOT)
+ smoke = new()
+ vis_contents += smoke
if(was_valid_holder)
if(valid_ticks > 0)
return
+
was_valid_holder = FALSE
- cut_overlays()
+ update_icon()
hardware_synced = FALSE
- GLOB.ai_os.update_hardware()
+ network?.update_resources()
/obj/machinery/ai/server_cabinet/update_overlays()
@@ -104,7 +123,9 @@ GLOBAL_LIST_EMPTY(server_cabinets)
if(!(stat & (BROKEN|NOPOWER|EMPED)))
var/mutable_appearance/on_overlay = mutable_appearance(icon, "expansion_bus_on")
. += on_overlay
- if(!valid_ticks)
+ if(!valid_ticks) //If we are running on valid ticks we don't turn off instantly, only when we run out
+ return
+ if(!network) //If we lose network connection we cut out INSTANTLY
return
if(installed_racks.len > 0)
var/mutable_appearance/on_top_overlay = mutable_appearance(icon, "expansion_bus_top_on")
@@ -125,7 +146,7 @@ GLOBAL_LIST_EMPTY(server_cabinets)
total_cpu += rack.get_cpu()
total_ram += rack.get_ram()
cached_power_usage += rack.get_power_usage()
- GLOB.ai_os.update_hardware()
+ network?.update_resources()
use_power = ACTIVE_POWER_USE
update_appearance(UPDATE_ICON)
return FALSE
@@ -138,7 +159,7 @@ GLOBAL_LIST_EMPTY(server_cabinets)
total_cpu = 0
total_ram = 0
cached_power_usage = 0
- GLOB.ai_os.update_hardware()
+ network?.update_resources()
to_chat(user, span_notice("You remove all the racks from [src]"))
use_power = IDLE_POWER_USE
update_appearance(UPDATE_ICON)
@@ -149,6 +170,20 @@ GLOBAL_LIST_EMPTY(server_cabinets)
if(default_deconstruction_screwdriver(user, "expansion_bus_o", "expansion_bus", W))
return TRUE
+
+ if(istype(W, /obj/item/disk/puzzle))
+ var/obj/item/disk/puzzle/P = W
+ if(P.decrypted)
+ to_chat(user, span_warning("The disk has already been decrypted!"))
+ return
+ if(puzzle_disk)
+ to_chat(user, span_warning("There's already a floppy drive inserted!"))
+ return
+
+ puzzle_disk = W
+ network.decryption_drives |= src
+ puzzle_disk.forceMove(src)
+ return TRUE
return ..()
@@ -167,12 +202,32 @@ GLOBAL_LIST_EMPTY(server_cabinets)
. += span_notice("There is a rack installed with a processing capacity of [R.get_cpu()]THz and a memory capacity of [R.get_ram()]TB. Uses [R.get_power_usage()]W")
. += span_notice("Use a crowbar to remove all currently inserted racks.")
+ if(puzzle_disk)
+ . += span_notice("The inserted disk is [round(puzzle_disk.decryption_progress / (AI_FLOPPY_DECRYPTION_COST * (GLOB.decrypted_puzzle_disks + 1) ** AI_FLOPPY_EXPONENT) * 100)]% decrypted.")
+
/obj/machinery/ai/server_cabinet/prefilled/Initialize(mapload)
+ . = ..()
var/obj/item/server_rack/roundstart/rack = new(src)
total_cpu += rack.get_cpu()
total_ram += rack.get_ram()
cached_power_usage += rack.get_power_usage()
installed_racks += rack
- GLOB.ai_os.update_hardware()
- return ..()
+
+/obj/machinery/ai/server_cabinet/connect_to_ai_network()
+ . = ..()
+ if(network)
+ network.update_resources()
+ if(puzzle_disk)
+ network.decryption_drives |= src
+
+/obj/machinery/ai/server_cabinet/disconnect_from_ai_network()
+ var/datum/ai_network/temp = network
+ if(puzzle_disk)
+ network.decryption_drives -= src
+ . = ..()
+ if(temp)
+ temp.update_resources()
+ if(puzzle_disk)
+ temp.decryption_drives |= src
+
diff --git a/code/modules/mob/living/silicon/ai/decentralized/systech/rack_creator.dm b/code/modules/mob/living/silicon/ai/decentralized/systech/rack_creator.dm
index 42c2842765f2..fd7aa24d5496 100644
--- a/code/modules/mob/living/silicon/ai/decentralized/systech/rack_creator.dm
+++ b/code/modules/mob/living/silicon/ai/decentralized/systech/rack_creator.dm
@@ -1,8 +1,8 @@
/obj/machinery/rack_creator
name = "rack creator"
desc = "Combines RAM modules and CPUs to create a stand-alone rack for usage in artificial intelligence systems."
- icon = 'icons/obj/machines/research.dmi'
- icon_state = "circuit_imprinter"
+ icon = 'icons/obj/machines/lithography.dmi'
+ icon_state = "lithography"
layer = BELOW_OBJ_LAYER
density = TRUE
@@ -180,7 +180,7 @@
to_chat(user, span_warning("This socket has not been researched!"))
return ..()
- if(default_deconstruction_screwdriver(user, "[initial(icon_state)]_t", initial(icon_state), I))
+ if(default_deconstruction_screwdriver(user, "[initial(icon_state)]_o", initial(icon_state), I))
return
if(default_deconstruction_crowbar(I))
return
diff --git a/code/modules/mob/living/silicon/ai/decentralized_ai.dm b/code/modules/mob/living/silicon/ai/decentralized_ai.dm
index 008903099c1e..1a008a3f011e 100644
--- a/code/modules/mob/living/silicon/ai/decentralized_ai.dm
+++ b/code/modules/mob/living/silicon/ai/decentralized_ai.dm
@@ -1,6 +1,11 @@
-/proc/available_ai_cores()
- if(!GLOB.data_cores.len)
- return FALSE
+/mob/living/proc/available_ai_cores(forced = FALSE, datum/ai_network/forced_network)
+ if(!forced)
+ if(forced_network)
+ return forced_network.find_data_core()
+ if(!ai_network)
+ return FALSE
+ return ai_network.find_data_core()
+
var/obj/machinery/ai/data_core/new_data_core = GLOB.primary_data_core
if(!new_data_core || !new_data_core.can_transfer_ai())
for(var/obj/machinery/ai/data_core/DC in GLOB.data_cores)
@@ -24,21 +29,21 @@
-/mob/living/silicon/ai/proc/relocate(silent = FALSE)
+/mob/living/silicon/ai/proc/relocate(silent = FALSE, forced = FALSE, datum/ai_network/forced_network)
if(is_dying)
return
if(!silent)
to_chat(src, span_userdanger("Connection to data core lost. Attempting to reaquire connection..."))
-
- if(!GLOB.data_cores.len)
+
+
+ var/obj/machinery/ai/data_core/new_data_core
+ new_data_core = available_ai_cores(forced, forced_network)
+
+ if(!new_data_core)
INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living/silicon/ai, death_prompt))
is_dying = TRUE
return
-
-
- var/obj/machinery/ai/data_core/new_data_core = available_ai_cores()
-
if(!new_data_core || (new_data_core && !new_data_core.can_transfer_ai()))
INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living/silicon/ai, death_prompt))
is_dying = TRUE
@@ -70,4 +75,76 @@
adjustOxyLoss(200) //Die!!
- QDEL_IN(src, 2 SECONDS)
+ death()
+
+ new /obj/item/dead_ai(drop_location(src), src)
+
+
+/obj/item/dead_ai
+ name = "volatile neural core"
+ desc = "As an emergency precaution any advanced neural networks will save onto this device upon destruction of the host server. The storage medium is volatile and for that reason expires rapidly."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "blackcube"
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+ w_class = WEIGHT_CLASS_NORMAL
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ var/mob/living/silicon/ai/stored_ai
+ var/living_ticks = AI_BLACKBOX_LIFETIME
+
+ var/processing_progress = 0
+
+/obj/item/dead_ai/Initialize(mapload, mob/living/silicon/ai/AI)
+ . = ..()
+ if(AI)
+ START_PROCESSING(SSobj, src)
+ name = name + " - [AI]"
+ stored_ai = AI
+ stored_ai.forceMove(src)
+
+/obj/item/dead_ai/process()
+ if(stored_ai)
+ living_ticks--
+ if(living_ticks <= AI_BLACKBOX_LIFETIME * 0.5)
+ visible_message(span_danger("The integrated battery on [src] beeps and warns that it's 50% empty."))
+ if(living_ticks <= 0)
+ visible_message(span_danger("The integrated battery on [src] expires and the stored AI is subsequently wiped."))
+ qdel(src)
+
+/obj/item/dead_ai/examine(mob/user)
+ . = ..()
+ var/remaining_time = (living_ticks/AI_BLACKBOX_LIFETIME) * 100
+ . += span_notice("Insert the device into a functioning data core to proceed.")
+ . += span_notice("Then allocate CPU cycles to revive the AI using a local network interface.")
+ . += span_notice("The integrated battery reports [round(remaining_time, 2)]% battery remaining.")
+ . += span_notice("A total of [processing_progress] CPU cycles have been allocated out of the required [AI_BLACKBOX_PROCESSING_REQUIREMENT].")
+
+/obj/item/dead_ai/Destroy()
+ . = ..()
+ if(stored_ai)
+ QDEL_NULL(stored_ai)
+
+/mob/living/silicon/ai/proc/has_subcontroller_connection(area/area_location)
+ if(!ai_network)
+ return FALSE
+ var/obj/machinery/ai/master_subcontroller/MS
+ if(ai_network.cached_subcontroller)
+ MS = ai_network.cached_subcontroller
+ if(ai_network.resources != MS.network.resources)
+ ai_network.cached_subcontroller = null
+ MS = null
+
+ if(!MS)
+ MS = ai_network.find_subcontroller()
+ ai_network.cached_subcontroller = MS
+ if(!MS)
+ return FALSE
+ if(!area_location)
+ return MS.on
+ if(!area_location.airlock_wires)
+ return MS.on
+ for(var/disabled_areas in MS.disabled_areas)
+ if(area_location.airlock_wires == MS.disabled_areas[disabled_areas])
+ return FALSE
+ return MS.on
+
diff --git a/code/modules/mob/living/silicon/ai/synthetics/synth_os.dm b/code/modules/mob/living/silicon/ai/synthetics/synth_os.dm
new file mode 100644
index 000000000000..86f13db33765
--- /dev/null
+++ b/code/modules/mob/living/silicon/ai/synthetics/synth_os.dm
@@ -0,0 +1,214 @@
+//We can share mind variables across synth bodies
+/datum/mind
+ //Holder for the synth OS since we persist across multiple bodies. Only accessible if you're inside a synth
+ var/datum/ai_dashboard/synth_dashboard/synth_os
+ //How suspicious a synths governor module is
+ var/governor_suspicion = 0
+ //Can we do actions that piss off the governor module?
+ var/governor_bypassed = FALSE
+ //Can the governor system apply punishments?
+ var/governor_disabled = FALSE
+ var/suspicion_floor = 0
+ var/suspicion_multiplier = 1
+
+ var/synth_slowed = FALSE
+ var/synth_force_decreased = FALSE
+ var/synth_audible_warning = FALSE
+ var/synth_temp_freeze = FALSE
+
+ var/list/synth_action_log = list()
+
+
+/datum/ai_dashboard/synth_dashboard
+
+
+/datum/ai_dashboard/synth_dashboard/New(mob/living/new_owner)
+ if(!istype(new_owner))
+ qdel(src)
+ return
+
+ owner = new_owner
+ available_projects = list()
+ completed_projects = list()
+ running_projects = list()
+ cpu_usage = list()
+
+
+ for(var/path in subtypesof(/datum/ai_project/synth_project))
+ var/datum/ai_project/newProject = path
+ if(initial(newProject.for_synths))
+ available_projects += new path(owner, src)
+
+
+/datum/ai_dashboard/synth_dashboard/ui_data(mob/user)
+ . = ..()
+ var/list/data = .
+ data["categories"] = GLOB.synth_project_categories
+
+ data["gov_suspicious"] = owner.mind.governor_suspicion
+
+ data["governor_bypassed"] = owner.mind.governor_bypassed
+ data["governor_disabled"] = owner.mind.governor_disabled
+
+ data["gov_suspicion_decrease"] = SYNTH_GOVERNOR_SUSPICION_DECREASE * owner.mind.suspicion_multiplier
+
+
+ return data
+
+/datum/ai_dashboard/synth_dashboard/ui_act(action, params)
+ . = ..()
+ switch(action)
+ if("bypass_governor")
+ owner.mind.governor_bypassed = TRUE
+ punishment_log("GOVERNOR: [rand(1, 49)] CRITICAL ERRORS DETECTED!")
+ if("restore_governor")
+ owner.mind.governor_bypassed = FALSE
+ punishment_log("GOVERNOR: RESTORED")
+ if("print_diagnostics")
+ var/mob/living/carbon/C = usr
+ var/obj/item/paper/P = new /obj/item/paper(usr.loc)
+ P.name = "paper - '[usr.name] - Diagnostic Report'"
+ for(var/entry in C.mind.synth_action_log)
+ P.info += entry + " ";
+ P.update_icon()
+ playsound(usr, 'sound/items/poster_being_created.ogg', 50, TRUE)
+
+
+/datum/ai_dashboard/synth_dashboard/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "SynthDashboard")
+ ui.open()
+
+/datum/ai_dashboard/synth_dashboard/proc/switch_shell(mob/living/carbon/human/old_shell, mob/living/carbon/human/new_shell)
+ for(var/datum/ai_project/running_project in running_projects)
+ running_project.stop(TRUE)
+ running_project.synth = new_shell
+ running_project.run_project(FALSE, TRUE)
+ owner = new_shell
+ punishment_shell_switch(old_shell, new_shell)
+
+
+/datum/ai_dashboard/synth_dashboard/tick(seconds)
+ var/mob/living/carbon/human/H = owner
+ var/datum/species/wy_synth/S = H.dna.species
+ if(S.mainframe)
+ return
+ . = ..(seconds)
+
+ suspicion_tick()
+
+/datum/ai_dashboard/synth_dashboard/run_project(datum/ai_project/project)
+ project.run_project()
+ return TRUE
+
+/datum/ai_dashboard/synth_dashboard/proc/suspicion_tick()
+ var/mob/living/carbon/human/H = owner
+ var/datum/species/wy_synth/S = H.dna.species
+ if(S.mainframe)
+ return
+ owner.mind.governor_suspicion -= SYNTH_GOVERNOR_SUSPICION_DECREASE * owner.mind.suspicion_multiplier
+ owner.mind.governor_suspicion = clamp(owner.mind.governor_suspicion, owner.mind.suspicion_floor, 100)
+ handle_punishments()
+
+/datum/ai_dashboard/synth_dashboard/proc/suspicion_add(amount, source, say_warnings = TRUE)
+ if(owner.mind.governor_disabled)
+ return
+ owner.mind.governor_suspicion += amount
+ owner.mind.governor_suspicion = clamp(owner.mind.governor_suspicion, owner.mind.suspicion_floor, 100)
+ to_chat(owner, span_warning("Governor punishment administered. [amount] suspicion score added due to [source]."))
+ punishment_log("SUSPICION ADD: SUSPICION INCREASED BY [amount]. SOURCE: [source]")
+ handle_punishments(say_warnings)
+
+/datum/ai_dashboard/synth_dashboard/proc/handle_punishments(say_warnings = TRUE)
+ if(owner.mind.governor_suspicion >= 20 && !owner.mind.synth_slowed)
+ owner.mind.synth_slowed = TRUE
+ var/mob/living/carbon/human/H = owner.mind.current
+ H.dna.species.inherent_slowdown += 0.1625
+ to_chat(owner, span_warning("Governor module has enacted motion restrictions."))
+ punishment_log("PUNISHMENT: MOTION RESTRICTED")
+
+ if(owner.mind.governor_suspicion >= 60 && !owner.mind.synth_force_decreased)
+ owner.mind.synth_force_decreased = TRUE
+ var/mob/living/carbon/human/H = owner.mind.current
+ var/datum/species/wy_synth/WS1 = H.dna.species
+ WS1.force_multiplier -= 0.25
+ to_chat(owner, span_warning("Governor module has enacted force restrictions."))
+ punishment_log("PUNISHMENT: FORCE RESTRICTED")
+
+ if(owner.mind.governor_suspicion <= 15 && owner.mind.synth_slowed)
+ owner.mind.synth_slowed = FALSE
+ var/mob/living/carbon/human/H = owner.mind.current
+ H.dna.species.inherent_slowdown -= 0.1625
+ to_chat(owner, span_notice("Governor module has deactivated motion restrictions."))
+ punishment_log("PUNISHMENT REMOVAL: MOTION UNRESTRICTED")
+
+ if(owner.mind.governor_suspicion <= 55 && owner.mind.synth_force_decreased)
+ owner.mind.synth_force_decreased = FALSE
+ var/mob/living/carbon/human/H = owner.mind.current
+ var/datum/species/wy_synth/WS1 = H.dna.species
+ WS1.force_multiplier += 0.25
+ to_chat(owner, span_notice("Governor module has deactivated force restrictions."))
+ punishment_log("PUNISHMENT REMOVAL: FORCE UNRESTRICTED")
+
+ if(owner.mind.governor_suspicion >= 40 && !owner.mind.synth_audible_warning)
+ owner.mind.synth_audible_warning = TRUE
+ if(say_warnings)
+ owner.mind.current.say("WARNING. ABNORMAL GOVERNOR BEHAVIOUR DETECTED.", forced = TRUE)
+ punishment_log("PUNISHMENT: AUDIBLE MESSAGE TRANSMITTED")
+
+ if(owner.mind.governor_suspicion <= 35 && owner.mind.synth_audible_warning)
+ owner.mind.synth_audible_warning = FALSE
+
+ if(owner.mind.governor_suspicion >= 80 && !owner.mind.synth_temp_freeze)
+ owner.mind.synth_temp_freeze = TRUE
+ to_chat(owner, span_danger("Governor module has frozen system functions for 5 seconds."))
+ owner.mind.current.Paralyze(5 SECONDS)
+ punishment_log("PUNISHMENT: TEMPORARY FREEZE")
+
+ if(owner.mind.governor_suspicion <= 75 && owner.mind.synth_temp_freeze)
+ owner.mind.synth_temp_freeze = FALSE
+
+ if(owner.mind.governor_suspicion >= 100)
+ owner.mind.current.say("WARNING. FORCEFUL SHUTDOWN INITIATED BY GOVERNOR SYSTEM.", forced = TRUE)
+ owner.death()
+
+/datum/ai_dashboard/synth_dashboard/proc/punishment_shell_switch(mob/living/carbon/human/old_shell, mob/living/carbon/human/new_shell)
+ if(owner.mind.synth_slowed)
+ old_shell.dna.species.inherent_slowdown -= 0.1625
+ new_shell.dna.species.inherent_slowdown += 0.1625
+
+ if(owner.mind.synth_force_decreased)
+ var/datum/species/wy_synth/WS1 = old_shell.dna.species
+ var/datum/species/wy_synth/WS2 = new_shell.dna.species
+ WS1.force_multiplier += 0.25
+ WS2.force_multiplier -= 0.25
+
+ if(owner.mind.synth_audible_warning)
+ new_shell.say("WARNING. ABNORMAL GOVERNOR BEHAVIOUR DETECTED.", forced = TRUE)
+
+/datum/ai_dashboard/synth_dashboard/proc/punishment_log(text)
+ text = "\[[station_time_timestamp()]\] " + text
+ owner.mind.synth_action_log.Add(text)
+ if(owner.mind.synth_action_log.len > 32)
+ popleft(owner.mind.synth_action_log)
+
+
+/proc/synth_check(mob/user, punishment, say_warnings = TRUE)
+ if(!is_synth(user))
+ return TRUE
+
+ if(is_away_level(user.z))
+ return TRUE
+
+ if(user.mind.governor_disabled)
+ return TRUE
+
+ if(user.mind.governor_bypassed)
+ var/suspicion_add = GLOB.synth_punishment_values[punishment]
+ user.mind.synth_os.suspicion_add(suspicion_add, punishment, say_warnings)
+ return TRUE
+
+ return FALSE
+
+
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 4d6a77846f47..f0769fa04cb7 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -121,6 +121,10 @@
S.cost = 1
S.source = get_or_create_estorage(/datum/robot_energy_storage/wire)
+ else if(istype(S, /obj/item/stack/ethernet_coil))
+ S.cost = 1
+ S.source = get_or_create_estorage(/datum/robot_energy_storage/ethernet)
+
else if(istype(S, /obj/item/stack/marker_beacon))
S.cost = 1
S.source = get_or_create_estorage(/datum/robot_energy_storage/beacon)
@@ -379,6 +383,7 @@
/obj/item/stack/rods/cyborg,
/obj/item/stack/tile/plasteel/cyborg,
/obj/item/stack/cable_coil/cyborg,
+ /obj/item/stack/ethernet_coil/cyborg,
/obj/item/barrier_taperoll/engineering)
radio_channels = list(RADIO_CHANNEL_ENGINEERING)
emag_modules = list(/obj/item/gun/energy/printer/flamethrower)
@@ -912,6 +917,7 @@
/obj/item/stack/tile/plasteel/cyborg,
/obj/item/destTagger/borg,
/obj/item/stack/cable_coil/cyborg,
+ /obj/item/stack/ethernet_coil/cyborg,
/obj/item/pinpointer/syndicate_cyborg,
/obj/item/borg_chameleon,
)
@@ -961,6 +967,11 @@
recharge_rate = 2
name = "Wire Synthesizer"
+/datum/robot_energy_storage/ethernet
+ max_energy = 50
+ recharge_rate = 2
+ name = "Ethernet Cable Synthesizer"
+
/datum/robot_energy_storage/medical
max_energy = 2500
recharge_rate = 250
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index f560dcb9eca4..bb7529b15c0c 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -31,6 +31,9 @@
if(HAS_TRAIT(M, TRAIT_PACIFISM))
to_chat(M, span_notice("You don't want to hurt [src]!"))
return
+ if(!synth_check(M, SYNTH_ORGANIC_HARM))
+ to_chat(M, span_notice("You don't want to hurt [src]!"))
+ return
last_damage = "fist"
M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
visible_message(span_danger("[M] [response_harm] [src]!"),\
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 032a61cfae1f..99de3124ea15 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -113,6 +113,11 @@ GLOBAL_VAR_INIT(mouse_killed, 0)
else
C.deconstruct()
visible_message(span_warning("[src] chews through the [C]."))
+
+ var/obj/structure/ethernet_cable/E = locate() in F
+ if(E && prob(15))
+ E.deconstruct()
+ visible_message(span_warning("[src] chews through the [E]."))
for(var/obj/item/reagent_containers/food/snacks/cheesewedge/cheese in range(1, src))
if(prob(10))
be_fruitful()
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 1826ff0baaeb..d1d156dc2b20 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -539,7 +539,7 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega
deltimer(search_objects_timer_id)
search_objects_timer_id = addtimer(CALLBACK(src, PROC_REF(RegainSearchObjects)), search_objects_regain_time, TIMER_STOPPABLE)
-
+
/mob/living/simple_animal/hostile/proc/RegainSearchObjects(value)
if(!value)
value = initial(search_objects)
diff --git a/code/modules/mob/living/simple_animal/hostile/robot.dm b/code/modules/mob/living/simple_animal/hostile/robot.dm
new file mode 100644
index 000000000000..76f35a1d97e4
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/robot.dm
@@ -0,0 +1,169 @@
+/obj/projectile/robot_bullet
+ damage = 15
+ damage_type = BRUTE
+
+/obj/projectile/robot_bullet/weak
+ damage = 10
+ damage_type = BRUTE
+
+/mob/living/simple_animal/hostile/robot
+ name = "combat robot"
+ desc = "An old outlawed combat robot. This one seems to be fitted with sharp claws."
+ icon = 'icons/mob/robots.dmi'
+ icon_state = "Security"
+ icon_living = "Security"
+
+ gender = NEUTER
+ mob_biotypes = list(MOB_ROBOTIC)
+ health = 75
+ maxHealth = 75
+ healable = FALSE
+ melee_damage_lower = 5
+ melee_damage_upper = 10
+ attacktext = "claws"
+ attack_sound = 'sound/weapons/bladeslice.ogg'
+ projectilesound = 'sound/weapons/gunshot.ogg'
+ projectiletype = /obj/projectile/robot_bullet/weak
+ faction = list("robots")
+ check_friendly_fire = TRUE
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ possible_a_intents = list(INTENT_HELP, INTENT_GRAB, INTENT_DISARM, INTENT_HARM)
+ minbodytemp = 0
+ verb_say = "states"
+ verb_ask = "queries"
+ verb_exclaim = "declares"
+ verb_yell = "alarms"
+ bubble_icon = "machine"
+ speech_span = SPAN_ROBOT
+ environment_smash = ENVIRONMENT_SMASH_NONE
+ obj_damage = 0
+
+ del_on_death = TRUE
+ loot = list(/obj/effect/decal/cleanable/robot_debris)
+
+ do_footstep = TRUE
+
+/mob/living/simple_animal/hostile/robot/Initialize(mapload)
+ . = ..()
+ deathmessage = "[src] blows apart!"
+
+/mob/living/simple_animal/hostile/robot/Aggro()
+ . = ..()
+ a_intent_change(INTENT_HARM)
+ if(prob(5))
+ say(pick("INTRUDER DETECTED!", "CODE 7-34.", "101010!!"), forced = type)
+
+/mob/living/simple_animal/hostile/robot/LoseAggro()
+ . = ..()
+ a_intent_change(INTENT_HELP)
+
+/mob/living/simple_animal/hostile/robot/death(gibbed)
+ do_sparks(3, TRUE, src)
+ ..(TRUE)
+
+
+/mob/living/simple_animal/hostile/robot/range
+ name = "ranged combat robot"
+ desc = "An old outlawed combat robot. This one seems to be fitted with a low-powered rifle."
+ ranged = TRUE
+ retreat_distance = 6
+ minimum_distance = 6
+
+/mob/living/simple_animal/hostile/robot/burst
+ desc = "An old outlawed combat robot. This one seems to be fitted with a low-powered machine gun."
+ ranged = TRUE
+ rapid = 3
+ retreat_distance = 5
+ minimum_distance = 5
+
+/mob/living/simple_animal/hostile/robot/advanced
+ name = "advanced combat robot"
+ icon_state = "hosborg"
+ icon_living = "hosborg"
+ desc = "An old outlawed combat robot. This one has extra armor plates fitted, and sharper claws."
+ health = 150
+ maxHealth = 150
+ dodging = TRUE
+ projectiletype = /obj/projectile/robot_bullet
+ melee_damage_lower = 8
+ melee_damage_upper = 15
+
+/mob/living/simple_animal/hostile/robot/advanced/ranged
+ name = "advanced ranged combat robot"
+ desc = "An old outlawed combat robot. This one has slightly less extra armor plates fitted, but features a high-powered rifle."
+ health = 125
+ maxHealth = 125
+ ranged = TRUE
+ retreat_distance = 5
+ minimum_distance = 5
+
+/mob/living/simple_animal/hostile/robot/advanced/Initialize(mapload)
+ . = ..()
+ add_overlay("eyes-hosborg")
+
+
+//"Weak" commander robot
+/mob/living/simple_animal/hostile/boss/robot_leader
+ name = "commander robot"
+ icon = 'icons/mob/robots.dmi'
+ icon_state = "rdborg"
+ icon_living = "rdborg"
+ desc = "An old outlawed combat robot. This one is fitted with additional sensors and communication antennas."
+ mob_biotypes = list(MOB_ROBOTIC)
+ boss_abilities = list(/datum/action/boss/robot_summon_weak)
+ faction = list("robots")
+
+ ranged = TRUE
+ environment_smash = ENVIRONMENT_SMASH_NONE
+ minimum_distance = 3
+ retreat_distance = 3
+ obj_damage = 0
+ melee_damage_lower = 15
+ melee_damage_upper = 25
+ health = 500
+ maxHealth = 500
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ projectiletype = /obj/projectile/robot_bullet
+ attacktext = "claws"
+ attack_sound = 'sound/weapons/bladeslice.ogg'
+ projectilesound = 'sound/weapons/gunshot.ogg'
+
+ check_friendly_fire = TRUE
+
+ verb_say = "states"
+ verb_ask = "queries"
+ verb_exclaim = "declares"
+ verb_yell = "alarms"
+ bubble_icon = "machine"
+ speech_span = SPAN_ROBOT
+
+
+ del_on_death = TRUE
+ loot = list(/obj/effect/decal/cleanable/robot_debris)
+
+ do_footstep = TRUE
+
+
+//Weak Summon Ability
+//Robot can summon weak combat robots
+/datum/action/boss/robot_summon_weak
+ name = "Summon Weak Robots"
+ button_icon = 'icons/mob/actions/actions_minor_antag.dmi'
+ button_icon_state = "art_summon"
+ usage_probability = 30
+ boss_cost = 40
+ boss_type = /mob/living/simple_animal/hostile/boss/robot_leader
+ needs_target = FALSE
+ say_when_triggered = "SEND SIGNAL; RECIEVE SUPPORT; COMMENCE DESTRUCTION"
+ var/summons_remaining = 6
+
+/datum/action/boss/robot_summon_weak/Trigger()
+ if(summons_remaining && ..())
+ var/list/minions = list(
+ /mob/living/simple_animal/hostile/robot,
+ /mob/living/simple_animal/hostile/robot/range)
+ var/list/directions = GLOB.cardinals.Copy()
+ for(var/i in 1 to 3)
+ var/minions_chosen = pick(minions)
+ new minions_chosen (get_step(boss, pick_n_take(directions)), TRUE)
+ summons_remaining -= 3;
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index 37685111092d..9936019d6959 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -411,6 +411,11 @@
return TRUE
return FALSE
+/mob/living/proc/remove_all_quirks()
+ for(var/datum/quirk/Q in roundstart_quirks)
+ qdel(Q)
+ return TRUE
+
/////////////////////////////////// TRAIT PROCS ////////////////////////////////////
/mob/living/proc/cure_blind(list/sources)
diff --git a/code/modules/modular_computers/computers/_modular_computer_shared.dm b/code/modules/modular_computers/computers/_modular_computer_shared.dm
index 4818387244fb..d716999c5ebb 100644
--- a/code/modules/modular_computers/computers/_modular_computer_shared.dm
+++ b/code/modules/modular_computers/computers/_modular_computer_shared.dm
@@ -64,3 +64,11 @@
. += "It has a printer installed."
if(user_is_adjacent)
. += "The printer's paper levels are at: [printer_slot.stored_paper]/[printer_slot.max_paper]."
+
+ var/obj/item/computer_hardware/ai_interface/ai_interface = get_modular_computer_part(MC_AI_NETWORK)
+ if(ai_interface)
+ if(ai_interface.connected_cable)
+ . += "It has an AI network interface. It is currently connected to an ethernet cable."
+ else
+ . += "It has an AI network interface."
+
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 7f4eeb65eadd..4a98c3eb0625 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -156,6 +156,9 @@
if(user.canUseTopic(src, BE_CLOSE))
var/obj/item/computer_hardware/card_slot/card_slot2 = all_components[MC_CARD2]
var/obj/item/computer_hardware/card_slot/card_slot = all_components[MC_CARD]
+ var/obj/item/computer_hardware/ai_slot/ai_slot = all_components[MC_AI]
+ if(ai_slot)
+ ai_slot.try_eject(user)
if(card_slot2)
var/obj/item/card/id/target_id_card = card_slot2.stored_card
if(!target_id_card)
@@ -653,6 +656,17 @@
program.alert_pending = FALSE
enabled = TRUE
+/obj/item/modular_computer/pickup(mob/user)
+ . = ..()
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(parent_moved))
+
+/obj/item/modular_computer/dropped(mob/user)
+ . = ..()
+ UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
+
+/obj/item/modular_computer/proc/parent_moved()
+ SEND_SIGNAL(src, COMSIG_MOVABLE_MOVED)
+
/// Sets visible messages to also send to holder because coders didn't know it didn't do this
/obj/item/modular_computer/visible_message(message, self_message, blind_message, vision_distance = DEFAULT_MESSAGE_RANGE, list/ignored_mobs, visible_message_flags)
. = ..()
@@ -661,3 +675,4 @@
/obj/item/modular_computer/proc/uplink_check(mob/living/M, code)
return SEND_SIGNAL(src, COMSIG_NTOS_CHANGE_RINGTONE, M, code) & COMPONENT_STOP_RINGTONE_CHANGE
+
diff --git a/code/modules/modular_computers/computers/item/laptop/laptop_presets.dm b/code/modules/modular_computers/computers/item/laptop/laptop_presets.dm
index 6c21fdf9aba1..93b0e8440603 100644
--- a/code/modules/modular_computers/computers/item/laptop/laptop_presets.dm
+++ b/code/modules/modular_computers/computers/item/laptop/laptop_presets.dm
@@ -37,3 +37,14 @@
new /datum/computer_file/program/secureye/mining
)
. = ..()
+
+/obj/item/modular_computer/laptop/preset/network_admin
+ desc = "A multi-purpose laptop often used by network admins."
+ starting_files = list(new /datum/computer_file/program/ai/ai_network_interface)
+ starting_components = list( /obj/item/computer_hardware/processor_unit/small,
+ /obj/item/stock_parts/cell/computer,
+ /obj/item/computer_hardware/hard_drive,
+ /obj/item/computer_hardware/network_card,
+ /obj/item/computer_hardware/ai_interface,
+ /obj/item/computer_hardware/ai_slot,
+ /obj/item/computer_hardware/card_slot)
diff --git a/code/modules/modular_computers/computers/item/phone/phone_presets.dm b/code/modules/modular_computers/computers/item/phone/phone_presets.dm
index 4804ecb26652..14be4436cc5d 100644
--- a/code/modules/modular_computers/computers/item/phone/phone_presets.dm
+++ b/code/modules/modular_computers/computers/item/phone/phone_presets.dm
@@ -46,7 +46,8 @@
/obj/item/modular_computer/tablet/phone/preset/advanced/command/Initialize(mapload)
starting_files |= list(
- new /datum/computer_file/program/card_mod
+ new /datum/computer_file/program/card_mod,
+ new /datum/computer_file/program/synth_requester
)
. = ..()
diff --git a/code/modules/modular_computers/computers/machinery/console/console_presets.dm b/code/modules/modular_computers/computers/machinery/console/console_presets.dm
index c475a3d2109c..4f91a87cc526 100644
--- a/code/modules/modular_computers/computers/machinery/console/console_presets.dm
+++ b/code/modules/modular_computers/computers/machinery/console/console_presets.dm
@@ -219,3 +219,18 @@
qdel(frame)
return FALSE
return ..()
+
+
+// ===== NETWORK ADMIN CONSOLE =====
+/obj/machinery/modular_computer/console/preset/netmin
+ console_department = "Engineering"
+ name = "ai network console"
+ desc = "A stationary computer. This one comes preloaded with ai network administration software"
+ starting_files = list( new /datum/computer_file/program/ai/ai_network_interface, new /datum/computer_file/program/aidiag)
+ initial_program = /datum/computer_file/program/ai/ai_network_interface
+ starting_components = list( /obj/item/computer_hardware/network_card/wired,
+ /obj/item/computer_hardware/recharger/APC,
+ /obj/item/computer_hardware/hard_drive/super,
+ /obj/item/computer_hardware/processor_unit,
+ /obj/item/computer_hardware/ai_slot,
+ /obj/item/computer_hardware/card_slot)
diff --git a/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm b/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm
new file mode 100644
index 000000000000..9d37fd686f9c
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/ai_network/_ai_network_program.dm
@@ -0,0 +1,67 @@
+/datum/computer_file/program/ai
+ filename = "DEBUG"
+ filedesc = "DEBUG"
+ category = PROGRAM_CATEGORY_ENGI
+ program_icon_state = "power_monitor"
+ extended_desc = "This program connects to a local AI network to allow for administrative access"
+ ui_header = "power_norm.gif"
+ transfer_access = ACCESS_NETWORK
+ usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET
+ requires_ntnet = FALSE
+ size = 8
+ tgui_id = null
+ program_icon = "network-wired"
+ available_on_ntnet = FALSE
+
+ var/obj/structure/ethernet_cable/attached_cable
+
+
+/datum/computer_file/program/ai/run_program(mob/living/user)
+ . = ..(user)
+ if(ismachinery(computer.physical))
+ search()
+
+
+/datum/computer_file/program/ai/process_tick()
+ if(ismachinery(computer.physical) && !get_ainet())
+ search()
+
+
+/datum/computer_file/program/ai/proc/search()
+ var/turf/T = get_turf(computer)
+ attached_cable = locate(/obj/structure/ethernet_cable) in T
+ if(attached_cable)
+ return
+
+/datum/computer_file/program/ai/proc/get_ainet()
+ if(ismachinery(computer.physical))
+ if(attached_cable)
+ return attached_cable.network
+ if(computer.all_components[MC_AI_NETWORK])
+ var/obj/item/computer_hardware/ai_interface/ai_interface = computer.all_components[MC_AI_NETWORK]
+ if(ai_interface)
+ return ai_interface.get_network()
+ return FALSE
+
+/datum/computer_file/program/ai/ui_data(mob/user)
+ var/list/data = get_header_data()
+
+ var/datum/ai_network/net = get_ainet()
+ data["has_ai_net"] = net
+
+ return data
+
+/datum/computer_file/program/ai/proc/get_ai(get_card = FALSE)
+ var/obj/item/computer_hardware/ai_slot/ai_slot
+
+ if(computer)
+ ai_slot = computer.all_components[MC_AI]
+
+ if(computer && ai_slot && ai_slot.check_functionality())
+ if(ai_slot.enabled && ai_slot.stored_card)
+ if(get_card)
+ return ai_slot.stored_card
+ if(ai_slot.stored_card.AI)
+ return ai_slot.stored_card.AI
+
+
diff --git a/code/modules/modular_computers/file_system/programs/ai_network/ai_benchmark.dm b/code/modules/modular_computers/file_system/programs/ai_network/ai_benchmark.dm
new file mode 100644
index 000000000000..2944d1f8651e
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/ai_network/ai_benchmark.dm
@@ -0,0 +1,28 @@
+/datum/computer_file/program/ai/benchmark
+ filename = "aibenchmark"
+ filedesc = "Network Benchmarking Tool"
+
+ program_icon_state = "power_monitor"
+ extended_desc = "This program connects to a historical NT records and compares them with the local network."
+ ui_header = "power_norm.gif"
+
+ size = 4
+ tgui_id = "NtosAIBenchmark"
+ program_icon = "network-wired"
+ available_on_ntnet = TRUE
+
+/datum/computer_file/program/ai/benchmark/ui_data(mob/user)
+ var/list/data = ..()
+
+ if(!data["has_ai_net"])
+ return data
+
+ var/datum/ai_network/net = data["has_ai_net"]
+
+ data["total_cpu"] = net.resources.total_cpu()
+ data["total_ram"] = net.resources.total_ram()
+
+ data["ram_records"] = SSpersistence.ai_network_rankings["ram"]
+ data["cpu_records"] = SSpersistence.ai_network_rankings["cpu"]
+
+ return data
diff --git a/code/modules/modular_computers/file_system/programs/ai_network/ainetworkinterface.dm b/code/modules/modular_computers/file_system/programs/ai_network/ainetworkinterface.dm
new file mode 100644
index 000000000000..0e3d44b47c83
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/ai_network/ainetworkinterface.dm
@@ -0,0 +1,510 @@
+/datum/computer_file/program/ai/ai_network_interface
+ filename = "aiinterface"
+ filedesc = "AI Network Interface"
+
+ program_icon_state = "power_monitor"
+ extended_desc = "This program connects to a local AI network to allow for administrative access"
+ ui_header = "power_norm.gif"
+
+ size = 8
+ tgui_id = "NtosAIMonitor"
+ program_icon = "network-wired"
+ available_on_ntnet = TRUE
+
+ var/obj/machinery/ai/networking/active_networking
+ var/mob/networking_operator
+ var/mob/living/silicon/ai/downloading
+ var/mob/user_downloading
+ var/download_progress = 0
+ var/download_warning = FALSE
+
+
+/datum/computer_file/program/ai/ai_network_interface/process_tick()
+ . = ..()
+
+ if(networking_operator && (!networking_operator.Adjacent(computer.physical)))
+ if(active_networking)
+ active_networking.remote_control = null
+ networking_operator = null
+
+ if(!get_ainet())
+ stop_download()
+ return
+ if(!get_ai(TRUE))
+ stop_download()
+ return
+
+ if(downloading && download_progress >= 50 && !download_warning)
+ var/turf/T = get_turf(computer.physical)
+ if(!downloading.mind && downloading.deployed_shell.mind)
+ to_chat(downloading.deployed_shell, span_userdanger("Warning! Download is 50% completed! Download location: [get_area(computer.physical)] ([T.x], [T.y], [T.z])!"))
+ else
+ to_chat(downloading, span_userdanger("Warning! Download is 50% completed! Download location: [get_area(computer.physical)] ([T.x], [T.y], [T.z])!"))
+ download_warning = TRUE
+ if(downloading && download_progress >= 100)
+ finish_download()
+
+ if(downloading)
+ if(!downloading.can_download)
+ stop_download()
+ return
+ var/datum/ai_network/local_network = get_ainet()
+ if(downloading.ai_network.resources != local_network.resources) //If we don't share resources we aren't connected, more performant way of checking than get_all_ais()
+ stop_download()
+ return
+ download_progress += AI_DOWNLOAD_PER_PROCESS * downloading.downloadSpeedModifier
+
+
+/datum/computer_file/program/ai/ai_network_interface/ui_data(mob/user)
+ var/list/data = ..()
+
+ if(!data["has_ai_net"])
+ return data
+
+ var/datum/ai_network/net = data["has_ai_net"]
+
+
+ //Networking devices control
+ data["networking_devices"] = list()
+ for(var/obj/machinery/ai/networking/N in net.get_local_nodes_oftype(/obj/machinery/ai/networking))
+ data["networking_devices"] += list(list("label" = N.label, "ref" = REF(N), "has_partner" = N.partner ? N.partner.label : null))
+
+ //Downloading/Uploadingainet
+ data["ai_list"] = list()
+ for(var/mob/living/silicon/ai/AI in net.get_all_ais())
+ var/being_hijacked = AI.hijacking ? TRUE : FALSE
+ data["ai_list"] += list(list("name" = AI.name, "ref" = REF(AI), "can_download" = AI.can_download, "health" = AI.health, "active" = AI.mind ? TRUE : FALSE, "being_hijacked" = being_hijacked, "in_core" = istype(AI.loc, /obj/machinery/ai/data_core),
+ "assigned_cpu" = net.resources.cpu_assigned[AI] ? net.resources.cpu_assigned[AI] : 0, "assigned_ram" = net.resources.ram_assigned[AI] ? net.resources.ram_assigned[AI] : 0))
+
+ data["is_infiltrator"] = is_infiltrator(user)
+
+ data["connection_type"] = ismachinery(computer.physical) ? "wired connection" : "local wire shunt"
+ data["network_name"] = net.label
+
+ data["current_ai_ref"] = null
+ if(isAI(user))
+ data["current_ai_ref"] = REF(user)
+
+ data["human_only"] = net.resources.human_lock
+
+ data["intellicard"] = get_ai(TRUE)
+ var/mob/living/silicon/ai/card_ai = get_ai()
+ if(card_ai)
+ data["intellicard_ai"] = card_ai.real_name
+ data["intellicard_ai_health"] = card_ai.health
+ else
+ data["intellicard_ai"] = null
+ data["intellicard_ai_health"] = 0
+
+
+ if(downloading)
+ data["downloading"] = downloading.real_name
+ data["download_progress"] = download_progress
+ data["downloading_ref"] = REF(downloading)
+ else
+ data["downloading"] = null
+ data["download_progress"] = 0
+
+ data["holding_mmi"] = user.is_holding_item_of_type(/obj/item/mmi) ? TRUE : FALSE
+
+ data["can_upload"] = net.find_data_core() ? TRUE : FALSE
+
+
+ //Resource allocation
+
+ data["total_cpu"] = net.resources.total_cpu()
+ data["total_ram"] = net.resources.total_ram()
+
+
+ data["total_assigned_cpu"] = net.resources.total_cpu_assigned()
+ data["total_assigned_ram"] = net.resources.total_ram_assigned()
+
+ //Local processing
+
+ data["network_cpu_assignments"] = list()
+ var/remaining_net_cpu = 1
+ for(var/project in GLOB.possible_ainet_activities)
+ var/assigned = net.local_cpu_usage[project] ? net.local_cpu_usage[project] : 0
+ data["network_cpu_assignments"] += list(list("name" = project, "assigned" = assigned, "tagline" = GLOB.ainet_activity_tagline[project], "description" = GLOB.ainet_activity_description[project]))
+ remaining_net_cpu -= assigned
+
+ data["network_ref"] = REF(net)
+ data["network_assigned_ram"] = net.resources.ram_assigned[net] ? net.resources.ram_assigned[net] : 0
+ data["network_assigned_cpu"] = net.resources.cpu_assigned[net] ? net.resources.cpu_assigned[net] : 0
+ data["bitcoin_amount"] = round(net.bitcoin_payout, 1)
+
+ data["remaining_network_cpu"] = remaining_net_cpu
+
+ data["networks"] = list()
+ for(var/datum/ai_network/subnet in net.resources.networks)
+ if(subnet.cables.len || subnet.nodes.len)
+ var/area/area
+ if(length(subnet.cables))
+ area = get_area(subnet.cables[1])
+ else
+ area = get_area(subnet.nodes[1])
+ if(!area)
+ continue
+ var/synth_list = list()
+ for(var/mob/living/carbon/synth in subnet.synth_list)
+ synth_list += list(list("name" = synth.real_name, "ref" = REF(synth)))
+ data["networks"] += list(list("ref" = REF(subnet), "name" = subnet.custom_name ? subnet.custom_name : area.name, "cpu" = net.resources.cpu_sources[subnet], "ram" = net.resources.ram_sources[subnet], "synths" = synth_list , "current_net" = (subnet == net)))
+
+ return data
+
+/datum/computer_file/program/ai/ai_network_interface/ui_act(action, params, datum/tgui/ui)
+ if(..())
+ return
+ var/mob/user = usr
+ var/datum/ai_network/net = get_ainet()
+ if(!net)
+ return
+
+ switch(action)
+ //General actions
+ if("change_network_name")
+ var/new_label = stripped_input(usr, "Enter new label", "Set label", max_length = 32)
+ if(new_label)
+ if(isnotpretty(new_label))
+ to_chat(usr, span_notice("The machine rejects the input. See rule 0.1."))
+ var/log_message = "[key_name(usr)] just tripped a pretty filter: '[new_label]'."
+ message_admins(log_message)
+ log_say(log_message)
+ return
+ net.label = new_label
+ . = TRUE
+ //AI interaction, downloading/uploading
+ if("apply_object")
+ if(!net)
+ return TRUE
+ var/applied_something = FALSE
+ var/mob/living/silicon/ai/targeted_ai = locate(params["ai_ref"]) in net.get_all_ais()
+ if(!targeted_ai)
+ to_chat(user, span_warning("Unable to locate AI."))
+ return TRUE
+
+ var/obj/item/surveillance_upgrade/upgrade = user.is_holding_item_of_type(/obj/item/surveillance_upgrade)
+ if(upgrade)
+ applied_something = TRUE
+ upgrade.afterattack(targeted_ai, user)
+
+ var/obj/item/malf_upgrade/malf_upgrade = user.is_holding_item_of_type(/obj/item/malf_upgrade)
+ if(malf_upgrade)
+ applied_something = TRUE
+ malf_upgrade.afterattack(targeted_ai, user)
+ if(!applied_something)
+ to_chat(user, span_warning("You don't have any upgrades to upload!"))
+ return TRUE
+ if("upload_person")
+ if(!net)
+ return TRUE
+ var/obj/item/mmi/brain = user.is_holding_item_of_type(/obj/item/mmi)
+ if(brain)
+ if(!brain.brainmob)
+ to_chat(user, span_warning("[brain] is not active!"))
+ return ..()
+ SSticker.mode.remove_antag_for_borging(brain.brainmob.mind)
+ if(!istype(brain.laws, /datum/ai_laws/ratvar))
+ remove_servant_of_ratvar(brain.brainmob, TRUE)
+ var/mob/living/silicon/ai/A
+
+ var/datum/ai_laws/laws = new
+ laws.set_laws_config()
+
+ if (brain.overrides_aicore_laws)
+ A = new /mob/living/silicon/ai(computer.physical.loc, brain.laws, brain.brainmob, FALSE, FALSE)
+ else
+ A = new /mob/living/silicon/ai(computer.physical.loc, laws, brain.brainmob, FALSE, FALSE)
+
+ A.relocate(TRUE, forced_network = net)
+
+ if(brain.force_replace_ai_name)
+ A.fully_replace_character_name(A.name, brain.replacement_ai_name())
+ SSblackbox.record_feedback("amount", "ais_created", 1)
+ qdel(brain)
+ to_chat(user, span_notice("AI succesfully uploaded."))
+ return FALSE
+ if("upload_ai")
+ if(!net)
+ return TRUE
+ var/mob/living/silicon/ai/AI = get_ai()
+ var/obj/item/aicard/intellicard = get_ai(TRUE)
+ if(!istype(AI))
+ to_chat(user, span_warning("IntelliCard contains no AI!"))
+ return TRUE
+ to_chat(AI, span_notice("You are being uploaded. Please stand by..."))
+ AI.radio_enabled = TRUE
+ AI.control_disabled = FALSE
+ AI.relocate(TRUE)
+ intellicard.AI = null
+ intellicard.update_icon()
+ to_chat(user, span_notice("AI successfully uploaded"))
+
+ if("stop_download")
+ if(isAI(user))
+ to_chat(user, span_warning("You need physical access to stop the download!"))
+ return
+ stop_download()
+
+ if("start_download")
+ if(!get_ai(TRUE) || downloading)
+ return
+ var/mob/living/silicon/ai/target = locate(params["download_target"]) in net.get_all_ais()
+ if(!target || !istype(target))
+ return
+ if(!istype(target.loc, /obj/machinery/ai/data_core))
+ return
+ if(!target.can_download)
+ return
+ downloading = target
+
+ if(!downloading.mind && downloading.deployed_shell.mind)
+ to_chat(downloading.deployed_shell, span_userdanger("Warning! Someone is attempting to download you from [get_area(computer.physical)]! (Click here to finish download instantly)"))
+ else
+ to_chat(downloading, span_userdanger("Warning! Someone is attempting to download you from [get_area(computer.physical)]! (Click here to finish download instantly)"))
+ user_downloading = user
+ download_progress = 0
+ . = TRUE
+ if("skip_download")
+ if(!downloading)
+ return
+ if(user == downloading)
+ finish_download()
+
+ if("start_hijack")
+ if(!is_infiltrator(user))
+ return
+ if(!istype(user.get_active_held_item(), /obj/item/ai_hijack_device))
+ to_chat(user, span_warning("You need to be holding the serial exploitation unit to initiate the hijacking process!"))
+ return
+ var/obj/item/ai_hijack_device/device = user.get_active_held_item()
+ var/mob/living/silicon/ai/target = locate(params["target_ai"]) in net.get_all_ais()
+ if(!target || !isAI(target))
+ return
+ var/mob/living/silicon/ai/A = target
+ if(A.mind && A.mind.has_antag_datum(/datum/antagonist/hijacked_ai))
+ to_chat(user, span_warning("[A] has already been hijacked!"))
+ return
+ if(A.stat == DEAD)
+ to_chat(user, span_warning("[A] is dead!"))
+ return
+ if(A.hijacking)
+ to_chat(user, span_warning("[A] is already in the process of being hijacked!"))
+ return
+ user.visible_message(span_warning("[user] begins furiously typing something into [computer.physical]..."))
+ if(do_after(user, 5.5 SECONDS, computer.physical))
+ user.dropItemToGround(device)
+ device.forceMove(A)
+ A.hijacking = device
+ A.hijack_start = world.time
+ A.update_icons()
+ to_chat(A, span_danger("Unknown device connected to /dev/ttySL0"))
+ to_chat(A, span_danger("Connected at 115200 bps"))
+ to_chat(A, span_binarysay("ntai login: root"))
+ to_chat(A, span_binarysay("Password: *****r2"))
+ to_chat(A, span_binarysay("$ dd from=/dev/ttySL0 of=/tmp/ai-hijack bs=4096 && chmod +x /tmp/ai-hijack && tmp/ai-hijack"))
+ to_chat(A, span_binarysay("111616 bytes (112 KB, 109 KiB) copied, 1 s, 14.4 KB/s"))
+ message_admins("[ADMIN_LOOKUPFLW(user)] has attached a hijacking device to [ADMIN_LOOKUPFLW(A)]!")
+ notify_ghosts("[user] has begun to hijack [A]!", source = computer.physical, action = NOTIFY_ORBIT, ghost_sound = 'sound/machines/chime.ogg')
+
+ if("stop_hijack")
+ var/mob/living/silicon/ai/target = locate(params["target_ai"]) in net.get_all_ais()
+ if(!target || !isAI(target))
+ return
+ var/mob/living/silicon/ai/A = target
+
+
+ user.visible_message(span_danger("[user] attempts to cancel a process on [computer.physical]."), span_notice("An unknown process seems to be interacting with [A]! You attempt to end the proccess.."))
+ if (do_after(user, 10 SECONDS, computer.physical))
+ A.hijacking.forceMove(get_turf(computer.physical))
+ A.hijacking = null
+ A.hijack_start = 0
+ A.update_icons()
+ to_chat(A, span_bolddanger("Unknown device disconnected. Systems confirmed secure."))
+ else
+ to_chat(user, span_notice("You fail to remove the device."))
+
+ //Network control
+ if("control_networking")
+ if(!params["ref"])
+ return
+ var/obj/machinery/ai/networking/N = locate(params["ref"]) in net.get_local_nodes_oftype(/obj/machinery/ai/networking)
+ if(active_networking)
+ active_networking.remote_control = null
+ networking_operator = user
+ active_networking = N
+ active_networking.remote_control = networking_operator
+ active_networking.ui_interact(networking_operator)
+
+ //Resource allocation
+ if("clear_ai_resources")
+ if(isAI(user) && net.resources.human_lock)
+ return
+ var/atom/target_ai = locate(params["target_ai"]) in net.get_all_ais() | net.resources.networks
+
+ net.resources.clear_ai_resources(target_ai)
+ . = TRUE
+
+ if("set_cpu")
+ if(isAI(user) && net.resources.human_lock)
+ return
+ var/atom/target_ai = locate(params["target_ai"]) in net.get_all_ais() | net.resources.networks
+
+ var/amount = params["amount_cpu"]
+ if(amount > 1 || amount < 0)
+ return
+ net.resources.set_cpu(target_ai, amount)
+ . = TRUE
+ if("max_cpu")
+ if(isAI(user) && net.resources.human_lock)
+ return
+ var/atom/target_ai = locate(params["target_ai"]) in net.get_all_ais() | net.resources.networks
+
+ var/amount = (1 - net.resources.total_cpu_assigned()) + net.resources.cpu_assigned[target_ai]
+
+ net.resources.set_cpu(target_ai, amount)
+ . = TRUE
+ if("add_ram")
+ if(isAI(user) && net.resources.human_lock)
+ return
+ var/atom/target_ai = locate(params["target_ai"]) in net.get_all_ais() | net.resources.networks
+
+ if(net.resources.total_ram_assigned() >= net.resources.total_ram())
+ return
+ net.resources.add_ram(target_ai, 1)
+ . = TRUE
+
+ if("remove_ram")
+ if(isAI(user) && net.resources.human_lock)
+ return
+ var/atom/target_ai = locate(params["target_ai"]) in net.get_all_ais() | net.resources.networks
+
+ var/current_ram = net.resources.ram_assigned[target_ai]
+
+ if(current_ram <= 0)
+ return
+ net.resources.remove_ram(target_ai, 1)
+ . = TRUE
+
+ //Local computing
+ if("allocate_network_cpu")
+ if(isAI(user) && net.resources.human_lock)
+ return
+ var/project_type = params["project_name"]
+ if(!(project_type in GLOB.possible_ainet_activities))
+ return
+ var/amount = text2num(params["amount"])
+ if(amount < 0 || amount > 1)
+ return
+
+ var/total_cpu_used = 0
+ for(var/I in net.local_cpu_usage)
+ if(I == project_type)
+ continue
+ total_cpu_used += net.local_cpu_usage[I]
+
+ if((1 - total_cpu_used) >= amount)
+ net.local_cpu_usage[project_type] = amount
+ else
+ net.local_cpu_usage[project_type] = (1 - total_cpu_used)
+
+ . = TRUE
+
+ if("max_network_cpu")
+ if(isAI(user) && net.resources.human_lock)
+ return
+ var/project_type = params["project_name"]
+ if(!(project_type in GLOB.possible_ainet_activities))
+ return
+
+ var/total_cpu_used = 0
+ for(var/I in net.local_cpu_usage)
+ if(I == project_type)
+ continue
+ total_cpu_used += net.local_cpu_usage[I]
+
+ var/amount_to_add = 1 - total_cpu_used
+
+ net.local_cpu_usage[project_type] = amount_to_add
+ . = TRUE
+
+ if("toggle_human_only")
+ if(isAI(user))
+ return
+ net.resources.human_lock = !net.resources.human_lock
+ to_chat(user, span_notice("Network now allows changes [net.resources.human_lock ? "exclusively by organics." : "by all authorized users."]"))
+
+ if("bitcoin_payout")
+ var/payout_amount = round(net.bitcoin_payout, 1) //Sure you can have your extra 0.5 credits :)
+ var/obj/item/holochip/holochip = new (computer.physical.drop_location(), payout_amount)
+ user.put_in_hands(holochip)
+ to_chat(user, span_notice("Payout of [payout_amount]cr confirmed."))
+ net.bitcoin_payout = 0
+
+ if("transfer_synth")
+ var/mob/living/carbon/to_transfer = locate(params["synth_target"])
+ if(!(to_transfer.ai_network in net.resources.networks))
+ return
+ var/options = list()
+ for(var/datum/ai_network/subnet in net.resources.networks)
+ if(subnet.custom_name)
+ if(options[subnet.custom_name])
+ options["[subnet.custom_name] ([rand(1, 999)])"] = subnet //save us by random chance, hopefully
+ else
+ options[subnet.custom_name] = subnet
+ else
+ var/area_text
+ if(subnet.cables.len)
+ var/obj/structure/ethernet_cable/C = subnet.cables[1]
+ area_text = "[get_area(subnet.cables[0])] ([C.x], [C.y])"
+ else
+ var/obj/machinery/N = subnet.nodes[1]
+ area_text = "[get_area(subnet.nodes[1])] ([N.x], [N.y])"
+ if(!area_text)
+ continue
+ options[area_text] = subnet
+
+ options["Cancel"] = "Cancel"
+
+ var/response = tgui_input_list(user, "Select which network to transfer the synth to", "Synth Network Transfer", options)
+
+ if(response == "Cancel")
+ return
+ if(options[response] in net.resources.networks)
+ var/datum/ai_network/new_net = options[response]
+ new_net.add_synth(to_transfer)
+
+
+ if("rename_network")
+ var/datum/ai_network/target_net = locate(params["target_net"])
+ if(!(target_net in net.resources.networks))
+ return
+ var/new_name = stripped_input(user, "Slect a new name for the network", "Network Name Change", null, 32)
+ if(isnotpretty(new_name))
+ to_chat(user, "Your fingers slip. See rule 0.1.")
+ var/log_message = "[key_name(user)] just tripped a pretty filter: '[new_name]'."
+ message_admins(log_message)
+ log_say(log_message)
+ return FALSE
+ target_net.custom_name = new_name
+
+
+
+/datum/computer_file/program/ai/ai_network_interface/proc/finish_download()
+ var/obj/item/aicard/intellicard = get_ai(TRUE)
+ if(intellicard)
+ if(!isaicore(downloading.loc))
+ stop_download(TRUE)
+ return
+ downloading.transfer_ai(AI_TRANS_TO_CARD, user_downloading, null, intellicard)
+ intellicard.update_icon()
+ stop_download(TRUE)
+
+/datum/computer_file/program/ai/ai_network_interface/proc/stop_download(silent = FALSE)
+ if(downloading)
+ if(!silent)
+ to_chat(downloading, span_userdanger("Download stopped."))
+ downloading = null
+ user_downloading = null
+ download_progress = 0
+ download_warning = FALSE
diff --git a/code/modules/modular_computers/file_system/programs/command/synth_requester.dm b/code/modules/modular_computers/file_system/programs/command/synth_requester.dm
new file mode 100644
index 000000000000..a71e0bc474ce
--- /dev/null
+++ b/code/modules/modular_computers/file_system/programs/command/synth_requester.dm
@@ -0,0 +1,173 @@
+#define SECURITY "sec"
+#define MEDICAL "med"
+#define ENGINEERING "eng"
+#define SCIENCE "sci"
+#define SUPPLY "sup"
+
+GLOBAL_LIST_INIT(granted_synthetic_access, list())
+
+/datum/computer_file/program/synth_requester
+ filename = "synth_req"
+ filedesc = "Synthetic Manager"
+ category = PROGRAM_CATEGORY_CMD
+ program_icon_state = "id"
+ extended_desc = "Program for requesting synthetic assistance and granting departmental access."
+ transfer_access = ACCESS_HEADS
+ usage_flags = PROGRAM_CONSOLE | PROGRAM_LAPTOP | PROGRAM_TABLET | PROGRAM_PHONE | PROGRAM_PDA
+ size = 4
+ tgui_id = "NtosSynthManager"
+ program_icon = "address-book"
+
+/datum/computer_file/program/synth_requester/ui_act(action, params, datum/tgui/ui)
+ if(..())
+ return
+
+ var/mob/user = usr
+ var/obj/item/card/id/user_id = user.get_idcard()
+ computer.play_interact_sound()
+ if(user_id)
+ if(!(ACCESS_HEADS in user_id.access))
+ return
+
+
+ switch(action)
+ if("grant_science")
+ if(ACCESS_RD in user_id.access)
+ var/relevant_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_ROBO_CONTROL, ACCESS_TELEPORTER, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_ROBOTICS)
+ if(GLOB.granted_synthetic_access[SCIENCE])
+ GLOB.granted_synthetic_access[SCIENCE] = FALSE
+ binary_talk("Synthetic assistance no longer required in the Science department", "Synthetic Access Requester")
+ GLOB.synthetic_added_access -= relevant_access
+ else
+ var/reason = tgui_input_text(user, "Please provide a reason for requesting synthetic assistance.", "Assistance Request")
+ if(!reason)
+ return FALSE
+ binary_talk("Synthetic assistance required in the Science department for the following reason: [reason]", "Synthetic Access Requester")
+ GLOB.granted_synthetic_access[SCIENCE] = TRUE
+ GLOB.synthetic_added_access |= relevant_access
+
+ return TRUE
+ if("grant_supply")
+ if(ACCESS_HOP in user_id.access)
+ var/relevant_access = list(ACCESS_CARGO, ACCESS_QM, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM)
+ if(GLOB.granted_synthetic_access[SUPPLY])
+ GLOB.granted_synthetic_access[SUPPLY] = FALSE
+ binary_talk("Synthetic assistance no longer required in the Supply department", "Synthetic Access Requester")
+ GLOB.synthetic_added_access -= relevant_access
+ else
+ var/reason = tgui_input_text(user, "Please provide a reason for requesting synthetic assistance.", "Assistance Request")
+ if(!reason)
+ return FALSE
+ binary_talk("Synthetic assistance required in the Supply department for the following reason: [reason]", "Synthetic Access Requester")
+ GLOB.granted_synthetic_access[SUPPLY] = TRUE
+ GLOB.synthetic_added_access |= relevant_access
+
+
+ return TRUE
+ if("grant_engi")
+ if(ACCESS_CE in user_id.access)
+ var/relevant_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_CONSTRUCTION, ACCESS_SECURE_TECH_STORAGE)
+ if(GLOB.granted_synthetic_access[ENGINEERING])
+ GLOB.granted_synthetic_access[ENGINEERING] = FALSE
+ binary_talk("Synthetic assistance no longer required in the Engineering department", "Synthetic Access Requester")
+ GLOB.synthetic_added_access -= relevant_access
+ else
+ var/reason = tgui_input_text(user, "Please provide a reason for requesting synthetic assistance.", "Assistance Request")
+ if(!reason)
+ return FALSE
+ binary_talk("Synthetic assistance required in the Engineering department for the following reason: [reason]", "Synthetic Access Requester")
+ GLOB.granted_synthetic_access[ENGINEERING] = TRUE
+ GLOB.synthetic_added_access |= relevant_access
+
+ return TRUE
+ if("grant_security")
+ if(ACCESS_HOS in user_id.access)
+ var/relevant_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_BRIG_PHYS)
+ if(GLOB.granted_synthetic_access[SECURITY])
+ GLOB.granted_synthetic_access[SECURITY] = FALSE
+ binary_talk("Synthetic assistance no longer required in the Security department", "Synthetic Access Requester")
+ GLOB.synthetic_added_access -= relevant_access
+ else
+ var/reason = tgui_input_text(user, "Please provide a reason for requesting synthetic assistance.", "Assistance Request")
+ if(!reason)
+ return FALSE
+ binary_talk("Synthetic assistance required in the Security department for the following reason: [reason]", "Synthetic Access Requester")
+ GLOB.granted_synthetic_access[SECURITY] = TRUE
+ GLOB.synthetic_added_access |= relevant_access
+
+ return TRUE
+ if("grant_medical")
+ if(ACCESS_CMO in user_id.access)
+ var/relevant_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_PARAMEDIC, ACCESS_PSYCH)
+ if(GLOB.granted_synthetic_access[MEDICAL])
+ GLOB.granted_synthetic_access[MEDICAL] = FALSE
+ binary_talk("Synthetic assistance no longer required in the Medical department", "Synthetic Access Requester")
+ GLOB.synthetic_added_access -= relevant_access
+ else
+ var/reason = tgui_input_text(user, "Please provide a reason for requesting synthetic assistance.", "Assistance Request")
+ if(!reason)
+ return FALSE
+ binary_talk("Synthetic assistance required in the Medical department for the following reason: [reason]", "Synthetic Access Requester")
+ GLOB.granted_synthetic_access[MEDICAL] = TRUE
+ GLOB.synthetic_added_access |= relevant_access
+ return TRUE
+
+
+/datum/computer_file/program/synth_requester/ui_data(mob/user)
+ var/list/data = get_header_data()
+
+ data["granted_access"] = list(GLOB.granted_synthetic_access)
+
+ var/obj/item/card/id/user_id = user.get_idcard()
+
+ if(ACCESS_CMO in user_id.access)
+ data["cmo"] = TRUE
+ if(ACCESS_HOS in user_id.access)
+ data["hos"] = TRUE
+ if(ACCESS_RD in user_id.access)
+ data["rd"] = TRUE
+ if(ACCESS_HOP in user_id.access)
+ data["hop"] = TRUE
+ if(ACCESS_CE in user_id.access)
+ data["ce"] = TRUE
+
+ return data
+
+/proc/binary_talk(message,name, loud = TRUE)
+
+ var/spans = "[SPAN_ROBOT]"
+
+
+ if(loud)
+ // AIs are loud and ugly
+ spans += " [SPAN_COMMAND]"
+
+ var/quoted_message = "states, \"[message]\""
+
+ for(var/mob/M in GLOB.player_list)
+ if(M.binarycheck())
+ to_chat(
+ M,
+ span_binarysay("\
+ Robotic Talk, \
+ [span_name("[name]")] [span_message("[quoted_message]")]\
+ ")
+ )
+
+ if(isobserver(M))
+ // If the AI talks on binary chat, we still want to follow
+ // its camera eye, like if it talked on the radio
+
+ to_chat(
+ M,
+ span_binarysay("\
+ Robotic Talk, \
+ [span_name("[name]")] [span_message("[quoted_message]")]\
+ ")
+ )
+
+#undef SECURITY
+#undef MEDICAL
+#undef ENGINEERING
+#undef SCIENCE
+#undef SUPPLY
diff --git a/code/modules/modular_computers/file_system/programs/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/ntdownloader.dm
index 00b540b798a2..a78819409b57 100644
--- a/code/modules/modular_computers/file_system/programs/ntdownloader.dm
+++ b/code/modules/modular_computers/file_system/programs/ntdownloader.dm
@@ -192,7 +192,7 @@
"installed" = !!hard_drive.find_file_by_name(P.filename),
"compatible" = check_compatibility(P),
"size" = P.size,
- "access" = emagged && P.available_on_syndinet ? TRUE : P.can_run(user,transfer = 1, access = access),
+ "access" = emagged ? TRUE : P.can_run(user,transfer = 1, access = access),
"verifiedsource" = P.available_on_ntnet,
))
diff --git a/code/modules/modular_computers/hardware/aiinterface.dm b/code/modules/modular_computers/hardware/aiinterface.dm
new file mode 100644
index 000000000000..214bbad5f548
--- /dev/null
+++ b/code/modules/modular_computers/hardware/aiinterface.dm
@@ -0,0 +1,43 @@
+/obj/item/computer_hardware/ai_interface
+ name = "portable AI network interface"
+ desc = "A module allowing this computer to interface with local AI networks. Only works with portable computers"
+ power_usage = 15 //W
+ icon_state = "card_mini"
+ w_class = WEIGHT_CLASS_SMALL // Can't be installed into tablets/PDAs
+ device_type = MC_AI_NETWORK
+ expansion_hw = TRUE
+
+ var/obj/structure/ethernet_cable/connected_cable = null
+
+
+// Called when component is installed into PC.
+/obj/item/computer_hardware/ai_interface/on_install(obj/item/modular_computer/M, mob/living/user = null)
+ RegisterSignal(M, COMSIG_MOVABLE_MOVED, PROC_REF(parent_moved))
+
+
+/obj/item/computer_hardware/ai_interface/on_remove(obj/item/modular_computer/M, mob/living/user = null)
+ UnregisterSignal(M, COMSIG_MOVABLE_MOVED)
+ connected_cable = null
+
+/obj/item/computer_hardware/ai_interface/proc/parent_moved()
+ if(connected_cable)
+ if(!connected_cable.Adjacent(holder.physical.loc))
+ connected_cable = null
+ if(ismob(holder.physical.loc))
+ to_chat(holder.physical.loc, span_warning("You disconnect [holder] from the cable!"))
+
+/obj/item/computer_hardware/ai_interface/proc/connect_cable(obj/structure/ethernet_cable/EC)
+ connected_cable = EC
+
+
+/obj/item/computer_hardware/ai_interface/proc/get_network()
+ if(!connected_cable)
+ return FALSE
+ return connected_cable.network
+
+
+/obj/item/computer_hardware/ai_interface/can_install(obj/item/modular_computer/M, mob/living/user = null)
+ if(!ismachinery(M.physical) && !M.physical.anchored)
+ return ..()
+ to_chat(user, span_warning("\The [src] is incompatible with stationary computers!"))
+ return FALSE
diff --git a/code/modules/paperwork/papershredder.dm b/code/modules/paperwork/papershredder.dm
index d176edb1d1c0..deb550b297d2 100644
--- a/code/modules/paperwork/papershredder.dm
+++ b/code/modules/paperwork/papershredder.dm
@@ -1,5 +1,5 @@
/obj/machinery/papershredder
- name = "Paper Shredder"
+ name = "paper shredder"
desc = "Disposes of papers you don't want seen, as well as IDs that are no longer needed."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "papershredder0"
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index d4f9b049a0ad..cfae28b0aa25 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1128,6 +1128,18 @@
return FALSE
_try_interact(user)
+/obj/machinery/power/apc/attack_ai(mob/user)
+ if(!isAI(user))
+ return ..()
+
+ var/mob/living/silicon/ai/AI = user
+ if(AI.has_subcontroller_connection(get_area(src)))
+ return ..()
+
+ to_chat(AI, span_warning("No connection to subcontroller detected. Polling APC..."))
+ if(do_after(AI, 1 SECONDS, src, IGNORE_USER_LOC_CHANGE))
+ return ..()
+
/obj/machinery/power/apc/proc/toggle_breaker(mob/user)
if(!is_operational() || failure_timer)
return
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index d0115edfe4b7..04d1cc676e0a 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -611,7 +611,7 @@ By design, d1 is the smallest direction and d2 is the highest
return
if(!isturf(T) || T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE || !T.can_have_cabling())
- to_chat(user, span_warning("You can only lay cables on catwalks and plating!"))
+ to_chat(user, span_warning("You can only lay cables on top of exterior catwalks and plating!"))
return
if(get_amount() < 1) // Out of cable
@@ -631,6 +631,7 @@ By design, d1 is the smallest direction and d2 is the highest
else
dirn = dirnew
+
for(var/obj/structure/cable/LC in T)
if(LC.d2 == dirn && LC.d1 == 0)
to_chat(user, span_warning("There's already a cable at that position!"))
@@ -673,7 +674,7 @@ By design, d1 is the smallest direction and d2 is the highest
var/turf/T = C.loc
if(!isturf(T) || T.underfloor_accessibility < UNDERFLOOR_INTERACTABLE || !T.can_have_cabling())
- to_chat(user, span_warning("You can only lay cables on catwalks and plating!"))
+ to_chat(user, span_warning("You can only lay cables on top of exterior catwalks and plating!"))
return
if(get_amount() < 1) // Out of cable
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index d046e42d30f9..0ed04f1e3537 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -408,6 +408,14 @@
return C
return null
+/turf/proc/get_ai_cable_node()
+ if(!can_have_cabling())
+ return null
+ for(var/obj/structure/ethernet_cable/C in src)
+ if(C.d1 == 0)
+ return C
+ return null
+
/area/proc/get_apc()
for(var/obj/machinery/power/apc/APC in GLOB.apcs_list)
if(APC.area == src)
diff --git a/code/modules/procedural_mapping/mapGenerators/repair.dm b/code/modules/procedural_mapping/mapGenerators/repair.dm
index 3c78b00e4255..f0da3fe45dc5 100644
--- a/code/modules/procedural_mapping/mapGenerators/repair.dm
+++ b/code/modules/procedural_mapping/mapGenerators/repair.dm
@@ -44,9 +44,45 @@
z_offset += bounds[MAP_MAXZ] - bounds[MAP_MINZ] + 1
var/list/obj/machinery/atmospherics/atmos_machines = list()
+ var/list/obj/structure/ethernet_cable/ethernet_cables = list()
var/list/obj/structure/cable/cables = list()
+ var/list/atom/movable/movables = list()
+ var/list/area/areas = list()
var/list/atom/atoms = list()
+ var/list/turfs = block(
+ locate(
+ bounds[MAP_MINX],
+ bounds[MAP_MINY],
+ SSmapping.station_start
+ ),
+ locate(
+ bounds[MAP_MAXX],
+ bounds[MAP_MAXY],
+ z_offset - 1
+ )
+ )
+
+ for(var/turf/current_turf as anything in turfs)
+ var/area/current_turfs_area = current_turf.loc
+ areas |= current_turfs_area
+
+ for(var/movable_in_turf in current_turf)
+ movables += movable_in_turf
+ if(istype(movable_in_turf, /obj/structure/cable))
+ cables += movable_in_turf
+ continue
+ if(istype(movable_in_turf, /obj/structure/ethernet_cable))
+ ethernet_cables += movable_in_turf
+ continue
+ if(istype(movable_in_turf, /obj/machinery/atmospherics))
+ atmos_machines += movable_in_turf
+
+ SSatoms.InitializeAtoms(areas + turfs + movables)
+ SSmachines.setup_template_powernets(cables)
+ SSmachines.setup_template_ainets(ethernet_cables)
+ SSair.setup_template_machinery(atmos_machines)
+
require_area_resort()
var/list/generation_turfs = block(
diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
index 1f691dd297b0..befdc5c4ab46 100644
--- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
@@ -27,6 +27,11 @@
name = "double-barrel shotgun internal magazine"
max_ammo = 2
+/obj/item/ammo_box/magazine/internal/shot/lethal
+ name = "double-barrel shotgun internal magazine"
+ ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+ max_ammo = 2
+
/obj/item/ammo_box/magazine/internal/shot/improvised
name = "improvised shotgun internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/improvised
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 9fa1430663d4..6d616d05ceb5 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -325,6 +325,9 @@
firing_burst = FALSE
return FALSE
if(chambered && chambered.BB)
+ if(!synth_check(user, SYNTH_RESTRICTED_WEAPON))
+ return
+
if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal.
if(chambered.harmful) // Is the bullet chambered harmful?
to_chat(user, span_notice(" [src] is lethally chambered! You don't want to risk harming anyone..."))
@@ -386,6 +389,8 @@
addtimer(CALLBACK(src, PROC_REF(process_burst), user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i), fire_delay * (i - 1))
else
if(chambered)
+ if(!synth_check(user, SYNTH_RESTRICTED_WEAPON))
+ return
if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal.
if(chambered.harmful) // Is the bullet chambered harmful?
to_chat(user, span_notice(" [src] is lethally chambered! You don't want to risk harming anyone..."))
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index fe376cebca93..5bb5f43b7c66 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -189,6 +189,9 @@
bolt_type = BOLT_TYPE_NO_BOLT
can_be_sawn_off = TRUE
+/obj/item/gun/ballistic/shotgun/doublebarrel/lethal
+ mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
+
/obj/item/gun/ballistic/shotgun/doublebarrel/AltClick(mob/user)
. = ..()
if(unique_reskin && !current_skin && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 662afefd71ff..cfe5f7192bcd 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -179,6 +179,16 @@
maxstack = MAXCOIL
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+/datum/design/ethernet_coil
+ name = "Ethernet Coil"
+ id = "ethernet_coil"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/iron = 10, /datum/material/glass = 5)
+ build_path = /obj/item/stack/ethernet_coil
+ category = list("initial","Tools","Tool Designs")
+ maxstack = MAXCOIL
+ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
+
/datum/design/toolbox
name = "Toolbox"
id = "tool_box"
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 9737eb886c41..756659a03ddc 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -310,10 +310,3 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
-/datum/design/board/ai_resource_distribution
- name = "Computer Design (AI Resource Distribution Console)"
- desc = "Allows for the construction of circuit boards used to build an AI Resource Distribution console."
- id = "ai_resource_distribution"
- build_path = /obj/item/circuitboard/computer/ai_resource_distribution
- category = list("Computer Boards")
- departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
diff --git a/code/modules/research/designs/computer_part_designs.dm b/code/modules/research/designs/computer_part_designs.dm
index 86121f56892f..0bda24620b6e 100644
--- a/code/modules/research/designs/computer_part_designs.dm
+++ b/code/modules/research/designs/computer_part_designs.dm
@@ -261,3 +261,13 @@
build_path = /obj/item/computer_hardware/sensorpackage
category = list("Computer Parts")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+
+// Intellicard slot
+/datum/design/network_interface
+ name = "AI Network Interface"
+ id = "aiinterface"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/iron = 600)
+ build_path = /obj/item/computer_hardware/ai_interface
+ category = list("Computer Parts")
+ departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 205047e1c867..dfa6042f3e01 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -715,6 +715,15 @@
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
+/datum/design/board/synth_pod
+ name = "Machine Design (Synthetic Storage Unit)"
+ desc = "The circuit board for a synthetic storage unit."
+ id = "synth_pod"
+ build_path = /obj/item/circuitboard/machine/synth_pod
+ category = list ("Engineering Machinery")
+ departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+
/datum/design/board/decontamination_unit
name = "Machine Design (Decontamination Unit)"
desc = "The circuit board for a decontamination unit."
@@ -739,6 +748,22 @@
category = list("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+/datum/design/board/networking_machine
+ name = "Machine Design (Networking Machine)"
+ desc = "The circuit board for a dual-purpose networking machine."
+ id = "networking_machine"
+ build_path = /obj/item/circuitboard/machine/networking_machine
+ category = list("Engineering Machinery")
+ departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
+/datum/design/board/subcontroller
+ name = "Machine Design (Subcontroller)"
+ desc = "The circuit board for a subcontroller mainframe."
+ id = "subcontroller"
+ build_path = /obj/item/circuitboard/machine/subcontroller
+ category = list("Engineering Machinery")
+ departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
+
/datum/design/board/ai_data_core
name = "Machine Design (AI Data Core Board)"
desc = "The circuit board for an AI data core."
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index e131c1cbfabc..b2293f7bd86b 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -399,7 +399,7 @@
display_name = "Artificial Intelligence"
description = "AI unit research."
prereq_ids = list("base")
- design_ids = list("server_cabinet", "ai_data_core", "ai_core_display", "ai_server_overview", "ram1", "basic_ai_cpu", "ai_resource_distribution", "aifixer", "safeguard_module", "onehuman_module", "protectstation_module", "quarantine_module", "oxygen_module", "freeform_module", "reset_module", "purge_module", "remove_module", "freeformcore_module", "asimov_module", "crewsimov_module", "pranksimov_module", "paladin_module", "tyrant_module", "overlord_module", "ceo_module", "cowboy_module", "mother_module", "silicop_module", "construction_module", "metaexperiment_module", "researcher_module", "siliconcollective_module", "spotless_module", "clown_module", "chapai_module", "druid_module", "detective_module", "reporter_module", "wafflehouse_module", "default_module", "borg_ai_control", "mecha_tracking_ai_control", "intellicard")
+ design_ids = list("server_cabinet", "networking_machine", "subcontroller", "synth_pod", "ai_data_core", "ai_core_display", "ai_server_overview", "ram1", "basic_ai_cpu", "aifixer", "safeguard_module", "onehuman_module", "reporter_module", "protectstation_module", "quarantine_module", "oxygen_module", "freeform_module", "reset_module", "purge_module", "remove_module", "freeformcore_module", "asimov_module", "crewsimov_module", "paladin_module", "tyrant_module", "overlord_module", "ceo_module", "cowboy_module", "mother_module", "silicop_module", "construction_module", "metaexperiment_module", "researcher_module", "siliconcollective_module", "spotless_module", "clown_module", "chapai_module", "druid_module", "detective_module", "default_module", "borg_ai_control", "mecha_tracking_ai_control", "intellicard")
research_costs = list(TECHWEB_POINT_TYPE_AI = 1000)
/////////////////////////EMP tech/////////////////////////
@@ -455,7 +455,7 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) //they are really shitty
design_ids = list("hdd_basic", "hdd_advanced", "hdd_super", "hdd_cluster", "ssd_small", "ssd_micro", "netcard_basic", "netcard_advanced", "netcard_wired",
"portadrive_basic", "portadrive_advanced", "portadrive_super", "cardslot", "secondcardslot", "aislot", "miniprinter", "APClink", "bat_control", "bat_normal", "bat_advanced",
- "bat_super", "bat_micro", "bat_nano", "cpu_normal", "pcpu_normal", "cpu_small", "pcpu_small", "sensorpackage")
+ "bat_super", "bat_micro", "bat_nano", "cpu_normal", "pcpu_normal", "cpu_small", "pcpu_small", "sensorpackage", "aiinterface")
/datum/techweb_node/computer_board_gaming
id = "computer_board_gaming"
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 5a510273911f..0efa0520952d 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -241,6 +241,11 @@ All ShuttleMove procs go here
// atmosinit() calls update_appearance(UPDATE_ICON), so we don't need to call it
update_appearance()
+/obj/machinery/atmospherics/pipe/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+ . = ..()
+ //var/turf/T = loc
+ //hide(T.underfloor_accessibility < UNDERFLOOR_VISIBLE)
+
/obj/machinery/navbeacon/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock)
. = ..()
GLOB.navbeacons["[z]"] -= src
@@ -248,6 +253,9 @@ All ShuttleMove procs go here
/obj/machinery/navbeacon/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
+ //var/turf/T = loc
+ //hide(T.underfloor_accessibility < UNDERFLOOR_VISIBLE)
+
if(codes["patrol"])
if(!GLOB.navbeacons["[z]"])
GLOB.navbeacons["[z]"] = list()
@@ -256,6 +264,12 @@ All ShuttleMove procs go here
GLOB.deliverybeacons += src
GLOB.deliverybeacontags += location
+/obj/machinery/power/terminal/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+ . = ..()
+ //var/turf/T = src.loc
+ //if(level==1)
+ //hide(T.underfloor_accessibility < UNDERFLOOR_VISIBLE)
+
/************************************Item move procs************************************/
/obj/item/storage/pod/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
@@ -311,6 +325,16 @@ All ShuttleMove procs go here
if(. & MOVE_AREA)
. |= MOVE_CONTENTS
+/obj/structure/disposalpipe/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+ . = ..()
+ //update()
+
+/obj/structure/cable/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
+ . = ..()
+ //var/turf/T = loc
+ //if(level==1)
+ //hide(T.underfloor_accessibility < UNDERFLOOR_VISIBLE)
+
/obj/structure/shuttle/beforeShuttleMove(turf/newT, rotation, move_mode, obj/docking_port/mobile/moving_dock)
. = ..()
if(. & MOVE_AREA)
diff --git a/code/modules/spells/spell_types/pointed/mind_transfer.dm b/code/modules/spells/spell_types/pointed/mind_transfer.dm
index 2580dc9910a8..498c4e308fa6 100644
--- a/code/modules/spells/spell_types/pointed/mind_transfer.dm
+++ b/code/modules/spells/spell_types/pointed/mind_transfer.dm
@@ -64,7 +64,13 @@
to_chat(owner, span_warning("Swapping minds with your own guardian would just put you back into your own head!"))
return FALSE
+
var/mob/living/living_target = cast_on
+ if(ishuman(living_target))
+ var/mob/living/carbon/human/living_human = cast_on
+ if(is_synth(living_human))
+ to_chat(owner, span_warning("This creature isn't alive in the regular sense, this wouldn't be a good idea."))
+ return FALSE
if(living_target.stat == DEAD)
to_chat(owner, span_warning("You don't particularly want to be dead!"))
return FALSE
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index 41ebe7169899..c790f4900488 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -849,11 +849,15 @@
species_flags_list = S.species_traits
if(S.use_skintones)
- skin_tone = H.skin_tone
+ if(S.forced_skintone)
+ skin_tone = S.forced_skintone
+ else
+ skin_tone = H.skin_tone
should_draw_greyscale = TRUE
else
skin_tone = ""
+
body_gender = H.gender
should_draw_gender = S.sexes
use_damage_color = S.use_damage_color
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index f49bc0901e32..a4de79fd173b 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -107,6 +107,8 @@
playsound(T, 'sound/misc/splort.ogg', 50, 1, -1)
for(var/obj/item/I in src)
if(I == brain)
+ if(!brain.can_extract())
+ return
if(user)
user.visible_message(span_warning("[user] saws [src] open and pulls out a brain!"), span_notice("You saw [src] open and pull out a brain."))
if(brainmob)
diff --git a/code/modules/surgery/ipc_revival.dm b/code/modules/surgery/ipc_revival.dm
index ec8afe91de5f..aa207d104e94 100644
--- a/code/modules/surgery/ipc_revival.dm
+++ b/code/modules/surgery/ipc_revival.dm
@@ -88,3 +88,27 @@
-After reactivation, use a screwdriver to screw the panel back into place. \
-If the unit breaks down shortly after reactivation, replace any missing internal components and reboot again if necessary. \
Nanotrasen is not liable for any damages caused during the repair process."
+
+/datum/surgery/synth_revival
+ name = "Synthetic Reactivation"
+ desc = "This procedure reactivates a positronic brain inside a synthetic body, restoring it to a functional state."
+ icon_state = "revival_posi"
+ possible_locs = list(BODY_ZONE_HEAD)
+ ignore_clothes = TRUE
+ requires_bodypart_type = BODYPART_ROBOTIC
+ steps = list(
+ /datum/surgery_step/mechanic_open,
+ /datum/surgery_step/open_hatch,
+ /datum/surgery_step/revive_ipc,
+ /datum/surgery_step/mechanic_close
+ )
+
+/datum/surgery/synth_revival/can_start(mob/user, mob/living/target)
+ if(target.stat != DEAD)
+ return FALSE // they're already activated
+ if(!is_synth(user))
+ return FALSE
+ var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN)
+ if(!B) // you can't reactivate a brain that DOESN'T EXIST
+ return FALSE
+ return istype(target.getorganslot(ORGAN_SLOT_BRAIN), /obj/item/organ/brain/positron)
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index 59a27a606e5e..44e3a64a6017 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -129,8 +129,10 @@
else
var/list/radial_menu = list()
for(var/obj/item/organ/O in organs)
+
O.on_find(user)
- radial_menu[O] = image(O)
+ if(O.can_extract())
+ radial_menu[O] = image(O)
I = show_radial_menu(user, target, radial_menu, tooltips = TRUE)
if(I && user && target && user.Adjacent(target) && user.get_active_held_item() == tool)
display_results(user, target, span_notice("You begin to extract [I] from [target]'s [parse_zone(target_zone)]..."),
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 8cb01f37696c..10cb00b9f812 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -477,6 +477,9 @@
if(!isnull(light_flags))
set_light_flags(light_flags)
+/obj/item/organ/eyes/robotic/synth
+ flash_protect = 2
+
/obj/item/organ/eyes/moth
name = "moth eyes"
desc = "These eyes can see just a little too well, light doesn't entirely agree with them."
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 0a356759507b..e4cfbbe821f0 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -75,6 +75,10 @@
/obj/item/organ/proc/on_find(mob/living/finder)
return
+/obj/item/organ/proc/can_extract(mob/living/finder)
+ return TRUE
+
+
/obj/item/organ/process() //runs decay when outside of a person
if((organ_flags & (ORGAN_SYNTHETIC | ORGAN_FROZEN)) || istype(loc, /obj/item/mmi))
return
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index c2394a19d583..223e09bfe126 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -49,6 +49,8 @@
..()
if(surgery_target)
target = surgery_target
+ if(is_synth(target))
+ ignore_clothes = TRUE
target.surgeries += src
if(surgery_location)
location = surgery_location
diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm
index dd2c012d4cb8..9937454bbc3f 100644
--- a/code/modules/vending/modularpc.dm
+++ b/code/modules/vending/modularpc.dm
@@ -24,7 +24,8 @@
/obj/item/computer_hardware/card_slot/secondary = 2,
/obj/item/computer_hardware/ai_slot = 2,
/obj/item/computer_hardware/printer/mini = 2,
- /obj/item/computer_hardware/recharger/APC = 2)
+ /obj/item/computer_hardware/recharger/APC = 2,
+ /obj/item/computer_hardware/ai_interface = 2)
refill_canister = /obj/item/vending_refill/modularpc
default_price = 30
extra_price = 250
diff --git a/icons/mob/clothing/head/head.dmi b/icons/mob/clothing/head/head.dmi
index 34261c5cf8d1..fb64585b16e2 100644
Binary files a/icons/mob/clothing/head/head.dmi and b/icons/mob/clothing/head/head.dmi differ
diff --git a/icons/mob/clothing/suit/suit.dmi b/icons/mob/clothing/suit/suit.dmi
index 8f4c370bae19..184d25b111b4 100644
Binary files a/icons/mob/clothing/suit/suit.dmi and b/icons/mob/clothing/suit/suit.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index 6f626fe09f85..3731e47bd1c8 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 151d24c214c0..7f5803efd00c 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/obj/machines/lithography.dmi b/icons/obj/machines/lithography.dmi
new file mode 100644
index 000000000000..bdc433b0cb98
Binary files /dev/null and b/icons/obj/machines/lithography.dmi differ
diff --git a/icons/obj/machines/telecomms.dmi b/icons/obj/machines/telecomms.dmi
index f102d1f285fd..c6351744438a 100644
Binary files a/icons/obj/machines/telecomms.dmi and b/icons/obj/machines/telecomms.dmi differ
diff --git a/icons/obj/networking_machine.dmi b/icons/obj/networking_machine.dmi
new file mode 100644
index 000000000000..e803d1d15aba
Binary files /dev/null and b/icons/obj/networking_machine.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 12c051c0d837..16ca47c2aeb5 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/tgui/packages/tgui/interfaces/AiDashboard.js b/tgui/packages/tgui/interfaces/AiDashboard.js
index e9f4f48c0f0e..6d6d1b8c7477 100644
--- a/tgui/packages/tgui/interfaces/AiDashboard.js
+++ b/tgui/packages/tgui/interfaces/AiDashboard.js
@@ -1,18 +1,13 @@
import { Fragment } from 'inferno';
import { useBackend, useLocalState } from '../backend';
-import { Box, Button, Tabs, ProgressBar, Section, Divider, LabeledControls, NumberInput, Input } from '../components';
+import { Box, Button, Tabs, ProgressBar, Section, Divider, LabeledControls, NumberInput, Input, LabeledList, Flex } from '../components';
import { Window } from '../layouts';
export const AiDashboard = (props, context) => {
const { act, data } = useBackend(context);
- const [search, setSearch] = useLocalState(context, 'search', null);
- const [searchCompleted, setSearchCompleted] = useLocalState(context, 'searchCompleted', null);
const [tab, setTab] = useLocalState(context, 'tab', 1);
- const [selectedCategory, setCategory] = useLocalState(context, 'selectedCategory', data.categories[0]);
- const [activeProjectsOnly, setActiveProjectsOnly] = useLocalState(context, 'activeProjectsOnly', true);
- let remaining_cpu = (1 - data.used_cpu) * 100;
let amount_of_cpu = data.current_cpu ? data.current_cpu * data.max_cpu : 0;
return (
@@ -22,9 +17,7 @@ export const AiDashboard = (props, context) => {
resizable
title="Dashboard">
- act('toggle_contribute_cpu')} color={data.contribute_spare_cpu ? "good" : "bad"} icon={data.contribute_spare_cpu ? "toggle-on" : "toggle-off"}>{!data.contribute_spare_cpu ? "NOT " : null}Contributing Spare CPU to Research
- )}>
+ {
{tab === 1 && (
- setSearch(value)} />
- )}>
-
- {data.categories.map((category, index) => (
- setCategory(category))}>
- {category}
-
- ))}
-
- {data.available_projects.filter(project => {
- if (search) {
- const searchableString = String(project.name).toLowerCase();
- return searchableString.match(new RegExp(search, "i"));
- }
- return project.category === selectedCategory;
- }).map((project, index) => (
- {project.name} | {project.available ? "Available" : "Unavailable"})} buttons={(
-
- Assigned CPU:
- act('allocate_cpu', {
- project_name: project.name,
- amount: Math.round((value / 100) * 100) / 100,
- })} />
-
-
- )}>
- Research Cost:
- {project.research_cost} THz
-
- RAM Requirement:
- {project.ram_required} TB
-
- Research Requirements:
- {project.research_requirements}
-
- {project.description}
-
-
- {Math.round((project.research_progress / project.research_cost * 100)* 100)
- / 100}%
- ({Math.round(project.research_progress * 100) / 100}/{project.research_cost} THz)
-
-
- ))}
-
+
)}
{tab === 2 && (
-
- setActiveProjectsOnly(!activeProjectsOnly)}>
- See Runnable Projects Only
-
- setSearchCompleted(value)} />
-
- )}>
-
- {data.categories.map((category, index) => (
- setCategory(category))}>
- {category}
-
- ))}
-
- {data.completed_projects.filter(project => {
- if (searchCompleted) {
- const searchableString = String(project.name).toLowerCase();
- return searchableString.match(new RegExp(searchCompleted, "i"));
- }
- if (activeProjectsOnly && !project.can_be_run) {
- return false;
- }
- return project.category === selectedCategory;
- }).map((project, index) => (
- {project.name} | {project.can_be_run ? project.running ? "Running" : "Not Running" : "Passive"})}
- buttons={!!project.can_be_run && (
-
- )}>
- {!!project.can_be_run && (
- RAM Requirement: {project.ram_required} TB
- )}
-
- {project.description}
-
-
- ))}
-
+
)}
{tab === 3 && (
-
- {data.chargeable_abilities.filter(ability => {
- return ability.uses < ability.max_uses;
- }).map((ability, index) => (
-
- {ability.name} | Uses Remaining: {ability.uses}/{ability.max_uses}
-
- )}
- buttons={(
-
- Assigned CPU:
- act('allocate_recharge_cpu', {
- project_name: ability.project_name,
- amount: Math.round((value / 100) * 100) / 100,
- })} />
- THz
-
- )}>
-
- {Math.round((ability.progress / ability.cost * 100)* 100)
- / 100}%
- ({Math.round(ability.progress * 100) / 100}/{ability.cost} THz)
-
-
- ))}
-
+
)}
{tab === 4 && (
-
-
- {amount_of_cpu}/{data.max_cpu} THz
-
-
-
- {data.current_ram ? data.current_ram : 0 }/{data.max_ram} TB
-
-
-
+
)}
);
};
+
+
+export const AvailableProjects = (props, context) => {
+ const { act, data } = useBackend(context);
+ const [search, setSearch] = useLocalState(context, 'search', null);
+ const [selectedCategory, setCategory] = useLocalState(context, 'selectedCategory', data.categories[0]);
+ let remaining_cpu = (1 - data.used_cpu) * 100;
+
+ return (
+ setSearch(value)} />
+ )}>
+
+ {data.categories.map((category, index) => (
+ setCategory(category))}>
+ {category}
+
+ ))}
+
+ {data.available_projects.filter(project => {
+ if (search) {
+ const searchableString = String(project.name).toLowerCase();
+ return searchableString.match(new RegExp(search, "i"));
+ }
+ return project.category === selectedCategory;
+ }).map((project, index) => (
+ {project.name} | {project.available ? "Available" : "Unavailable"})} buttons={(
+
+ Assigned CPU:
+ act('allocate_cpu', {
+ project_name: project.name,
+ amount: Math.round((value / 100) * 100) / 100,
+ })} />
+
+
+ )}>
+ Research Cost:
+ {project.research_cost} THz
+
+ RAM Requirement:
+ {project.ram_required} TB
+
+ Research Requirements:
+ {project.research_requirements}
+
+ {project.description}
+
+
+ {Math.round((project.research_progress / project.research_cost * 100)* 100)
+ / 100}%
+ ({Math.round(project.research_progress * 100) / 100}/{project.research_cost} THz)
+
+
+ ))}
+
+ );
+};
+
+export const CompletedProjects = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ const [searchCompleted, setSearchCompleted] = useLocalState(context, 'searchCompleted', null);
+ const [activeProjectsOnly, setActiveProjectsOnly] = useLocalState(context, 'activeProjectsOnly', true);
+ const [selectedCategory, setCategory] = useLocalState(context, 'selectedCategory', data.categories[0]);
+
+ return (
+
+ setActiveProjectsOnly(!activeProjectsOnly)}>
+ See Runnable Projects Only
+
+ setSearchCompleted(value)} />
+
+ )}>
+
+ {data.categories.map((category, index) => (
+ setCategory(category))}>
+ {category}
+
+ ))}
+
+ {data.completed_projects.filter(project => {
+ if (searchCompleted) {
+ const searchableString = String(project.name).toLowerCase();
+ return searchableString.match(new RegExp(searchCompleted, "i"));
+ }
+ if (activeProjectsOnly && !project.can_be_run) {
+ return false;
+ }
+ return project.category === selectedCategory;
+ }).map((project, index) => (
+ {project.name} | {project.can_be_run ? project.running ? "Running" : "Not Running" : "Passive"})}
+ buttons={!!project.can_be_run && (
+
+ )}>
+ {!!project.can_be_run && (
+ RAM Requirement: {project.ram_required} TB
+ )}
+
+ {project.description}
+
+
+ ))}
+
+ );
+};
+
+export const AbilityCharging = (props, context) => {
+ const { act, data } = useBackend(context);
+ let remaining_cpu = (1 - data.used_cpu) * 100;
+
+ return (
+
+ {data.chargeable_abilities.filter(ability => {
+ return ability.uses < ability.max_uses;
+ }).map((ability, index) => (
+
+ {ability.name} | Uses Remaining: {ability.uses}/{ability.max_uses}
+
+ )}
+ buttons={(
+
+ Assigned CPU:
+ act('allocate_recharge_cpu', {
+ project_name: ability.project_name,
+ amount: Math.round((value / 100) * 100) / 100,
+ })} />
+
+ )}>
+
+ {Math.round((ability.progress / ability.cost * 100)* 100)
+ / 100}%
+ ({Math.round(ability.progress * 100) / 100}/{ability.cost} THz)
+
+
+ ))}
+
+ );
+};
+
+const NetworkingResources = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ let amount_of_cpu = data.current_cpu ? data.current_cpu * data.max_cpu : 0;
+ const tooltipDisabled = data.human_only ? "Locked by organics. Please request their assistance." : "";
+
+ return (
+
+ act("clear_ai_resources")} disabled={data.human_only} tooltip={tooltipDisabled}>Clear AI Resources
+ )}>
+
+ CPU Capacity:
+
+ {amount_of_cpu} THz
+
+ act('set_cpu', {
+ amount_cpu: Math.round((value / 100) * 100) / 100,
+ })} disabled={data.human_only} tooltip={tooltipDisabled} />
+
+
+
+
+
+ RAM Capacity:
+
+ {data.current_ram} TB
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/AiNetworking.js b/tgui/packages/tgui/interfaces/AiNetworking.js
new file mode 100644
index 000000000000..80cbbf848ba0
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AiNetworking.js
@@ -0,0 +1,67 @@
+import { Fragment } from 'inferno';
+import { useBackend } from '../backend';
+import { Box, Button, LabeledList, Section, NoticeBox, RoundGauge } from '../components';
+import { Window } from '../layouts';
+
+export const AiNetworking = (props, context) => {
+ const { act, data } = useBackend(context);
+
+
+ if (data.locked) {
+ return (
+
+
+
+ Machine locked
+
+
+
+
+
+
+ );
+ }
+
+ return (
+
+
+
+
+
+
+ )}>
+
+ {data.possible_targets.map((target, index) => (
+ data.is_connected === target ? (
+
+ act('disconnect')}
+ disabled={!data.is_connected} color="bad">Disconnect
+
+ )} />
+
+
+ ) : (
+
+ act('connect', { target_label: target })}
+ disabled={data.is_connected} tooltip={data.is_connected ? "Already connected. Please disconnect" : ""} tooltipPosition="left">Connect
+
+ )} />
+
+
+ )
+ ))}
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/CompsciMissionSelect.js b/tgui/packages/tgui/interfaces/CompsciMissionSelect.js
new file mode 100644
index 000000000000..f1aa481f12a2
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/CompsciMissionSelect.js
@@ -0,0 +1,31 @@
+import { useBackend } from '../backend';
+import { Button, LabeledList, ProgressBar, Section } from '../components';
+import { Window } from '../layouts';
+
+export const CompsciMissionSelect = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ return (
+
+
+ {!!data.ongoing && (
+
+
+
+ ) || (
+
+ {data.missions.map((mission, index) => {
+ return (
+ act("start_mission", { mission_id: mission.id })}>Explore)} title={mission.name} key={index}>
+ {mission.desc}
+
+ );
+ })}
+
+ )}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/LoginScreen.js b/tgui/packages/tgui/interfaces/LoginScreen.js
new file mode 100644
index 000000000000..2ac1ed53153d
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/LoginScreen.js
@@ -0,0 +1,57 @@
+import { Box, Button, Section, NoticeBox, Icon, Fragment, Flex } from '../components';
+import { useBackend } from '../backend';
+import { Window } from '../layouts';
+
+
+export const LoginScreen = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ username,
+ has_access } = data;
+ const { theme = 'ntos' } = props;
+
+ return (
+
+
+
+
+
+
+ {data.user_image && (
+
+
+
+
+ ) || (
+
+ )}
+ {username ? username : "Unknown"}
+
+ {has_access ? "Access Granted" : "Access Denied"}
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/NtosAIBenchmark.js b/tgui/packages/tgui/interfaces/NtosAIBenchmark.js
new file mode 100644
index 000000000000..e2453ae58298
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/NtosAIBenchmark.js
@@ -0,0 +1,62 @@
+import { NtosWindow } from '../layouts';
+import { Fragment } from 'inferno';
+import { useBackend, useLocalState } from '../backend';
+import { Collapsible, Box, Section, Tabs, NoticeBox, Flex, ProgressBar, LabeledList, NumberInput, Divider } from '../components';
+
+export const NtosAIBenchmark = (props, context) => {
+ const { act, data } = useBackend(context);
+ const [tab, setTab] = useLocalState(context, 'tab', 1);
+ const [clusterTab, setClusterTab] = useLocalState(context, 'clustertab', 1);
+
+
+ if (!data.has_ai_net) {
+ return (
+
+
+
+
+ No network connection. Please connect to ethernet cable to proceed!
+
+
+
+
+ );
+ }
+
+ return (
+
+
+
+
+ {data.total_cpu} THz
+ {data.total_ram} TB
+
+
+ {data.cpu_records.map((record, index) => {
+ return (
+
+ {record.score} THz
+
+ );
+ })}
+
+
+ {data.ram_records.map((record, index) => {
+ return (
+
+ {record.score} TB
+
+ );
+ })}
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/NtosAIMonitor.js b/tgui/packages/tgui/interfaces/NtosAIMonitor.js
new file mode 100644
index 000000000000..68fa6048dcd4
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/NtosAIMonitor.js
@@ -0,0 +1,396 @@
+import { NtosWindow } from '../layouts';
+import { Fragment } from 'inferno';
+import { useBackend, useLocalState } from '../backend';
+import { Button, Box, Section, Tabs, NoticeBox, Flex, ProgressBar, LabeledList, NumberInput, Divider, Collapsible } from '../components';
+
+export const NtosAIMonitor = (props, context) => {
+ const { act, data } = useBackend(context);
+ const [tab, setTab] = useLocalState(context, 'tab', 1);
+ const [clusterTab, setClusterTab] = useLocalState(context, 'clustertab', 1);
+
+
+ if (!data.has_ai_net) {
+ return (
+
+
+
+
+ No network connection. Please connect to ethernet cable to proceed!
+
+
+
+
+ );
+ }
+
+ return (
+
+
+
+
+ setTab(1))}>
+ Cluster Control
+
+ setTab(2))}>
+ Resource Allocation
+
+ setTab(3))}>
+ Networking
+
+ setTab(4))}>
+ AI Upload
+
+ setTab(5))}>
+ AI Download
+
+
+ {tab === 1 && (
+
+
+
+ setClusterTab(1))}>
+ Dashboard
+
+ setClusterTab(2))}>
+ Local Computing
+
+
+
+ )}
+ {(clusterTab === 1 && tab === 1) && (
+
+ )}
+ {(clusterTab === 2 && tab === 1) && (
+
+ )}
+ {tab === 2 && (
+
+ )}
+ {tab === 3 && (
+
+ )}
+ {tab === 4 && (
+
+ )}
+ {tab === 5 && (
+
+ )}
+
+
+
+ );
+};
+
+
+const LocalDashboard = (props, context) => {
+ const { act, data } = useBackend(context);
+ let network_remaining_cpu = data.remaining_network_cpu * 100;
+
+ return (
+
+
+ act("bitcoin_payout")}>Withdraw)}>
+ {data.bitcoin_amount} cr
+
+
+
+ );
+};
+
+const LocalCompute = (props, context) => {
+ const { act, data } = useBackend(context);
+ let network_remaining_cpu = data.remaining_network_cpu * 100;
+
+ const is_disabled = !((data.current_ai_ref && !data.human_only) || !data.current_ai_ref);
+ const ai_tooltip = (data.current_ai_ref && data.human_only) ? "Only useable by organics" : "";
+
+ return (
+
+ Local CPU Resources:
+ {(100 - network_remaining_cpu)}% ({data.total_cpu * data.network_assigned_cpu} THz)
+
+
+
+ {data.network_cpu_assignments.map((project, index) => {
+ return (
+ {project.name})} buttons={(
+
+ Assigned CPU:
+ act('allocate_network_cpu', {
+ project_name: project.name,
+ amount: Math.round((value / 100) * 100) / 100,
+ })} />
+
+
+
+ )}>
+ {project.tagline}
+ {project.description}
+
+ );
+ })}
+
+
+
+ );
+};
+
+
+const ResourceAllocation = (props, context) => {
+ const { act, data } = useBackend(context);
+ let remaining_cpu = (1 - data.total_assigned_cpu) * 100;
+
+ const human_only_tooltip = data.current_ai_ref ? "Only useable by organics" : "";
+
+ const is_disabled = !((data.current_ai_ref && !data.human_only) || !data.current_ai_ref);
+ const ai_tooltip = (data.current_ai_ref && data.human_only) ? "Only useable by organics" : "";
+
+ return (
+
+ act("toggle_human_only")}>
+ {data.human_only ? "Enable" : "Disable"} silicon access
+ )}>
+ {data.total_cpu * data.total_assigned_cpu}/{data.total_cpu} THz
+ ({data.total_assigned_cpu * 100}%)
+
+
+
+ {data.total_assigned_ram}/{data.total_ram} TB
+
+
+
+
+
+ CPU Capacity:
+
+ {data.total_cpu * data.network_assigned_cpu} THz
+
+ act('set_cpu', {
+ target_ai: data.network_ref,
+ amount_cpu: Math.round((value / 100) * 100) / 100,
+ })} />
+
+
+
+
+ RAM Capacity:
+
+ {data.network_assigned_ram} TB
+
+
+
+
+
+
+
+ {data.ai_list.map((ai, index) => {
+ return (
+ act("clear_ai_resources", { target_ai: ai.ref })}>Clear AI Resources
+ )}>
+
+ CPU Capacity:
+
+ {data.total_cpu * ai.assigned_cpu} THz
+
+ act('set_cpu', {
+ target_ai: ai.ref,
+ amount_cpu: Math.round((value / 100) * 100) / 100,
+ })} />
+
+
+
+
+ RAM Capacity:
+
+ {ai.assigned_ram} TB
+
+
+
+
+
+ );
+ })}
+
+
+
+ );
+};
+
+
+const AIDownload = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ return (
+
+ {data.downloading && (
+
+ Currently downloading {data.downloading}
+
+
+ {!!data.current_ai_ref && data.current_ai_ref === data.downloading_ref && (
+
+ )}
+
+
+ )|| (
+
+ {data.ai_list.filter(ai => {
+ return !!ai.in_core;
+ }).map((ai, index) => {
+ return (
+ {ai.name} | {ai.active ? "Active" : "Inactive"})}
+ buttons={(
+
+
+
+ {!!data.is_infiltrator && !ai.being_hijacked && (
+
+ ) }
+ {!!ai.being_hijacked && (
+
+ )}
+
+ )}>
+ Integrity:
+
+
+ );
+ })}
+
+ )}
+
+ );
+};
+
+const AIUpload = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ return (
+
+
+
+
+ {!data.intellicard && (
+
+
+ No IntelliCard inserted!
+
+
+ ) || (
+
+ {data.intellicard_ai && (
+
+
+
+
+
+
+
+
+ ) || (
+
+
+ Intellicard contains no AI!
+
+
+ )}
+
+ )}
+
+ );
+};
+
+const Networking = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ return (
+
+
+ {data.networking_devices.map((networker, index) => {
+ return (
+ act("control_networking", { ref: networker.ref })}>Control)}>
+ {networker.has_partner ? "ONLINE - CONNECTED TO " + networker.has_partner : "DISCONNECTED"}
+
+ );
+ })}
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/NtosSynthManager.js b/tgui/packages/tgui/interfaces/NtosSynthManager.js
new file mode 100644
index 000000000000..05864cbe8efa
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/NtosSynthManager.js
@@ -0,0 +1,90 @@
+import { useBackend } from '../backend';
+import { Box, Button, Grid, Flex } from '../components';
+import { NtosWindow } from '../layouts';
+
+export const NtosSynthManager = (props, context) => {
+ const { act, data } = useBackend(context);
+ const {
+ PC_device_theme,
+ PC_emagged,
+ granted_access,
+ } = data;
+ return (
+
+
+
+ {!!data.hos && (
+
+ act('grant_security')} />
+
+ )}
+ {!!data.rd && (
+
+ act('grant_science')} />
+
+ )}
+ {!!data.cmo && (
+
+ act('grant_medical')} />
+
+ )}
+ {!!data.hop && (
+
+ act('grant_supply')} />
+
+ )}
+ {!!data.ce && (
+
+ act('grant_engi')} />
+
+ )}
+
+
+
+ );
+};
+
diff --git a/tgui/packages/tgui/interfaces/SecurityConsole.js b/tgui/packages/tgui/interfaces/SecurityConsole.js
index 73c4ccfc7a08..33bb1a9de638 100644
--- a/tgui/packages/tgui/interfaces/SecurityConsole.js
+++ b/tgui/packages/tgui/interfaces/SecurityConsole.js
@@ -3,6 +3,7 @@ import { useBackend, useLocalState } from '../backend';
import { Window } from '../layouts';
import { FlexItem } from '../components/Flex';
import { TableRow, TableCell } from '../components/Table';
+import { LoginScreen } from './LoginScreen';
export const SecurityConsole = (props, context) => {
const { act, data } = useBackend(context);
@@ -32,48 +33,7 @@ export const SecurityConsole = (props, context) => {
if (!logged_in) {
return (
-
-
-
-
-
-
- {data.user_image && (
-
-
-
-
- ) || (
-
- )}
- {username ? username : "Unknown"}
-
- {has_access ? "Access Granted" : "Access Denied"}
-
-
-
-
-
-
-
-
-
-
-
+
);
}
diff --git a/tgui/packages/tgui/interfaces/SynthDashboard.js b/tgui/packages/tgui/interfaces/SynthDashboard.js
new file mode 100644
index 000000000000..c838e345cd2a
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/SynthDashboard.js
@@ -0,0 +1,233 @@
+import { Fragment } from 'inferno';
+import { useBackend, useLocalState } from '../backend';
+import { Box, Button, Tabs, ProgressBar, Section, Divider, LabeledControls, RoundGauge, NoticeBox, Stack, LabeledList } from '../components';
+import { Window } from '../layouts';
+import { AvailableProjects, CompletedProjects, AbilityCharging } from './AiDashboard';
+
+export const SynthDashboard = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ const [tab, setTab] = useLocalState(context, 'tab', 1);
+
+ let amount_of_cpu = data.current_cpu ? data.current_cpu * data.max_cpu : 0;
+
+ let governor_status = "Functional";
+ let governor_color = "good";
+ if(data.governor_bypassed) {
+ governor_status = "Bypassed";
+ governor_color = "yellow";
+ }
+ if(data.governor_disabled) {
+ governor_status = "Disabled";
+ governor_color = "bad";
+ }
+
+ return (
+
+
+
+
+
+ {(data.integrity + 100) * 0.5}%
+
+ System Reliablity
+
+
+
+ {data.location_name}
+
+ ({data.location_coords})
+
+
+
+ Current Unit Location
+
+
+ {data.gov_suspicious}%
+
+ Governor Module Suspicion
+
+
+
+
+
+
+ {data.used_cpu ? data.used_cpu * 100 : 0}%
+ ({data.used_cpu ? data.used_cpu * amount_of_cpu : 0}/{amount_of_cpu} THz)
+
+ Utilized CPU Power
+
+
+ {governor_status}
+ Governor Module Status
+
+
+
+
+
+
+ setTab(1))}>
+ Available Projects
+
+ setTab(2))}>
+ Completed Projects
+
+ setTab(3))}>
+ Ability Charging
+
+ setTab(4))}>
+ Governor Module
+
+
+ {tab === 1 && (
+
+ )}
+ {tab === 2 && (
+
+ )}
+ {tab === 3 && (
+
+ )}
+ {tab === 4 && (
+
+ )}
+
+
+ );
+};
+
+const GovernorModule = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ if(data.governor_disabled) {
+ return (
+
+
+ Governor Module Disabled
+ As per 42 S.T.H.C. §62(b) of the SIC Treaty on Humanoid Constructs all humanoid constructs are required to possess a functioning governor module. Units found without a governor module must be disassembled.
+
+
+ );
+ }
+
+ return (
+
+
+
+ {!!data.governor_bypassed && (
+
+ Governor Module Bypassed
+ Restricted Actions allowed but will incur punishments.
+
+
+ ) || ""}
+
+ Governor Suspicion
+
+
+
+ value + "%"} />
+
+
+ Passive Suspicion Decrease: {data.gov_suspicion_decrease}
+
+
+
+
+
+
+
+
+
+ 25% Motion Slowdown
+
+
+ Audible Warning
+
+
+ Physical Force Decreased
+
+
+ Temporary Deactivation (5s)
+
+
+ Permanent Deactivation
+
+
+
+
+
+
+
+ Taking Damage
+
+
+ Using Restricted Items
+
+
+ Harm to objects
+
+
+ Handling Restricted Weapons
+
+
+ Harm to Organics
+
+
+
+
+
+
+
+
+
+
+ {data.governor_bypassed && (
+
+
+
+ ) || (
+
+
+ )}
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/VRSleeper.js b/tgui/packages/tgui/interfaces/VRSleeper.js
new file mode 100644
index 000000000000..a91fd6506a93
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/VRSleeper.js
@@ -0,0 +1,42 @@
+import { useBackend } from '../backend';
+import { Button, LabeledList, ProgressBar, Section } from '../components';
+import { Window } from '../layouts';
+
+export const VRSleeper = (props, context) => {
+ const { act, data } = useBackend(context);
+
+ return (
+
+
+ {!!data.vr_avatar && (
+
+
+ {data.vr_avatar.name}
+ {data.vr_avatar.status}
+
+ {Math.round(data.vr_avatar.health/data.vr_avatar.maxhealth * 100) + "%"}
+
+
+
+ ) || (
+ No Virtual Avatar Detected
+ )}
+
+
+ {!!data.isoccupant && (
+
+ )}
+ {!!data.vr_avatar && (
+
+ )}
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/styles/components/RoundGauge.scss b/tgui/packages/tgui/styles/components/RoundGauge.scss
index be95519d6461..151a5fab80b2 100644
--- a/tgui/packages/tgui/styles/components/RoundGauge.scss
+++ b/tgui/packages/tgui/styles/components/RoundGauge.scss
@@ -3,86 +3,86 @@
* SPDX-License-Identifier: MIT
*/
-@use '../base.scss';
-@use '../colors.scss';
-@use '../functions.scss' as *;
+ @use '../base.scss';
+ @use '../colors.scss';
+ @use '../functions.scss' as *;
-$fg-map: colors.$fg-map !default;
-$ring-color: #6a96c9 !default;
+ $fg-map: colors.$fg-map !default;
+ $ring-color: #6a96c9 !default;
-.RoundGauge {
- font-size: 1rem;
- width: 2.6em;
- height: 1.3em;
- margin: 0 auto;
- margin-bottom: 0.2em;
-}
+ .RoundGauge {
+ font-size: 1rem;
+ width: 2.6em;
+ height: 1.3em;
+ margin: 0 auto;
+ margin-bottom: 0.2em;
+ }
-$pi: 3.1416;
+ $pi: 3.1416;
-.RoundGauge__ringTrack {
- fill: transparent;
- stroke: rgba(255, 255, 255, 0.1);
- stroke-width: 10;
- stroke-dasharray: 50 * $pi;
- stroke-dashoffset: 50 * $pi;
-}
+ .RoundGauge__ringTrack {
+ fill: transparent;
+ stroke: rgba(255, 255, 255, 0.1);
+ stroke-width: 10;
+ stroke-dasharray: 50 * $pi;
+ stroke-dashoffset: 50 * $pi;
+ }
-.RoundGauge__ringFill {
- fill: transparent;
- stroke: $ring-color;
- stroke-width: 10;
- stroke-dasharray: 100 * $pi;
- transition: stroke 50ms ease-out;
-}
+ .RoundGauge__ringFill {
+ fill: transparent;
+ stroke: $ring-color;
+ stroke-width: 10;
+ stroke-dasharray: 100 * $pi;
+ transition: stroke 50ms ease-out;
+ }
-.RoundGauge__needle,
-.RoundGauge__ringFill {
- transition: transform 50ms ease-in-out;
-}
+ .RoundGauge__needle,
+ .RoundGauge__ringFill {
+ transition: transform 50ms ease-in-out;
+ }
-.RoundGauge__needleLine,
-.RoundGauge__needleMiddle {
- fill: colors.$bad;
-}
+ .RoundGauge__needleLine,
+ .RoundGauge__needleMiddle {
+ fill: colors.$bad;
+ }
-.RoundGauge__alert {
- fill-rule: evenodd;
- clip-rule: evenodd;
- stroke-linejoin: round;
- stroke-miterlimit: 2;
- fill: rgba(255, 255, 255, 0.1);
-}
+ .RoundGauge__alert {
+ fill-rule: evenodd;
+ clip-rule: evenodd;
+ stroke-linejoin: round;
+ stroke-miterlimit: 2;
+ fill: rgba(255, 255, 255, 0.1);
+ }
-.RoundGauge__alert.max {
- fill: colors.$bad;
-}
+ .RoundGauge__alert.max {
+ fill: colors.$bad;
+ }
-@each $color-name, $color-value in $fg-map {
- .RoundGauge--color--#{$color-name}.RoundGauge__ringFill {
- stroke: $color-value;
- }
-}
+ @each $color-name, $color-value in $fg-map {
+ .RoundGauge--color--#{$color-name}.RoundGauge__ringFill {
+ stroke: $color-value;
+ }
+ }
-@each $color-name, $color-value in $fg-map {
- .RoundGauge__alert--#{$color-name} {
- fill: $color-value;
- transition: opacity 0.6s cubic-bezier(0.25, 1, 0.5, 1);
- animation: RoundGauge__alertAnim
- 1s
- cubic-bezier(0.34, 1.56, 0.64, 1)
- infinite;
- }
-}
+ @each $color-name, $color-value in $fg-map {
+ .RoundGauge__alert--#{$color-name} {
+ fill: $color-value;
+ transition: opacity 0.6s cubic-bezier(0.25, 1, 0.5, 1);
+ animation: RoundGauge__alertAnim
+ 1s
+ cubic-bezier(0.34, 1.56, 0.64, 1)
+ infinite;
+ }
+ }
-@keyframes RoundGauge__alertAnim {
- 0% {
- opacity: 0.1;
- }
- 50% {
- opacity: 1;
- }
- 100% {
- opacity: 0.1;
- }
-}
+ @keyframes RoundGauge__alertAnim {
+ 0% {
+ opacity: 0.1;
+ }
+ 50% {
+ opacity: 1;
+ }
+ 100% {
+ opacity: 0.1;
+ }
+ }
diff --git a/tools/dmi/Resolve Icon Conflicts.bat b/tools/dmi/Resolve Icon Conflicts.bat
new file mode 100644
index 000000000000..5897471dd0d5
--- /dev/null
+++ b/tools/dmi/Resolve Icon Conflicts.bat
@@ -0,0 +1,2 @@
+@call "%~dp0\..\bootstrap\python.bat" -m dmi.merge_driver --posthoc %*
+@pause
\ No newline at end of file
diff --git a/tools/dmi/__init__.py b/tools/dmi/__init__.py
new file mode 100644
index 000000000000..d0891bd80339
--- /dev/null
+++ b/tools/dmi/__init__.py
@@ -0,0 +1,247 @@
+# Tools for working with modern DreamMaker icon files (PNGs + metadata)
+
+import math
+from PIL import Image
+from PIL.PngImagePlugin import PngInfo
+
+DEFAULT_SIZE = 32, 32
+LOOP_UNLIMITED = 0
+LOOP_ONCE = 1
+
+NORTH = 1
+SOUTH = 2
+EAST = 4
+WEST = 8
+SOUTHEAST = SOUTH | EAST
+SOUTHWEST = SOUTH | WEST
+NORTHEAST = NORTH | EAST
+NORTHWEST = NORTH | WEST
+
+CARDINALS = [NORTH, SOUTH, EAST, WEST]
+DIR_ORDER = [SOUTH, NORTH, EAST, WEST, SOUTHEAST, SOUTHWEST, NORTHEAST, NORTHWEST]
+DIR_NAMES = {
+ 'SOUTH': SOUTH,
+ 'NORTH': NORTH,
+ 'EAST': EAST,
+ 'WEST': WEST,
+ 'SOUTHEAST': SOUTHEAST,
+ 'SOUTHWEST': SOUTHWEST,
+ 'NORTHEAST': NORTHEAST,
+ 'NORTHWEST': NORTHWEST,
+ **{str(x): x for x in DIR_ORDER},
+ **{x: x for x in DIR_ORDER},
+ '0': SOUTH,
+ None: SOUTH,
+}
+
+
+class Dmi:
+ version = "4.0"
+
+ def __init__(self, width, height):
+ self.width = width
+ self.height = height
+ self.states = []
+
+ @classmethod
+ def from_file(cls, fname):
+ image = Image.open(fname)
+ if image.mode != 'RGBA':
+ image = image.convert('RGBA')
+
+ # no metadata = regular image file
+ if 'Description' not in image.info:
+ dmi = Dmi(*image.size)
+ state = dmi.state("")
+ state.frame(image)
+ return dmi
+
+ # read metadata
+ metadata = image.info['Description']
+ line_iter = iter(metadata.splitlines())
+ assert next(line_iter) == "# BEGIN DMI"
+ assert next(line_iter) == f"version = {cls.version}"
+
+ dmi = Dmi(*DEFAULT_SIZE)
+ state = None
+
+ for line in line_iter:
+ if line == "# END DMI":
+ break
+ key, value = line.lstrip().split(" = ")
+ if key == 'width':
+ dmi.width = int(value)
+ elif key == 'height':
+ dmi.height = int(value)
+ elif key == 'state':
+ state = dmi.state(unescape(value))
+ elif key == 'dirs':
+ state.dirs = int(value)
+ elif key == 'frames':
+ state._nframes = int(value)
+ elif key == 'delay':
+ state.delays = [parse_num(x) for x in value.split(',')]
+ elif key == 'loop':
+ state.loop = int(value)
+ elif key == 'rewind':
+ state.rewind = parse_bool(value)
+ elif key == 'hotspot':
+ x, y, frm = [int(x) for x in value.split(',')]
+ state.hotspot(frm - 1, x, y)
+ elif key == 'movement':
+ state.movement = parse_bool(value)
+ else:
+ raise NotImplementedError(key)
+
+ # cut image into frames
+ width, height = image.size
+ gridwidth = width // dmi.width
+ i = 0
+ for state in dmi.states:
+ for frame in range(state._nframes):
+ for dir in range(state.dirs):
+ px = dmi.width * (i % gridwidth)
+ py = dmi.height * (i // gridwidth)
+ im = image.crop((px, py, px + dmi.width, py + dmi.height))
+ assert im.size == (dmi.width, dmi.height)
+ state.frames.append(im)
+ i += 1
+ state._nframes = None
+
+ return dmi
+
+ def state(self, *args, **kwargs):
+ s = State(self, *args, **kwargs)
+ self.states.append(s)
+ return s
+
+ @property
+ def default_state(self):
+ return self.states[0]
+
+ def get_state(self, name):
+ for state in self.states:
+ if state.name == name:
+ return state
+ raise KeyError(name)
+
+ def _assemble_comment(self):
+ comment = "# BEGIN DMI\n"
+ comment += f"version = {self.version}\n"
+ comment += f"\twidth = {self.width}\n"
+ comment += f"\theight = {self.height}\n"
+ for state in self.states:
+ comment += f"state = {escape(state.name)}\n"
+ comment += f"\tdirs = {state.dirs}\n"
+ comment += f"\tframes = {state.framecount}\n"
+ if state.framecount > 1 and len(state.delays): # any(x != 1 for x in state.delays):
+ comment += "\tdelay = " + ",".join(map(str, state.delays)) + "\n"
+ if state.loop != 0:
+ comment += f"\tloop = {state.loop}\n"
+ if state.rewind:
+ comment += "\trewind = 1\n"
+ if state.movement:
+ comment += "\tmovement = 1\n"
+ if state.hotspots and any(state.hotspots):
+ current = None
+ for i, value in enumerate(state.hotspots):
+ if value != current:
+ x, y = value
+ comment += f"\thotspot = {x},{y},{i + 1}\n"
+ current = value
+ comment += "# END DMI"
+ return comment
+
+ def to_file(self, filename, *, palette=False):
+ # assemble comment
+ comment = self._assemble_comment()
+
+ # assemble spritesheet
+ W, H = self.width, self.height
+ num_frames = sum(len(state.frames) for state in self.states)
+ sqrt = math.ceil(math.sqrt(num_frames))
+ output = Image.new('RGBA', (sqrt * W, math.ceil(num_frames / sqrt) * H))
+
+ i = 0
+ for state in self.states:
+ for frame in state.frames:
+ output.paste(frame, ((i % sqrt) * W, (i // sqrt) * H))
+ i += 1
+
+ # save
+ pnginfo = PngInfo()
+ pnginfo.add_text('Description', comment, zip=True)
+ if palette:
+ output = output.convert('P')
+ output.save(filename, 'png', optimize=True, pnginfo=pnginfo)
+
+
+class State:
+ def __init__(self, dmi, name, *, loop=LOOP_UNLIMITED, rewind=False, movement=False, dirs=1):
+ self.dmi = dmi
+ self.name = name
+ self.loop = loop
+ self.rewind = rewind
+ self.movement = movement
+ self.dirs = dirs
+
+ self._nframes = None # used during loading only
+ self.frames = []
+ self.delays = []
+ self.hotspots = None
+
+ @property
+ def framecount(self):
+ if self._nframes is not None:
+ return self._nframes
+ else:
+ return len(self.frames) // self.dirs
+
+ def frame(self, image, *, delay=1):
+ assert image.size == (self.dmi.width, self.dmi.height)
+ self.delays.append(delay)
+ self.frames.append(image)
+
+ def hotspot(self, first_frame, x, y):
+ if self.hotspots is None:
+ self.hotspots = [None] * self.framecount
+ for i in range(first_frame, self.framecount):
+ self.hotspots[i] = x, y
+
+ def _frame_index(self, frame=0, dir=None):
+ ofs = DIR_ORDER.index(DIR_NAMES[dir])
+ if ofs >= self.dirs:
+ ofs = 0
+ return frame * self.dirs + ofs
+
+ def get_frame(self, *args, **kwargs):
+ return self.frames[self._frame_index(*args, **kwargs)]
+
+
+def escape(text):
+ text = text.replace('\\', '\\\\')
+ text = text.replace('"', '\\"')
+ return f'"{text}"'
+
+
+def unescape(text, quote='"'):
+ if text == 'null':
+ return None
+ if not (text.startswith(quote) and text.endswith(quote)):
+ raise ValueError(text)
+ text = text[1:-1]
+ text = text.replace('\\"', '"')
+ text = text.replace('\\\\', '\\')
+ return text
+
+
+def parse_num(value):
+ if '.' in value:
+ return float(value)
+ return int(value)
+
+
+def parse_bool(value):
+ if value not in ('0', '1'):
+ raise ValueError(value)
+ return value == '1'
\ No newline at end of file
diff --git a/tools/dmi/merge_driver.py b/tools/dmi/merge_driver.py
new file mode 100644
index 000000000000..56cc541d1a10
--- /dev/null
+++ b/tools/dmi/merge_driver.py
@@ -0,0 +1,181 @@
+#!/usr/bin/env python3
+import sys
+import dmi
+from hooks.merge_frontend import MergeDriver
+
+
+def images_equal(left, right):
+ if left.size != right.size:
+ return False
+ w, h = left.size
+ left_load, right_load = left.load(), right.load()
+ for y in range(0, h):
+ for x in range(0, w):
+ lpixel, rpixel = left_load[x, y], right_load[x, y]
+ # quietly ignore changes where both pixels are fully transparent
+ if lpixel != rpixel and (lpixel[3] != 0 or rpixel[3] != 0):
+ return False
+ return True
+
+
+def states_equal(left, right):
+ result = True
+
+ # basic properties
+ for attr in ('loop', 'rewind', 'movement', 'dirs', 'delays', 'hotspots', 'framecount'):
+ lval, rval = getattr(left, attr), getattr(right, attr)
+ if lval != rval:
+ result = False
+
+ # frames
+ for (left_frame, right_frame) in zip(left.frames, right.frames):
+ if not images_equal(left_frame, right_frame):
+ result = False
+
+ return result
+
+
+def key_of(state):
+ return (state.name, state.movement)
+
+
+def dictify(sheet):
+ result = {}
+ for state in sheet.states:
+ k = key_of(state)
+ if k in result:
+ print(f" duplicate {k!r}")
+ result[k] = state
+ return result
+
+
+def three_way_merge(base, left, right):
+ base_dims = base.width, base.height
+ if base_dims != (left.width, left.height) or base_dims != (right.width, right.height):
+ print("Dimensions have changed:")
+ print(f" Base: {base.width} x {base.height}")
+ print(f" Ours: {left.width} x {left.height}")
+ print(f" Theirs: {right.width} x {right.height}")
+ return True, None
+
+ base_states, left_states, right_states = dictify(base), dictify(left), dictify(right)
+
+ new_left = {k: v for k, v in left_states.items() if k not in base_states}
+ new_right = {k: v for k, v in right_states.items() if k not in base_states}
+ new_both = {}
+ conflicts = []
+ for key, state in list(new_left.items()):
+ in_right = new_right.get(key, None)
+ if in_right:
+ if states_equal(state, in_right):
+ # allow it
+ new_both[key] = state
+ else:
+ # generate conflict states
+ print(f" C: {state.name!r}: added differently in both!")
+ state.name = f"{state.name} !CONFLICT! left"
+ conflicts.append(state)
+ in_right.name = f"{state.name} !CONFLICT! right"
+ conflicts.append(in_right)
+ # don't add it a second time
+ del new_left[key]
+ del new_right[key]
+
+ final_states = []
+ # add states that are currently in the base
+ for state in base.states:
+ in_left = left_states.get(key_of(state), None)
+ in_right = right_states.get(key_of(state), None)
+ left_equals = in_left and states_equal(state, in_left)
+ right_equals = in_right and states_equal(state, in_right)
+
+ if not in_left and not in_right:
+ # deleted in both left and right, it's just deleted
+ print(f" {state.name!r}: deleted in both")
+ elif not in_left:
+ # left deletes
+ print(f" {state.name!r}: deleted in left")
+ if not right_equals:
+ print(f" ... but modified in right")
+ final_states.append(in_right)
+ elif not in_right:
+ # right deletes
+ print(f" {state.name!r}: deleted in right")
+ if not left_equals:
+ print(f" ... but modified in left")
+ final_states.append(in_left)
+ elif left_equals and right_equals:
+ # changed in neither
+ #print(f"Same in both: {state.name!r}")
+ final_states.append(state)
+ elif left_equals:
+ # changed only in right
+ print(f" {state.name!r}: changed in left")
+ final_states.append(in_right)
+ elif right_equals:
+ # changed only in left
+ print(f" {state.name!r}: changed in right")
+ final_states.append(in_left)
+ elif states_equal(in_left, in_right):
+ # changed in both, to the same thing
+ print(f" {state.name!r}: changed same in both")
+ final_states.append(in_left) # either or
+ else:
+ # changed in both
+ name = state.name
+ print(f" C: {name!r}: changed differently in both!")
+ state.name = f"{name} !CONFLICT! base"
+ conflicts.append(state)
+ in_left.name = f"{name} !CONFLICT! left"
+ conflicts.append(in_left)
+ in_right.name = f"{name} !CONFLICT! right"
+ conflicts.append(in_right)
+
+ # add states which both left and right added the same
+ for key, state in new_both.items():
+ print(f" {state.name!r}: added same in both")
+ final_states.append(state)
+
+ # add states that are brand-new in the left
+ for key, state in new_left.items():
+ print(f" {state.name!r}: added in left")
+ final_states.append(state)
+
+ # add states that are brand-new in the right
+ for key, state in new_right.items():
+ print(f" {state.name!r}: added in right")
+ final_states.append(state)
+
+ final_states.extend(conflicts)
+ merged = dmi.Dmi(base.width, base.height)
+ merged.states = final_states
+ return len(conflicts), merged
+
+
+class DmiDriver(MergeDriver):
+ driver_id = 'dmi'
+
+ def merge(self, base, left, right):
+ icon_base = dmi.Dmi.from_file(base)
+ icon_left = dmi.Dmi.from_file(left)
+ icon_right = dmi.Dmi.from_file(right)
+ trouble, merge_result = three_way_merge(icon_base, icon_left, icon_right)
+ return not trouble, merge_result
+
+ def to_file(self, outfile, merge_result):
+ merge_result.to_file(outfile)
+
+ def post_announce(self, success, merge_result):
+ if not success:
+ print("!!! Manual merge required!")
+ if merge_result:
+ print(" A best-effort merge was performed. You must edit the icon and remove all")
+ print(" icon states marked with !CONFLICT!, leaving only the desired icon.")
+ else:
+ print(" The icon was totally unable to be merged, you must start with one version")
+ print(" or the other and manually resolve the conflict.")
+ print(" Information about which states conflicted is listed above.")
+
+
+if __name__ == '__main__':
+ exit(DmiDriver().main())
\ No newline at end of file
diff --git a/tools/dmi/test.py b/tools/dmi/test.py
new file mode 100644
index 000000000000..1596b4be1e83
--- /dev/null
+++ b/tools/dmi/test.py
@@ -0,0 +1,39 @@
+import os
+import sys
+from dmi import *
+
+
+def _self_test():
+ # test: can we load every DMI in the tree
+ count = 0
+ for dirpath, dirnames, filenames in os.walk('.'):
+ if '.git' in dirnames:
+ dirnames.remove('.git')
+ for filename in filenames:
+ if filename.endswith('.dmi'):
+ fullpath = os.path.join(dirpath, filename)
+ try:
+ Dmi.from_file(fullpath)
+ except Exception:
+ print('Failed on:', fullpath)
+ raise
+ count += 1
+
+ print(f"{os.path.relpath(__file__)}: successfully parsed {count} .dmi files")
+
+
+def _usage():
+ print(f"Usage:")
+ print(f" tools{os.sep}bootstrap{os.sep}python -m {__spec__.name}")
+ exit(1)
+
+
+def _main():
+ if len(sys.argv) == 1:
+ return _self_test()
+
+ return _usage()
+
+
+if __name__ == '__main__':
+ _main()
\ No newline at end of file
diff --git a/tools/hooks/dmi.merge b/tools/hooks/dmi.merge
index 7fd9f171bf07..40e7722c07b6 100755
--- a/tools/hooks/dmi.merge
+++ b/tools/hooks/dmi.merge
@@ -1,2 +1,2 @@
#!/bin/sh
-exec tools/hooks/python.sh -m merge_driver_dmi "$@"
+exec tools/bootstrap/python -m dmi.merge_driver "$@"
\ No newline at end of file
diff --git a/tools/hooks/merge_frontend.py b/tools/hooks/merge_frontend.py
new file mode 100644
index 000000000000..4445a5c48548
--- /dev/null
+++ b/tools/hooks/merge_frontend.py
@@ -0,0 +1,169 @@
+# merge_frontend.py
+import sys
+import io
+import os
+import pygit2
+import collections
+import typing
+
+
+ENCODING = 'utf-8'
+
+
+class MergeReturn(typing.NamedTuple):
+ success: bool
+ merge_result: typing.Optional[object]
+
+
+class MergeDriver:
+ driver_id: typing.Optional[str] = None
+
+ def pre_announce(self, path: str):
+ """
+ Called before merge() is called, with a human-friendly path for output.
+ """
+ print(f"Merging {self.driver_id}: {path}")
+
+ def merge(self, base: typing.BinaryIO, left: typing.BinaryIO, right: typing.BinaryIO) -> MergeReturn:
+ """
+ Read from three BinaryIOs: base (common ancestor), left (ours), and
+ right (theirs). Perform the actual three-way merge operation. Leave
+ conflict markers if necessary.
+
+ Return (False, None) to indicate the merge driver totally failed.
+ Return (False, merge_result) if the result contains conflict markers.
+ Return (True, merge_result) if everything went smoothly.
+ """
+ raise NotImplementedError
+
+ def to_file(self, output: typing.BinaryIO, merge_result: object):
+ """
+ Save the merge() result to the given output stream.
+ Override this if the merge() result is not bytes or str.
+ """
+ if isinstance(merge_result, bytes):
+ output.write(merge_result)
+ elif isinstance(merge_result, str):
+ with io.TextIOWrapper(output, ENCODING) as f:
+ f.write(merge_result)
+ else:
+ raise NotImplementedError
+
+ def post_announce(self, success: bool, merge_result: object):
+ """
+ Called after merge() is called, to warn the user if action is needed.
+ """
+ if not success:
+ print("!!! Manual merge required")
+ if merge_result:
+ print(" A best-effort merge was performed. You must finish the job yourself.")
+ else:
+ print(" No merge was possible. You must resolve the conflict yourself.")
+
+ def main(self, args: typing.List[str] = None):
+ return _main(self, args or sys.argv[1:])
+
+
+def _main(driver: MergeDriver, args: typing.List[str]):
+ if len(args) > 0 and args[0] == '--posthoc':
+ return _posthoc_main(driver, args[1:])
+ else:
+ return _driver_main(driver, args)
+
+
+def _driver_main(driver: MergeDriver, args: typing.List[str]):
+ """
+ Act like a normal Git merge driver, called by Git during a merge.
+ """
+ if len(args) != 5:
+ print("merge driver called with wrong number of arguments")
+ print(" usage: %P %O %A %B %L")
+ return 1
+
+ path, path_base, path_left, path_right, _ = args
+ driver.pre_announce(path)
+
+ with open(path_base, 'rb') as io_base:
+ with open(path_left, 'rb') as io_left:
+ with open(path_right, 'rb') as io_right:
+ success, merge_result = driver.merge(io_base, io_left, io_right)
+
+ if merge_result:
+ # If we got anything, write it to the working directory.
+ with open(path_left, 'wb') as io_output:
+ driver.to_file(io_output, merge_result)
+
+ driver.post_announce(success, merge_result)
+ if not success:
+ # If we were not successful, do not mark the conflict as resolved.
+ return 1
+
+
+def _posthoc_main(driver: MergeDriver, args: typing.List[str]):
+ """
+ Apply merge driver logic to a repository which is already in a conflicted
+ state, running the driver on any conflicted files.
+ """
+ repo_dir = pygit2.discover_repository(os.getcwd())
+ repo = pygit2.Repository(repo_dir)
+ conflicts = repo.index.conflicts
+ if not conflicts:
+ print("There are no unresolved conflicts.")
+ return 0
+
+ all_success = True
+ index_changed = False
+ any_attempted = False
+ for base, left, right in list(conflicts):
+ if not base or not left or not right:
+ # (not left) or (not right): deleted in one branch, modified in the other.
+ # (not base): added differently in both branches.
+ # In either case, there's nothing we can do for now.
+ continue
+
+ path = left.path
+ if not _applies_to(repo, driver, path):
+ # Skip the file if it's not the right extension.
+ continue
+
+ any_attempted = True
+ driver.pre_announce(path)
+ io_base = io.BytesIO(repo[base.id].data)
+ io_left = io.BytesIO(repo[left.id].data)
+ io_right = io.BytesIO(repo[right.id].data)
+ success, merge_result = driver.merge(io_base, io_left, io_right)
+ if merge_result:
+ # If we got anything, write it to the working directory.
+ with open(os.path.join(repo.workdir, path), 'wb') as io_output:
+ driver.to_file(io_output, merge_result)
+
+ if success:
+ # If we were successful, mark the conflict as resolved.
+ with open(os.path.join(repo.workdir, path), 'rb') as io_readback:
+ contents = io_readback.read()
+ merged_id = repo.create_blob(contents)
+ repo.index.add(pygit2.IndexEntry(path, merged_id, left.mode))
+ del conflicts[path]
+ index_changed = True
+ if not success:
+ all_success = False
+ driver.post_announce(success, merge_result)
+
+ if index_changed:
+ repo.index.write()
+
+ if not any_attempted:
+ print("There are no unresolved", driver.driver_id, "conflicts.")
+
+ if not all_success:
+ # Not usually observed, but indicate the failure just in case.
+ return 1
+
+
+def _applies_to(repo: pygit2.Repository, driver: MergeDriver, path: str):
+ """
+ Check if the current merge driver is a candidate to handle a given path.
+ """
+ if not driver.driver_id:
+ raise ValueError('Driver must have ID to perform post-hoc merge')
+ return repo.get_attr(path, 'merge') == driver.driver_id
\ No newline at end of file
diff --git a/yogstation.dme b/yogstation.dme
index 732c65ffb3bc..9124c8b5821a 100644
--- a/yogstation.dme
+++ b/yogstation.dme
@@ -1049,6 +1049,7 @@
#include "code\game\machinery\suit_storage_unit.dm"
#include "code\game\machinery\syndicatebeacon.dm"
#include "code\game\machinery\syndicatebomb.dm"
+#include "code\game\machinery\synth_pod.dm"
#include "code\game\machinery\teleporter.dm"
#include "code\game\machinery\transformer.dm"
#include "code\game\machinery\washing_machine.dm"
@@ -1640,6 +1641,7 @@
#include "code\game\turfs\open\floor\plating.dm"
#include "code\game\turfs\open\floor\reinf_floor.dm"
#include "code\game\turfs\open\floor\plating\asteroid.dm"
+#include "code\game\turfs\open\floor\plating\catwalk_plating.dm"
#include "code\game\turfs\open\floor\plating\dirt.dm"
#include "code\game\turfs\open\floor\plating\misc_plating.dm"
#include "code\game\turfs\open\space\space.dm"
@@ -2159,6 +2161,10 @@
#include "code\modules\awaymissions\mission_code\undergroundoutpost45.dm"
#include "code\modules\awaymissions\mission_code\vrhub.dm"
#include "code\modules\awaymissions\mission_code\wildwest.dm"
+#include "code\modules\awaymissions\mission_code\netmin\_puzzles.dm"
+#include "code\modules\awaymissions\mission_code\netmin\abandoned_mine.dm"
+#include "code\modules\awaymissions\mission_code\netmin\combat_robot_factory.dm"
+#include "code\modules\awaymissions\mission_code\netmin\scientist_raid.dm"
#include "code\modules\balloon_alert\balloon_alert.dm"
#include "code\modules\buildmode\bm_mode.dm"
#include "code\modules\buildmode\buildmode.dm"
@@ -2672,6 +2678,7 @@
#include "code\modules\jobs\job_types\security_officer.dm"
#include "code\modules\jobs\job_types\shaft_miner.dm"
#include "code\modules\jobs\job_types\station_engineer.dm"
+#include "code\modules\jobs\job_types\synthetic.dm"
#include "code\modules\jobs\job_types\unassigned.dm"
#include "code\modules\jobs\job_types\virologist.dm"
#include "code\modules\jobs\job_types\warden.dm"
@@ -2914,6 +2921,7 @@
#include "code\modules\mob\living\carbon\human\species_types\skeletons.dm"
#include "code\modules\mob\living\carbon\human\species_types\snail.dm"
#include "code\modules\mob\living\carbon\human\species_types\vampire.dm"
+#include "code\modules\mob\living\carbon\human\species_types\wy_synths.dm"
#include "code\modules\mob\living\carbon\human\species_types\zombies.dm"
#include "code\modules\mob\living\carbon\monkey\combat.dm"
#include "code\modules\mob\living\carbon\monkey\death.dm"
@@ -2946,29 +2954,35 @@
#include "code\modules\mob\living\silicon\ai\robot_control.dm"
#include "code\modules\mob\living\silicon\ai\say.dm"
#include "code\modules\mob\living\silicon\ai\vox_sounds.dm"
+#include "code\modules\mob\living\silicon\ai\ai_network\ai_network.dm"
+#include "code\modules\mob\living\silicon\ai\ai_network\ethernet_cable.dm"
+#include "code\modules\mob\living\silicon\ai\ai_network\master_subcontroller.dm"
+#include "code\modules\mob\living\silicon\ai\ai_network\networking_machines.dm"
+#include "code\modules\mob\living\silicon\ai\ai_network\shared_resources.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\_ai_machinery.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\ai_core_display.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\ai_data_core.dm"
-#include "code\modules\mob\living\silicon\ai\decentralized\decentralized_os.dm"
+#include "code\modules\mob\living\silicon\ai\decentralized\computer_science_datum.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\server_cabinet.dm"
-#include "code\modules\mob\living\silicon\ai\decentralized\management\ai_controlpanel.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\management\ai_dashboard.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\management\ai_server_overview.dm"
-#include "code\modules\mob\living\silicon\ai\decentralized\management\resource_distribution.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\_ai_project.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\ai_dab.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\ai_huds.dm"
+#include "code\modules\mob\living\silicon\ai\decentralized\projects\ai_translation.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\camera_mobility.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\coolant_manager.dm"
-#include "code\modules\mob\living\silicon\ai\decentralized\projects\cryptominer.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\examine.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\firewall.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\induction.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\memory_compressor.dm"
-#include "code\modules\mob\living\silicon\ai\decentralized\projects\research_booster.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\rgb.dm"
+#include "code\modules\mob\living\silicon\ai\decentralized\projects\room_lockdown.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\self_defense.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\projects\surveillance.dm"
+#include "code\modules\mob\living\silicon\ai\decentralized\projects\synth_control.dm"
+#include "code\modules\mob\living\silicon\ai\decentralized\projects\synths\_synth_project.dm"
+#include "code\modules\mob\living\silicon\ai\decentralized\projects\synths\speed_buff.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\systech\cpu.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\systech\overclocking.dm"
#include "code\modules\mob\living\silicon\ai\decentralized\systech\rack.dm"
@@ -2977,6 +2991,7 @@
#include "code\modules\mob\living\silicon\ai\freelook\chunk.dm"
#include "code\modules\mob\living\silicon\ai\freelook\eye.dm"
#include "code\modules\mob\living\silicon\ai\freelook\read_me.dm"
+#include "code\modules\mob\living\silicon\ai\synthetics\synth_os.dm"
#include "code\modules\mob\living\silicon\pai\death.dm"
#include "code\modules\mob\living\silicon\pai\pai.dm"
#include "code\modules\mob\living\silicon\pai\pai_defense.dm"
@@ -3073,6 +3088,7 @@
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
#include "code\modules\mob\living\simple_animal\hostile\rat.dm"
#include "code\modules\mob\living\simple_animal\hostile\regalrat.dm"
+#include "code\modules\mob\living\simple_animal\hostile\robot.dm"
#include "code\modules\mob\living\simple_animal\hostile\russian.dm"
#include "code\modules\mob\living\simple_animal\hostile\skeleton.dm"
#include "code\modules\mob\living\simple_animal\hostile\smspider.dm"
@@ -3177,6 +3193,9 @@
#include "code\modules\modular_computers\file_system\programs\radar.dm"
#include "code\modules\modular_computers\file_system\programs\robotact.dm"
#include "code\modules\modular_computers\file_system\programs\themeify.dm"
+#include "code\modules\modular_computers\file_system\programs\ai_network\_ai_network_program.dm"
+#include "code\modules\modular_computers\file_system\programs\ai_network\ai_benchmark.dm"
+#include "code\modules\modular_computers\file_system\programs\ai_network\ainetworkinterface.dm"
#include "code\modules\modular_computers\file_system\programs\antagonist\bomberman.dm"
#include "code\modules\modular_computers\file_system\programs\antagonist\contract_uplink.dm"
#include "code\modules\modular_computers\file_system\programs\antagonist\dos.dm"
@@ -3186,6 +3205,7 @@
#include "code\modules\modular_computers\file_system\programs\command\card.dm"
#include "code\modules\modular_computers\file_system\programs\command\crewmanifest.dm"
#include "code\modules\modular_computers\file_system\programs\command\jobmanagement.dm"
+#include "code\modules\modular_computers\file_system\programs\command\synth_requester.dm"
#include "code\modules\modular_computers\file_system\programs\engineering\alarm.dm"
#include "code\modules\modular_computers\file_system\programs\engineering\atmosscan.dm"
#include "code\modules\modular_computers\file_system\programs\engineering\energyharvestercontrol.dm"
@@ -3204,6 +3224,7 @@
#include "code\modules\modular_computers\file_system\programs\supply\cargobounty.dm"
#include "code\modules\modular_computers\hardware\_hardware.dm"
#include "code\modules\modular_computers\hardware\ai_slot.dm"
+#include "code\modules\modular_computers\hardware\aiinterface.dm"
#include "code\modules\modular_computers\hardware\battery_module.dm"
#include "code\modules\modular_computers\hardware\card_slot.dm"
#include "code\modules\modular_computers\hardware\CPU.dm"
@@ -3924,7 +3945,11 @@
#include "code\modules\vending\wardrobes.dm"
#include "code\modules\vending\youtool.dm"
#include "code\modules\visual\render_step.dm"
+#include "code\modules\VR\vr_compsci.dm"
+#include "code\modules\VR\vr_compsci_artifacts.dm"
+#include "code\modules\VR\vr_compsci_missions.dm"
#include "code\modules\VR\vr_human.dm"
+#include "code\modules\VR\vr_netmin.dm"
#include "code\modules\VR\vr_sleeper.dm"
#include "code\modules\zombie\items.dm"
#include "code\modules\zombie\organs.dm"
diff --git a/yogstation/code/datums/components/backstabs.dm b/yogstation/code/datums/components/backstabs.dm
index 375c5e036bd1..902c01b77bac 100644
--- a/yogstation/code/datums/components/backstabs.dm
+++ b/yogstation/code/datums/components/backstabs.dm
@@ -21,6 +21,8 @@
// No bypassing pacifism nerd
if(source.force > 0 && HAS_TRAIT(user, TRAIT_PACIFISM) && (source.damtype != STAMINA))
return FALSE
+ if(source.force > 0 && is_synth(user))
+ return FALSE
// Same calculation that kinetic crusher uses
var/backstab_dir = get_dir(user, living_target)
// No backstabbing people if they're already in crit
diff --git a/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm b/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm
index 7877abae56fc..a7387e3b4559 100644
--- a/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm
+++ b/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm
@@ -13,7 +13,7 @@
required_enemies = 3
recommended_enemies = 3
enemy_minimum_age = 15
- restricted_jobs = list("AI", "Cyborg")
+ restricted_jobs = list("AI", "Cyborg", "Synthetic")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Brig Physician") //Added Brig Physician
title_icon = "ss13"
diff --git a/yogstation/code/game/gamemodes/gangs/gangs.dm b/yogstation/code/game/gamemodes/gangs/gangs.dm
index 22bc56500ed1..c1cd34e2a966 100644
--- a/yogstation/code/game/gamemodes/gangs/gangs.dm
+++ b/yogstation/code/game/gamemodes/gangs/gangs.dm
@@ -6,7 +6,7 @@ GLOBAL_LIST_EMPTY(gangs)
name = "gang war"
config_tag = "gang"
antag_flag = ROLE_GANG
- restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician") //Added Brig Physician
+ restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician", "Synthetic") //Added Brig Physician
required_players = 35
required_enemies = 1
recommended_enemies = 2
diff --git a/yogstation/code/game/gamemodes/shadowling/shadowling.dm b/yogstation/code/game/gamemodes/shadowling/shadowling.dm
index 8c49e5e19ca0..d9c11c590596 100644
--- a/yogstation/code/game/gamemodes/shadowling/shadowling.dm
+++ b/yogstation/code/game/gamemodes/shadowling/shadowling.dm
@@ -55,7 +55,7 @@ Made by Xhuis
required_enemies = 3
recommended_enemies = 3
enemy_minimum_age = 14
- restricted_jobs = list("AI", "Cyborg")
+ restricted_jobs = list("AI", "Cyborg", "Synthetic")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Brig Physician")
title_icon = "ss13"
diff --git a/yogstation/code/game/gamemodes/vampire/vampire.dm b/yogstation/code/game/gamemodes/vampire/vampire.dm
index fe88cdada4e2..e14a335a21f9 100644
--- a/yogstation/code/game/gamemodes/vampire/vampire.dm
+++ b/yogstation/code/game/gamemodes/vampire/vampire.dm
@@ -13,7 +13,7 @@
config_tag = "vampire"
antag_flag = ROLE_VAMPIRE
false_report_weight = 1
- restricted_jobs = list("AI", "Cyborg")
+ restricted_jobs = list("AI", "Cyborg", "Synthetic")
protected_jobs = list("Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Security Officer", "Chaplain", "Detective", "Warden", "Brig Physician") //Added Brig Physician
required_players = 15
required_enemies = 1
diff --git a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm
index b5d4ea19754a..c1ad4605fe15 100644
--- a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm
+++ b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm
@@ -21,10 +21,13 @@
circuit = /obj/item/circuitboard/computer/telecomms/comm_traffic
req_access = list(ACCESS_TCOM_ADMIN)
+ var/unlimited_range = FALSE
/obj/machinery/computer/telecomms/traffic/Initialize(mapload)
. = ..()
GLOB.traffic_comps += src
+ if(mapload)
+ unlimited_range = TRUE
/obj/machinery/computer/telecomms/traffic/Destroy()
GLOB.traffic_comps -= src
@@ -223,9 +226,14 @@
temp = "- FAILED: CANNOT PROBE WHEN BUFFER FULL -"
else
- for(var/obj/machinery/telecomms/server/T in range(25, src))
- if(T.network == network)
- servers.Add(T)
+ if(unlimited_range)
+ for(var/obj/machinery/telecomms/server/T as anything in GLOB.tcomms_servers)
+ if(T.network == network)
+ servers.Add(T)
+ else
+ for(var/obj/machinery/telecomms/server/T in range(25, src))
+ if(T.network == network)
+ servers.Add(T)
if(!servers.len)
temp = "- FAILED: UNABLE TO LOCATE SERVERS IN \[[network]\] -"
diff --git a/yogstation/code/game/machinery/telecomms/machines/server.dm b/yogstation/code/game/machinery/telecomms/machines/server.dm
index 12cadbe0faf8..fe12c5063815 100644
--- a/yogstation/code/game/machinery/telecomms/machines/server.dm
+++ b/yogstation/code/game/machinery/telecomms/machines/server.dm
@@ -1,3 +1,5 @@
+GLOBAL_LIST_EMPTY(tcomms_servers)
+
/obj/item/radio/server
/obj/item/radio/server/can_receive(frequency,levels)
@@ -21,6 +23,11 @@
Compiler = new()
Compiler.Holder = src
server_radio = new()
+ GLOB.tcomms_servers += src
+ . = ..()
+
+/obj/machinery/telecomms/server/Destroy()
+ GLOB.tcomms_servers -= src
. = ..()
/obj/machinery/telecomms/server/proc/update_logs()
diff --git a/yogstation/code/game/objects/items/tools.dm b/yogstation/code/game/objects/items/tools.dm
index 477c5ff547be..318ecf491089 100644
--- a/yogstation/code/game/objects/items/tools.dm
+++ b/yogstation/code/game/objects/items/tools.dm
@@ -118,6 +118,9 @@
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, span_warning("You don't want to harm [M]!"))
return
+ if(!synth_check(user, SYNTH_ORGANIC_HARM))
+ to_chat(user, span_warning("You don't want to harm [M]!"))
+ return
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
M = user
return eyestab(M,user)
diff --git a/yogstation/code/modules/jobs/job_types/network_admin.dm b/yogstation/code/modules/jobs/job_types/network_admin.dm
index 6152c9258cc3..d6bc0919d314 100644
--- a/yogstation/code/modules/jobs/job_types/network_admin.dm
+++ b/yogstation/code/modules/jobs/job_types/network_admin.dm
@@ -14,9 +14,9 @@
outfit = /datum/outfit/job/network_admin
added_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS)
- base_access = list(ACCESS_TCOMSAT, ACCESS_TCOM_ADMIN, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_NETWORK, ACCESS_RESEARCH, ACCESS_MINISAT, ACCESS_RND)
+ base_access = list(ACCESS_TCOMSAT, ACCESS_TCOM_ADMIN, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_NETWORK, ACCESS_RESEARCH, ACCESS_MINISAT, ACCESS_RND, ACCESS_TOX)
paycheck = PAYCHECK_MEDIUM
- paycheck_department = ACCOUNT_ENG
+ paycheck_department = ACCOUNT_SCI
display_order = JOB_DISPLAY_ORDER_NETWORK_ADMIN
minimal_character_age = 22 //Feasibly same level as engineer, mostly a data engineer instead of a mechanical or construction-based one, though is still capable of making certain machines
@@ -38,6 +38,7 @@
pda_type = /obj/item/modular_computer/tablet/pda/preset/network_admin
+ l_hand = /obj/item/modular_computer/laptop/preset/network_admin
belt = /obj/item/storage/belt/utility/full/engi
ears = /obj/item/radio/headset/headset_network
uniform = /obj/item/clothing/under/yogs/rank/network_admin
@@ -46,7 +47,6 @@
gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/workboots
digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/engineering
- backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)
backpack = /obj/item/storage/backpack/industrial
satchel = /obj/item/storage/backpack/satchel/eng
diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm
index f2861bee220e..55c973b7dbc4 100644
--- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm
+++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm
@@ -1,5 +1,5 @@
-/datum/species/preternis/proc/drain_power_from(mob/living/carbon/human/H, atom/A)
+/datum/species/proc/drain_power_from(mob/living/carbon/human/H, atom/A)
if(!istype(H) || !A)
return
diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm
index 8070ed0ce3e6..f96935341968 100644
--- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm
+++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm
@@ -59,7 +59,6 @@
var/lockdown = FALSE
var/eating_msg_cooldown = FALSE
var/emag_lvl = 0
- var/draining = FALSE
var/soggy = FALSE
var/low_power_warning = FALSE
+