Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
513 commits
Select commit Hold shift + click to select a range
397a862
fix ui
Bibby0110 Feb 2, 2023
668ce74
oops
Bibby0110 Feb 2, 2023
af1d1c6
Fixes map bibby broke
adamsong Feb 2, 2023
2ba949b
Merge af1d1c610e798f64ddef0f1fcece84f1fef891cf into eee
adamsong Feb 2, 2023
3646529
Revert "Fixes map bibby broke"
Bibby0110 Feb 2, 2023
c1ea6d5
e
Bibby0110 Feb 2, 2023
1ed6d01
Merge c1ea6d52cde7f87940297e0f229b3c79e9d88333 into eee
Bibby0110 Feb 2, 2023
daac26a
Unfucks deltastation
adamsong Feb 2, 2023
ddd96e0
stuff
Bibby0110 Feb 2, 2023
f790fbe
Merge remote-tracking branch 'origin/eee' into eee
adamsong Feb 2, 2023
d4d3c63
cleans things after bibby
patpol4 Feb 2, 2023
bfd5e00
Merge d4d3c63e43bfcbbe63325c5ef7f6cc9f1c72f99e into eee
patpol4 Feb 2, 2023
35bcd13
Fix subcontroller cache
adamsong Feb 3, 2023
a432398
Fixed APCs and air alarms not working when connected to a subcontroller
adamsong Feb 3, 2023
2339874
Merge branch 'master' into eee
Bibby0110 Feb 3, 2023
b1cf655
bunch of fixes
Bibby0110 Feb 4, 2023
7fb3023
job icon
Bibby0110 Feb 4, 2023
08a38d1
tcomms server
Bibby0110 Feb 4, 2023
fb0cdca
make compile
Bibby0110 Feb 4, 2023
974e1cf
Update synthetic.dm
Bibby0110 Feb 4, 2023
a1f03d6
Update synthetic.dm
Bibby0110 Feb 4, 2023
e730798
Update access.dm
Bibby0110 Feb 4, 2023
e76e368
Merge branch 'master' into eee
Bibby0110 Feb 5, 2023
6290ade
er
Bibby0110 Feb 6, 2023
026aae6
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Feb 6, 2023
9e95813
le runtime
Bibby0110 Feb 6, 2023
05ef698
Update ai_data_core.dm
Bibby0110 Feb 6, 2023
5b8294b
le dupe
Bibby0110 Feb 6, 2023
204c2b2
wall
Bibby0110 Feb 6, 2023
ea94276
Update decentralized_ai.dm
Bibby0110 Feb 6, 2023
bc2cbd7
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Feb 6, 2023
d8bb410
Update decentralized_ai.dm
Bibby0110 Feb 6, 2023
bad79da
Merge branch 'master' into eee
Bibby0110 Feb 8, 2023
ad05d2c
Merge branch 'master' into eee
Bibby0110 Feb 8, 2023
6b4824f
e
Bibby0110 Feb 8, 2023
22103eb
Update wy_synths.dm
Bibby0110 Feb 8, 2023
a86ccf5
Merge branch 'master' into eee
Bibby0110 Feb 9, 2023
bdc38f6
Merge branch 'master' into eee
Bibby0110 Mar 15, 2023
2666aa1
we do a little trolling
Bibby0110 Mar 16, 2023
1f8bb5a
e
Bibby0110 Mar 26, 2023
f7f4f43
Merge branch 'master' into eee
Bibby0110 Apr 15, 2023
fd45302
small cahnges
Bibby0110 Apr 15, 2023
6c12ebd
more minor changes
Bibby0110 Apr 15, 2023
53d2f74
Create conflict_fixer.dmm
Bibby0110 Apr 15, 2023
1c18f53
Create conflict_fixer - Kopi.dmm
Bibby0110 Apr 15, 2023
ede05cd
minor map cahnges
Bibby0110 Apr 15, 2023
7fbc762
broken maps
Bibby0110 Apr 15, 2023
a4104a8
oops
Bibby0110 Apr 15, 2023
64c0ebb
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Apr 15, 2023
888c8ad
bon
Bibby0110 Apr 15, 2023
34167df
Update ainetworkinterface.dm
Bibby0110 Apr 15, 2023
f0f80b7
Update ainetworkinterface.dm
Bibby0110 Apr 15, 2023
9bcf127
Update ai.dm
Bibby0110 Apr 15, 2023
4e457df
lol
Bibby0110 Apr 15, 2023
107af3f
light
Bibby0110 Apr 15, 2023
240ca5b
Merge 107af3f535966fa9fbb8a7d05df8732dc6842fb9 into eee
Bibby0110 Apr 15, 2023
6d080bd
fixes
Bibby0110 Apr 15, 2023
993f107
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Apr 15, 2023
0f4e7cb
e
Bibby0110 Apr 15, 2023
a1723c3
Update synth_pod.dm
Bibby0110 Apr 15, 2023
14ec37e
e
Bibby0110 Apr 15, 2023
4b4cb9a
Update synth_os.dm
Bibby0110 Apr 15, 2023
80e6e63
Update objective.dm
Bibby0110 Apr 15, 2023
e82cb91
fixes
Bibby0110 Apr 16, 2023
ed94120
Update synthetic.dm
Bibby0110 Apr 16, 2023
2e91094
e
Bibby0110 Apr 16, 2023
2897eb9
antag
Bibby0110 Apr 16, 2023
2715d55
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Apr 16, 2023
855e184
tweaks
Bibby0110 Apr 17, 2023
6bce3d2
e
Bibby0110 Apr 17, 2023
9557ee9
Update VRSleeper.js
Bibby0110 Apr 17, 2023
9858e64
e
Bibby0110 Apr 17, 2023
b6e8f64
Update synth_pod.dm
Bibby0110 Apr 17, 2023
87ac7fc
Update synth_pod.dm
Bibby0110 Apr 17, 2023
33beb22
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Apr 17, 2023
6c18387
1
Bibby0110 Apr 17, 2023
7a5dd4a
Update synth_pod.dm
Bibby0110 Apr 17, 2023
7a869e4
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Apr 17, 2023
218b693
Update synth_os.dm
Bibby0110 Apr 17, 2023
223121d
Update synthetic.dm
Bibby0110 Apr 17, 2023
20db5c8
fixes
Bibby0110 Apr 17, 2023
f542395
headset and ID go boom
Bibby0110 Apr 18, 2023
45c493e
Update wy_synths.dm
Bibby0110 Apr 18, 2023
55b19b6
Update robot_parts.dm
Bibby0110 Apr 18, 2023
6d1b3c7
cremator
Bibby0110 Apr 18, 2023
00b2d23
Update communications.dm
Bibby0110 Apr 18, 2023
e77f421
Update synthetic.dm
Bibby0110 Apr 18, 2023
bf953ec
no synth control
Bibby0110 Apr 18, 2023
478acd3
Update synthetic.dm
Bibby0110 Apr 19, 2023
384476f
Update ai_dashboard.dm
Bibby0110 Apr 19, 2023
8907983
Update miscellaneous.dm
Bibby0110 Apr 21, 2023
8212722
Update miscellaneous.dm
Bibby0110 Apr 21, 2023
8d54f64
Update headset.dm
Bibby0110 Apr 21, 2023
6f74090
Update damage_procs.dm
Bibby0110 Apr 21, 2023
ca71bca
Update server_cabinet.dm
Bibby0110 Apr 21, 2023
e10d819
minor fixes
Bibby0110 Apr 21, 2023
686dd35
Update miscellaneous.dm
Bibby0110 Apr 22, 2023
d09d2b1
Update rack_creator.dm
Bibby0110 Apr 23, 2023
7569714
Update synthetic.dm
Bibby0110 Aug 27, 2023
760476a
Merge branch 'master' into eee
Bibby0110 Aug 27, 2023
cf5a5f4
compiles
Bibby0110 Aug 28, 2023
ebae0d5
Merge branch 'master' into eee
Bibby0110 Oct 3, 2023
b3def94
fixes
Bibby0110 Oct 3, 2023
17a7d02
brainless
Bibby0110 Oct 3, 2023
ab7001a
access request
Bibby0110 Oct 3, 2023
a7c6ca4
cofnlict
Bibby0110 Oct 3, 2023
ce8eaa0
fixes
Bibby0110 Oct 3, 2023
cd7352a
controller
Bibby0110 Oct 3, 2023
53d819a
Merge cd7352a1c3dbbbb538a7939a706e54b4fd698205 into eee
Bibby0110 Oct 3, 2023
ad24d1e
Merge branch 'master' into eee
Bibby0110 Oct 3, 2023
4168d54
Update yogstation.dme
Bibby0110 Oct 3, 2023
3e7a1d4
Update yogstation.dme
Bibby0110 Oct 3, 2023
d1d779d
s
Bibby0110 Oct 3, 2023
c6515dc
maps
Bibby0110 Oct 3, 2023
c0f740f
Update NtosSynthManager.js
Bibby0110 Oct 3, 2023
831e5ed
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Oct 3, 2023
27ff6c9
unrevert this lol
Bibby0110 Oct 3, 2023
2f2332f
eat
Bibby0110 Oct 3, 2023
df0f6be
Update wy_synths.dm
Bibby0110 Oct 3, 2023
d2bf4cc
sigh
Bibby0110 Oct 3, 2023
00dd7b8
e
Bibby0110 Oct 3, 2023
1e902c3
Update wy_synths.dm
Bibby0110 Oct 3, 2023
e4f084a
sigh
Bibby0110 Oct 3, 2023
1ef6e3a
Merge e4f084a93e594d1476030df009f19135bcb4d503 into eee
Bibby0110 Oct 3, 2023
c2db981
fixed ma
Bibby0110 Oct 3, 2023
c86de3b
Update synthetic.dm
Bibby0110 Oct 3, 2023
543022e
better
Bibby0110 Oct 3, 2023
a09cdc3
Update ethernet_cable.dm
Bibby0110 Oct 3, 2023
93ff903
Update computer.dm
Bibby0110 Oct 3, 2023
abba783
Update computer.dm
Bibby0110 Oct 3, 2023
0c78022
i hate this
Bibby0110 Oct 3, 2023
8c501b9
Update ai_laws.dm
Bibby0110 Oct 3, 2023
17ca3e1
Update hardsuit.dm
Bibby0110 Oct 3, 2023
0937936
initialize
Bibby0110 Oct 3, 2023
c32a40f
sigh
Bibby0110 Oct 3, 2023
10e09b3
Update synth_os.dm
Bibby0110 Oct 3, 2023
2a9354f
Update master_subcontroller.dm
Bibby0110 Oct 3, 2023
490ba92
Update master_subcontroller.dm
Bibby0110 Oct 3, 2023
e32d0e7
Update synth_requester.dm
Bibby0110 Oct 3, 2023
62a612c
Update synth_requester.dm
Bibby0110 Oct 3, 2023
90da4bd
Update room_lockdown.dm
Bibby0110 Oct 3, 2023
93a5d07
small fixes
Bibby0110 Oct 4, 2023
077df40
propa sprite matey
Bibby0110 Oct 4, 2023
ac681d4
no latejoin lol
Bibby0110 Oct 4, 2023
efa5eb9
Update synth_os.dm
Bibby0110 Oct 4, 2023
3897b4a
maps fixed
Bibby0110 Oct 4, 2023
88f6167
Merge 3897b4a2c38828b5bba246caf809434c3942cc3e into eee
Bibby0110 Oct 4, 2023
937fa5d
compiles
Bibby0110 Oct 4, 2023
67be240
Update brain_item.dm
Bibby0110 Oct 4, 2023
16459c2
fixes
Bibby0110 Oct 4, 2023
687baf7
mappers
Bibby0110 Oct 4, 2023
bf3dd6c
Merge 687baf723f0eea9f19f1e7aa6669c787121f744b into eee
Bibby0110 Oct 4, 2023
f55fc3d
Update hud.dmi
Bibby0110 Oct 4, 2023
bbef287
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Oct 4, 2023
a8ce7cb
Update passworddoor.dm
Bibby0110 Oct 4, 2023
15771de
button puzzle
Bibby0110 Oct 4, 2023
5f1a32d
mine stuff
Bibby0110 Oct 4, 2023
d0f5903
Update yogstation.dme
Bibby0110 Oct 4, 2023
8638422
le map
Bibby0110 Oct 4, 2023
dea891c
changes
Bibby0110 Oct 4, 2023
b141ef1
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Oct 4, 2023
6562764
ye
Bibby0110 Oct 4, 2023
bc3584c
Merge 656276431d4251c2c8ac745e752649d819bc8948 into eee
Bibby0110 Oct 4, 2023
04bd483
Update abandoned_mine.dm
Bibby0110 Oct 4, 2023
cb21b09
Update _puzzles.dm
Bibby0110 Oct 4, 2023
53c7a27
bingus
Bibby0110 Oct 4, 2023
cf4e6c8
Update abandoned_mine.dm
Bibby0110 Oct 4, 2023
0c6f412
maps
Bibby0110 Oct 4, 2023
f449faa
Merge 0c6f41204902807067b92de6aae91b34da38bfd6 into eee
Bibby0110 Oct 4, 2023
61727dd
e
Bibby0110 Oct 10, 2023
2fb25e6
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Oct 10, 2023
a4c9d71
Merge remote-tracking branch 'origin/master' into eee
Bibby0110 Oct 12, 2023
4c38367
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Oct 12, 2023
2ec24fb
no more quirks
Bibby0110 Oct 29, 2023
aa444ab
e
Bibby0110 Oct 30, 2023
ed781e0
Merge branch 'master' into ai-rework
Bibby0110 Jan 17, 2024
1f5e07e
DMI merge conflict resolver (from TG)
Bibby0110 Jan 17, 2024
ac18272
update yogstation map
Bibby0110 Jan 17, 2024
3a268be
Minor away mission changes
Bibby0110 Jan 17, 2024
5bc3cc1
forgot something
Bibby0110 Jan 17, 2024
61a15db
proper fix
Bibby0110 Jan 17, 2024
7c5114f
donut
Bibby0110 Jan 17, 2024
0e114ec
maps
Bibby0110 Jan 17, 2024
3d6bb82
asteroid
Bibby0110 Jan 17, 2024
70c5091
gax
Bibby0110 Jan 17, 2024
7f573de
all maps done
Bibby0110 Jan 17, 2024
de5ea4b
Update synthetic.dm
Bibby0110 Jan 17, 2024
8629f85
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Jan 17, 2024
d205ab8
makes it compile
Bibby0110 Jan 17, 2024
3507eda
Update backstabs.dm
Bibby0110 Jan 17, 2024
881534b
more compile!
Bibby0110 Jan 17, 2024
257e29a
fix this map
Bibby0110 Jan 17, 2024
1288b91
Merge 257e29a9ef36381d74bfc08cb346c5d935213903 into eee
Bibby0110 Jan 17, 2024
73e0887
bad item
Bibby0110 Jan 17, 2024
27bc676
remove broken objects
Bibby0110 Jan 17, 2024
73bc97c
gax
Bibby0110 Jan 17, 2024
af4047f
Update ticker.dm
Bibby0110 Jan 17, 2024
1b726d5
pdas
Bibby0110 Jan 17, 2024
faa6f09
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Jan 17, 2024
e3d1f0d
omg save the file
Bibby0110 Jan 17, 2024
8e64d20
Update networking_machines.dm
Bibby0110 Jan 17, 2024
d107ca9
area string moment
Bibby0110 Jan 17, 2024
2bfa683
s
Bibby0110 Jan 17, 2024
80deb82
awkward
Bibby0110 Jan 17, 2024
135779e
revival
Bibby0110 Jan 17, 2024
a51db85
Update ai_dashboard.dm
Bibby0110 Jan 17, 2024
5f6a922
fixes
Bibby0110 Jan 18, 2024
86c1a57
fixed floopy
Bibby0110 Jan 18, 2024
5923c67
less difficult
Bibby0110 Jan 18, 2024
cd3f3e6
this is important
Bibby0110 Jan 18, 2024
b821550
Merge branch 'eee' of https://github.com/yogstation13/Yogstation into…
Bibby0110 Jan 18, 2024
b9041d5
Merge branch 'master' into eee
Bibby0110 Jan 23, 2024
1194b66
Update ai_network.dm
Bibby0110 Jan 28, 2024
e2cb1f8
maps
Bibby0110 Jan 28, 2024
765b862
Merge branch 'master' into eee
Bibby0110 Feb 13, 2024
dcc8007
Merge branch 'master' into ai-rework
Bibby0110 Feb 17, 2024
93344a3
fixes the maps
Bibby0110 Feb 17, 2024
b16f958
wHAT
Bibby0110 Feb 17, 2024
0efff1a
WHAT
Bibby0110 Feb 17, 2024
4faeb92
wet
Bibby0110 Feb 17, 2024
4086534
merge
ToasterBiome Mar 1, 2024
96de485
start fixing conflicts
ToasterBiome Mar 2, 2024
852b4a6
Update yogstation.dme
ToasterBiome Mar 11, 2024
b632223
start fixing map conflicts
ToasterBiome Mar 11, 2024
fcdec66
Update DonutStation.dmm
ToasterBiome Mar 11, 2024
dcceb91
updates
ToasterBiome Mar 11, 2024
e2199ac
donut conflicts
ToasterBiome Mar 11, 2024
02db232
update box
ToasterBiome Mar 11, 2024
90a8d12
Update IceMeta.dmm
ToasterBiome Mar 11, 2024
143e02c
Merge remote-tracking branch 'upstream/master' into eee
ToasterBiome Mar 20, 2024
cb8629d
icon diffs
ToasterBiome Mar 20, 2024
7925a62
Update crew.dm
ToasterBiome Mar 20, 2024
09c6a8d
Update unsorted.dm
ToasterBiome Mar 20, 2024
b8d9e81
Update layers.dm
ToasterBiome Mar 20, 2024
baa8dcc
Update YogStation.dmm
ToasterBiome Mar 20, 2024
31f96a2
conflicts
ToasterBiome Mar 28, 2024
9132830
Update IceMeta.dmm
ToasterBiome Mar 28, 2024
20e1762
will this finally fix it
ToasterBiome Mar 28, 2024
6d08487
Update IceMeta.dmm
ToasterBiome Mar 28, 2024
b2917d1
Merge remote-tracking branch 'upstream/master' into eee
ToasterBiome Mar 28, 2024
92a2ad2
fix all this SHIT
ToasterBiome Mar 28, 2024
eedc004
what
ToasterBiome Mar 28, 2024
6344faa
more shit ugh
ToasterBiome Mar 28, 2024
17a4883
what!
ToasterBiome Mar 28, 2024
1f82a4c
Update DonutStation.dmm
ToasterBiome Mar 28, 2024
2d57c28
Update AsteroidStation.dmm
ToasterBiome Mar 28, 2024
2d9f4ce
Update AsteroidStation.dmm
ToasterBiome Mar 28, 2024
13e7bcb
Update dead.dm
ToasterBiome Mar 28, 2024
910f856
Update catwalk_plating.dm
ToasterBiome Apr 1, 2024
aac2305
Update catwalk_plating.dm
ToasterBiome Apr 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
560 changes: 323 additions & 237 deletions _maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm

