Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 2e787af

Browse files
Bibby0110adamsongpatpol4ToasterBiome
authored
AI Rework | 2024 edition (#21266)
* fix ui * oops * Fixes map bibby broke * Revert "Fixes map bibby broke" This reverts commit af1d1c6. * e * Unfucks deltastation * stuff * cleans things after bibby * Fix subcontroller cache * Fixed APCs and air alarms not working when connected to a subcontroller * bunch of fixes * job icon * tcomms server Update traffic_control.dm * make compile * Update synthetic.dm * Update synthetic.dm * Update access.dm * er * le runtime * Update ai_data_core.dm * le dupe * wall * Update decentralized_ai.dm * Update decentralized_ai.dm * e * Update wy_synths.dm * we do a little trolling * e * small cahnges * more minor changes * Create conflict_fixer.dmm * Create conflict_fixer - Kopi.dmm * minor map cahnges * broken maps * oops * bon * Update ainetworkinterface.dm * Update ainetworkinterface.dm * Update ai.dm * lol * light * fixes * e * Update synth_pod.dm * e * Update synth_os.dm * Update objective.dm * fixes * Update synthetic.dm * e * antag * tweaks * e * Update VRSleeper.js * e * Update synth_pod.dm * Update synth_pod.dm * 1 * Update synth_pod.dm * Update synth_os.dm * Update synthetic.dm * fixes * headset and ID go boom * Update wy_synths.dm * Update robot_parts.dm * cremator * Update communications.dm * Update synthetic.dm * no synth control * Update synthetic.dm * Update ai_dashboard.dm * Update miscellaneous.dm * Update miscellaneous.dm * Update headset.dm * Update damage_procs.dm * Update server_cabinet.dm * minor fixes * Update miscellaneous.dm * Update rack_creator.dm * Update synthetic.dm * compiles * fixes * brainless * access request * cofnlict * fixes * controller * Update yogstation.dme * Update yogstation.dme * s * maps * Update NtosSynthManager.js * unrevert this lol * eat * Update wy_synths.dm * sigh * e * Update wy_synths.dm * sigh * fixed ma * Update synthetic.dm * better * Update ethernet_cable.dm * Update computer.dm * Update computer.dm * i hate this * Update ai_laws.dm * Update hardsuit.dm * initialize * sigh * Update synth_os.dm * Update master_subcontroller.dm * Update master_subcontroller.dm * Update synth_requester.dm * Update synth_requester.dm * Update room_lockdown.dm * small fixes * propa sprite matey * no latejoin lol * Update synth_os.dm * maps fixed * compiles * Update brain_item.dm * fixes * mappers * Update hud.dmi * Update passworddoor.dm * button puzzle * mine stuff * Update yogstation.dme * le map * changes * ye * Update abandoned_mine.dm * Update _puzzles.dm * bingus * Update abandoned_mine.dm * maps * e * no more quirks * e * DMI merge conflict resolver (from TG) * update yogstation map * Minor away mission changes * forgot something * proper fix * donut * maps * asteroid * gax * all maps done * Update synthetic.dm * makes it compile * Update backstabs.dm * more compile! * fix this map * bad item * remove broken objects * gax * Update ticker.dm * pdas * omg save the file * Update networking_machines.dm * area string moment * s * awkward * revival * Update ai_dashboard.dm * fixes * fixed floopy * less difficult * this is important * Update ai_network.dm * maps * fixes the maps * wHAT * WHAT * wet * start fixing conflicts * Update yogstation.dme * start fixing map conflicts * Update DonutStation.dmm * updates * donut conflicts * update box * Update IceMeta.dmm * icon diffs * Update crew.dm * Update unsorted.dm * Update layers.dm * Update YogStation.dmm * conflicts * Update IceMeta.dmm * will this finally fix it * Update IceMeta.dmm * fix all this SHIT * what * more shit ugh * what! * Update DonutStation.dmm * Update AsteroidStation.dmm * Update AsteroidStation.dmm * Update dead.dm * Update catwalk_plating.dm * Update catwalk_plating.dm --------- Co-authored-by: adamsong <[email protected]> Co-authored-by: wejengin2 <[email protected]> Co-authored-by: Byemoh <[email protected]>
1 parent d94fb4b commit 2e787af

File tree

232 files changed

+85869
-6090
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

232 files changed

+85869
-6090
lines changed

_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm

Lines changed: 323 additions & 237 deletions
Large diffs are not rendered by default.

_maps/RandomZLevels/VR/netmin_hub.dmm

Lines changed: 72096 additions & 0 deletions
Large diffs are not rendered by default.

_maps/map_files/AsteroidStation/AsteroidStation.dmm

Lines changed: 832 additions & 746 deletions
Large diffs are not rendered by default.

_maps/map_files/DonutStation/DonutStation.dmm

Lines changed: 990 additions & 667 deletions
Large diffs are not rendered by default.

_maps/map_files/GaxStation/GaxStation.dmm

Lines changed: 76 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,16 @@
10981098
},
10991099
/turf/open/floor/plasteel,
11001100
/area/hallway/primary/central)
1101+
"aCl" = (
1102+
/obj/effect/turf_decal/trimline/blue/filled/line/lower,
1103+
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
1104+
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
1105+
/obj/structure/cable{
1106+
icon_state = "1-2"
1107+
},
1108+
/obj/effect/decal/cleanable/dirt,
1109+
/turf/open/floor/plasteel,
1110+
/area/science/mixing)
11011111
"aCs" = (
11021112
/obj/machinery/door/airlock/external{
11031113
name = "Escape Airlock"
@@ -4879,12 +4889,6 @@
48794889
},
48804890
/turf/open/floor/wood,
48814891
/area/library)
4882-
"cvx" = (
4883-
/obj/machinery/computer/ai_server_console{
4884-
dir = 4
4885-
},
4886-
/turf/open/floor/plasteel/dark,
4887-
/area/ai_monitored/secondarydatacore)
48884892
"cvF" = (
48894893
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
48904894
dir = 10
@@ -8201,12 +8205,6 @@
82018205
},
82028206
/turf/open/floor/plasteel,
82038207
/area/quartermaster/miningdock)
8204-
"dXK" = (
8205-
/obj/structure/reagent_dispensers/water_cooler,
8206-
/obj/effect/decal/cleanable/dirt,
8207-
/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower,
8208-
/turf/open/floor/plasteel,
8209-
/area/science/mixing)
82108208
"dYH" = (
82118209
/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
82128210
dir = 4
@@ -11458,12 +11456,6 @@
1145811456
"fvA" = (
1145911457
/turf/open/floor/plasteel,
1146011458
/area/security/main)
11461-
"fvC" = (
11462-
/obj/machinery/computer/ai_resource_distribution{
11463-
dir = 4
11464-
},
11465-
/turf/open/floor/plasteel/dark,
11466-
/area/ai_monitored/secondarydatacore)
1146711459
"fvG" = (
1146811460
/obj/structure/chair{
1146911461
dir = 4
@@ -18481,6 +18473,12 @@
1848118473
/obj/structure/disposalpipe/segment,
1848218474
/turf/open/floor/plasteel,
1848318475
/area/hallway/primary/port)
18476+
"iOW" = (
18477+
/obj/effect/turf_decal/trimline/blue/filled/corner/lower,
18478+
/obj/structure/reagent_dispensers/water_cooler,
18479+
/obj/effect/decal/cleanable/dirt,
18480+
/turf/open/floor/plasteel,
18481+
/area/science/mixing)
1848418482
"iOZ" = (
1848518483
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
1848618484
dir = 5
@@ -18492,7 +18490,6 @@
1849218490
/obj/structure/rack,
1849318491
/obj/item/aicard,
1849418492
/obj/item/disk/holodisk/tutorial/AICore,
18495-
/obj/item/circuitboard/computer/ai_upload_download,
1849618493
/obj/machinery/power/apc{
1849718494
areastring = "/area/crew_quarters/heads/hor";
1849818495
dir = 8;
@@ -19713,15 +19710,6 @@
1971319710
/obj/effect/turf_decal/stripes/corner,
1971419711
/turf/open/floor/plasteel,
1971519712
/area/hallway/primary/central)
19716-
"jyJ" = (
19717-
/obj/machinery/computer/robotics{
19718-
dir = 8
19719-
},
19720-
/obj/structure/sign/plaques/ai_password{
19721-
pixel_x = 32
19722-
},
19723-
/turf/open/floor/carpet/purple,
19724-
/area/crew_quarters/heads/hor)
1972519713
"jyN" = (
1972619714
/obj/effect/turf_decal/trimline/secred/filled/corner/lower,
1972719715
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
@@ -22056,6 +22044,9 @@
2205622044
/obj/machinery/light/small,
2205722045
/turf/open/floor/plasteel,
2205822046
/area/hallway/secondary/service)
22047+
"kHF" = (
22048+
/turf/open/floor/plasteel/dark,
22049+
/area/ai_monitored/secondarydatacore)
2205922050
"kHQ" = (
2206022051
/turf/open/floor/plasteel/white,
2206122052
/area/medical/medbay/central)
@@ -24391,6 +24382,12 @@
2439124382
},
2439224383
/turf/open/floor/wood,
2439324384
/area/crew_quarters/heads/captain)
24385+
"lOz" = (
24386+
/obj/machinery/computer/robotics{
24387+
dir = 8
24388+
},
24389+
/turf/open/floor/carpet/purple,
24390+
/area/crew_quarters/heads/hor)
2439424391
"lOU" = (
2439524392
/obj/effect/turf_decal/trimline/purple/filled/line/lower{
2439624393
dir = 1
@@ -25563,13 +25560,6 @@
2556325560
},
2556425561
/turf/open/floor/plasteel/white,
2556525562
/area/science/lab)
25566-
"mqM" = (
25567-
/obj/machinery/ai/data_core,
25568-
/obj/machinery/light{
25569-
dir = 1
25570-
},
25571-
/turf/open/floor/circuit/green/telecomms,
25572-
/area/ai_monitored/secondarydatacore)
2557325563
"mrk" = (
2557425564
/obj/effect/turf_decal/trimline/neutral/filled/line/lower{
2557525565
dir = 4
@@ -29895,13 +29885,6 @@
2989529885
},
2989629886
/turf/open/floor/plasteel,
2989729887
/area/science/mixing)
29898-
"oCY" = (
29899-
/obj/effect/decal/cleanable/dirt,
29900-
/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{
29901-
dir = 8
29902-
},
29903-
/turf/open/floor/plasteel,
29904-
/area/science/mixing)
2990529888
"oEt" = (
2990629889
/obj/effect/turf_decal/trimline/blue/filled/line/lower{
2990729890
dir = 5
@@ -33544,6 +33527,10 @@
3354433527
},
3354533528
/turf/open/floor/plasteel/freezer,
3354633529
/area/crew_quarters/toilet)
33530+
"qpf" = (
33531+
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
33532+
/turf/open/floor/plasteel/dark,
33533+
/area/ai_monitored/secondarydatacore)
3354733534
"qpr" = (
3354833535
/obj/effect/turf_decal/stripes/line{
3354933536
dir = 10
@@ -34031,6 +34018,9 @@
3403134018
},
3403234019
/turf/open/floor/engine,
3403334020
/area/engine/engineering)
34021+
"qHu" = (
34022+
/turf/open/floor/circuit/green/telecomms,
34023+
/area/ai_monitored/secondarydatacore)
3403434024
"qHC" = (
3403534025
/obj/effect/landmark/event_spawn,
3403634026
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
@@ -40891,6 +40881,16 @@
4089140881
},
4089240882
/turf/open/floor/plasteel/white,
4089340883
/area/medical/virology)
40884+
"tYV" = (
40885+
/obj/machinery/ai/networking{
40886+
label = "Subcontroller";
40887+
roundstart_connection = "Computer Science - 2"
40888+
},
40889+
/obj/structure/ethernet_cable{
40890+
icon_state = "0-4"
40891+
},
40892+
/turf/open/floor/circuit/telecomms/server,
40893+
/area/ai_monitored/secondarydatacore)
4089440894
"tZf" = (
4089540895
/obj/machinery/computer/cargo/request,
4089640896
/obj/structure/cable{
@@ -41613,13 +41613,6 @@
4161341613
},
4161441614
/turf/open/floor/plating,
4161541615
/area/maintenance/aft)
41616-
"uvN" = (
41617-
/obj/structure/chair/office/light{
41618-
dir = 8
41619-
},
41620-
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
41621-
/turf/open/floor/plasteel/dark,
41622-
/area/ai_monitored/secondarydatacore)
4162341616
"uvV" = (
4162441617
/obj/effect/turf_decal/trimline/neutral/filled/line/lower{
4162541618
dir = 4
@@ -42920,6 +42913,15 @@
4292042913
/obj/effect/turf_decal/stripes/line,
4292142914
/turf/open/floor/plasteel,
4292242915
/area/hallway/secondary/entry)
42916+
"vaA" = (
42917+
/obj/machinery/light{
42918+
dir = 1
42919+
},
42920+
/obj/structure/ethernet_cable{
42921+
icon_state = "4-8"
42922+
},
42923+
/turf/open/floor/circuit/telecomms/server,
42924+
/area/ai_monitored/secondarydatacore)
4292342925
"vaF" = (
4292442926
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
4292542927
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
@@ -43896,6 +43898,13 @@
4389643898
},
4389743899
/turf/open/floor/engine,
4389843900
/area/science/xenobiology)
43901+
"vxw" = (
43902+
/obj/effect/turf_decal/trimline/blue/filled/corner/lower{
43903+
dir = 8
43904+
},
43905+
/obj/effect/decal/cleanable/dirt,
43906+
/turf/open/floor/plasteel,
43907+
/area/science/mixing)
4389943908
"vyw" = (
4390043909
/obj/effect/turf_decal/trimline/brown/filled/corner/lower,
4390143910
/obj/machinery/door/poddoor/shutters{
@@ -48372,16 +48381,6 @@
4837248381
},
4837348382
/turf/open/floor/engine,
4837448383
/area/maintenance/disposal/incinerator)
48375-
"xId" = (
48376-
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
48377-
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
48378-
/obj/structure/cable{
48379-
icon_state = "1-2"
48380-
},
48381-
/obj/effect/decal/cleanable/dirt,
48382-
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower,
48383-
/turf/open/floor/plasteel,
48384-
/area/science/mixing)
4838548384
"xIi" = (
4838648385
/obj/structure/cable{
4838748386
icon_state = "2-8"
@@ -49550,6 +49549,13 @@
4955049549
},
4955149550
/turf/open/floor/plasteel,
4955249551
/area/storage/primary)
49552+
"yii" = (
49553+
/obj/machinery/ai/master_subcontroller,
49554+
/obj/structure/ethernet_cable{
49555+
icon_state = "0-8"
49556+
},
49557+
/turf/open/floor/circuit/telecomms/server,
49558+
/area/ai_monitored/secondarydatacore)
4955349559
"yij" = (
4955449560
/obj/machinery/atmospherics/components/binary/pump{
4955549561
name = "Port to Filter"
@@ -81697,7 +81703,7 @@ wTB
8169781703
hBZ
8169881704
kSo
8169981705
dpf
81700-
dpf
81706+
tYV
8170181707
juY
8170281708
gYo
8170381709
wQM
@@ -81954,8 +81960,8 @@ wTB
8195481960
hBZ
8195581961
nJe
8195681962
dpf
81957-
dpf
81958-
mqM
81963+
vaA
81964+
qHu
8195981965
ios
8196081966
mZK
8196181967
iGe
@@ -82211,7 +82217,7 @@ aOB
8221182217
wOb
8221282218
nJe
8221382219
dpf
82214-
dpf
82220+
yii
8221582221
vFH
8221682222
ydu
8221782223
dpf
@@ -82726,8 +82732,8 @@ nJe
8272682732
wIc
8272782733
dpf
8272882734
ylC
82729-
fvC
82730-
cvx
82735+
kHF
82736+
kHF
8273182737
dpf
8273282738
wYJ
8273382739
dpf
@@ -82983,7 +82989,7 @@ nJe
8298382989
mpT
8298482990
dpf
8298582991
eVZ
82986-
uvN
82992+
qpf
8298782993
mjG
8298882994
sXP
8298982995
xFt
@@ -83496,7 +83502,7 @@ oXR
8349683502
hbW
8349783503
lwK
8349883504
wvV
83499-
dXK
83505+
iOW
8350083506
dpf
8350183507
tPI
8350283508
erf
@@ -83753,7 +83759,7 @@ fNv
8375383759
vwU
8375483760
cXA
8375583761
cyI
83756-
xId
83762+
aCl
8375783763
uRs
8375883764
lKJ
8375983765
lAt
@@ -84010,7 +84016,7 @@ sZa
8401084016
hbW
8401184017
rsX
8401284018
yfh
84013-
oCY
84019+
vxw
8401484020
dpf
8401584021
dpf
8401684022
dpf
@@ -89395,7 +89401,7 @@ tAW
8939589401
jNf
8939689402
eEB
8939789403
jlh
89398-
jyJ
89404+
lOz
8939989405
eNu
8940089406
bxI
8940189407
tAW

0 commit comments

Comments
 (0)