Large diffs are not rendered by default.

72,096 changes: 72,096 additions & 0 deletions _maps/RandomZLevels/VR/netmin_hub.dmm

Large diffs are not rendered by default.

1,578 changes: 832 additions & 746 deletions _maps/map_files/AsteroidStation/AsteroidStation.dmm

Large diffs are not rendered by default.

1,657 changes: 990 additions & 667 deletions _maps/map_files/DonutStation/DonutStation.dmm

Large diffs are not rendered by default.

146 changes: 76 additions & 70 deletions _maps/map_files/GaxStation/GaxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1098,6 +1098,16 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"aCl" = (
/obj/effect/turf_decal/trimline/blue/filled/line/lower,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/science/mixing)
"aCs" = (
/obj/machinery/door/airlock/external{
name = "Escape Airlock"
Expand Down Expand Up @@ -4879,12 +4889,6 @@
},
/turf/open/floor/wood,
/area/library)
"cvx" = (
/obj/machinery/computer/ai_server_console{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/secondarydatacore)
"cvF" = (
/obj/effect/turf_decal/trimline/secred/filled/line/lower{
dir = 10
Expand Down Expand Up @@ -8201,12 +8205,6 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/miningdock)
"dXK" = (
/obj/structure/reagent_dispensers/water_cooler,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower,
/turf/open/floor/plasteel,
/area/science/mixing)
"dYH" = (
/obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{
dir = 4
Expand Down Expand Up @@ -11458,12 +11456,6 @@
"fvA" = (
/turf/open/floor/plasteel,
/area/security/main)
"fvC" = (
/obj/machinery/computer/ai_resource_distribution{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/secondarydatacore)
"fvG" = (
/obj/structure/chair{
dir = 4
Expand Down Expand Up @@ -18481,6 +18473,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
"iOW" = (
/obj/effect/turf_decal/trimline/blue/filled/corner/lower,
/obj/structure/reagent_dispensers/water_cooler,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/science/mixing)
"iOZ" = (
/obj/effect/turf_decal/trimline/brown/filled/line/lower{
dir = 5
Expand All @@ -18492,7 +18490,6 @@
/obj/structure/rack,
/obj/item/aicard,
/obj/item/disk/holodisk/tutorial/AICore,
/obj/item/circuitboard/computer/ai_upload_download,
/obj/machinery/power/apc{
areastring = "/area/crew_quarters/heads/hor";
dir = 8;
Expand Down Expand Up @@ -19713,15 +19710,6 @@
/obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"jyJ" = (
/obj/machinery/computer/robotics{
dir = 8
},
/obj/structure/sign/plaques/ai_password{
pixel_x = 32
},
/turf/open/floor/carpet/purple,
/area/crew_quarters/heads/hor)
"jyN" = (
/obj/effect/turf_decal/trimline/secred/filled/corner/lower,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
Expand Down Expand Up @@ -22056,6 +22044,9 @@
/obj/machinery/light/small,
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
"kHF" = (
/turf/open/floor/plasteel/dark,
/area/ai_monitored/secondarydatacore)
"kHQ" = (
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
Expand Down Expand Up @@ -24391,6 +24382,12 @@
},
/turf/open/floor/wood,
/area/crew_quarters/heads/captain)
"lOz" = (
/obj/machinery/computer/robotics{
dir = 8
},
/turf/open/floor/carpet/purple,
/area/crew_quarters/heads/hor)
"lOU" = (
/obj/effect/turf_decal/trimline/purple/filled/line/lower{
dir = 1
Expand Down Expand Up @@ -25563,13 +25560,6 @@
},
/turf/open/floor/plasteel/white,
/area/science/lab)
"mqM" = (
/obj/machinery/ai/data_core,
/obj/machinery/light{
dir = 1
},
/turf/open/floor/circuit/green/telecomms,
/area/ai_monitored/secondarydatacore)
"mrk" = (
/obj/effect/turf_decal/trimline/neutral/filled/line/lower{
dir = 4
Expand Down Expand Up @@ -29895,13 +29885,6 @@
},
/turf/open/floor/plasteel,
/area/science/mixing)
"oCY" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/dark_blue/filled/corner/lower{
dir = 8
},
/turf/open/floor/plasteel,
/area/science/mixing)
"oEt" = (
/obj/effect/turf_decal/trimline/blue/filled/line/lower{
dir = 5
Expand Down Expand Up @@ -33544,6 +33527,10 @@
},
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet)
"qpf" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/secondarydatacore)
"qpr" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
Expand Down Expand Up @@ -34031,6 +34018,9 @@
},
/turf/open/floor/engine,
/area/engine/engineering)
"qHu" = (
/turf/open/floor/circuit/green/telecomms,
/area/ai_monitored/secondarydatacore)
"qHC" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
Expand Down Expand Up @@ -40891,6 +40881,16 @@
},
/turf/open/floor/plasteel/white,
/area/medical/virology)
"tYV" = (
/obj/machinery/ai/networking{
label = "Subcontroller";
roundstart_connection = "Computer Science - 2"
},
/obj/structure/ethernet_cable{
icon_state = "0-4"
},
/turf/open/floor/circuit/telecomms/server,
/area/ai_monitored/secondarydatacore)
"tZf" = (
/obj/machinery/computer/cargo/request,
/obj/structure/cable{
Expand Down Expand Up @@ -41613,13 +41613,6 @@
},
/turf/open/floor/plating,
/area/maintenance/aft)
"uvN" = (
/obj/structure/chair/office/light{
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/turf/open/floor/plasteel/dark,
/area/ai_monitored/secondarydatacore)
"uvV" = (
/obj/effect/turf_decal/trimline/neutral/filled/line/lower{
dir = 4
Expand Down Expand Up @@ -42920,6 +42913,15 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
"vaA" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/ethernet_cable{
icon_state = "4-8"
},
/turf/open/floor/circuit/telecomms/server,
/area/ai_monitored/secondarydatacore)
"vaF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
Expand Down Expand Up @@ -43896,6 +43898,13 @@
},
/turf/open/floor/engine,
/area/science/xenobiology)
"vxw" = (
/obj/effect/turf_decal/trimline/blue/filled/corner/lower{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/science/mixing)
"vyw" = (
/obj/effect/turf_decal/trimline/brown/filled/corner/lower,
/obj/machinery/door/poddoor/shutters{
Expand Down Expand Up @@ -48372,16 +48381,6 @@
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"xId" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/trimline/dark_blue/filled/line/lower,
/turf/open/floor/plasteel,
/area/science/mixing)
"xIi" = (
/obj/structure/cable{
icon_state = "2-8"
Expand Down Expand Up @@ -49550,6 +49549,13 @@
},
/turf/open/floor/plasteel,
/area/storage/primary)
"yii" = (
/obj/machinery/ai/master_subcontroller,
/obj/structure/ethernet_cable{
icon_state = "0-8"
},
/turf/open/floor/circuit/telecomms/server,
/area/ai_monitored/secondarydatacore)
"yij" = (
/obj/machinery/atmospherics/components/binary/pump{
name = "Port to Filter"
Expand Down Expand Up @@ -81697,7 +81703,7 @@ wTB
hBZ
kSo
dpf
dpf
tYV
juY
gYo
wQM
Expand Down Expand Up @@ -81954,8 +81960,8 @@ wTB
hBZ
nJe
dpf
dpf
mqM
vaA
qHu
ios
mZK
iGe
Expand Down Expand Up @@ -82211,7 +82217,7 @@ aOB
wOb
nJe
dpf
dpf
yii
vFH
ydu
dpf
Expand Down Expand Up @@ -82726,8 +82732,8 @@ nJe
wIc
dpf
ylC
fvC
cvx
kHF
kHF
dpf
wYJ
dpf
Expand Down Expand Up @@ -82983,7 +82989,7 @@ nJe
mpT
dpf
eVZ
uvN
qpf
mjG
sXP
xFt
Expand Down Expand Up @@ -83496,7 +83502,7 @@ oXR
hbW
lwK
wvV
dXK
iOW
dpf
tPI
erf
Expand Down Expand Up @@ -83753,7 +83759,7 @@ fNv
vwU
cXA
cyI
xId
aCl
uRs
lKJ
lAt
Expand Down Expand Up @@ -84010,7 +84016,7 @@ sZa
hbW
rsX
yfh
oCY
vxw
dpf
dpf
dpf
Expand Down Expand Up @@ -89395,7 +89401,7 @@ tAW
jNf
eEB
jlh
jyJ
lOz
eNu
bxI
tAW
Expand Down
Loading