Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Datacore Subsystem port #2984

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open

Datacore Subsystem port #2984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
b30e69d
idk
FalloutFalcon May 12, 2024
bd21958
subsystem!
FalloutFalcon May 12, 2024
bb8d314
default records is outpost
FalloutFalcon May 12, 2024
e51ce5b
alot
FalloutFalcon May 12, 2024
781d1e6
stuff i missed.
FalloutFalcon May 12, 2024
8c3c63f
alot of defines
FalloutFalcon May 12, 2024
28cf978
copy pasted for testing, will make better in a bit
FalloutFalcon May 12, 2024
f019ff3
photo stuff
FalloutFalcon May 12, 2024
1910693
shrug
FalloutFalcon May 12, 2024
dda95ab
Merge branch 'master' into datacore-port
FalloutFalcon May 14, 2024
fd286c2
records computer
FalloutFalcon May 15, 2024
b130730
idk rn
FalloutFalcon May 15, 2024
ff48900
filing cabnit
FalloutFalcon May 15, 2024
c27d7c1
no more 3 records
FalloutFalcon May 15, 2024
7b9886e
agh
FalloutFalcon May 15, 2024
a61cef5
ahh
FalloutFalcon May 15, 2024
b74ffb1
ahh
FalloutFalcon May 15, 2024
bb13c76
tired
FalloutFalcon May 15, 2024
d8d1a1c
editable
FalloutFalcon May 15, 2024
de2e78f
generic records woo
FalloutFalcon May 28, 2024
852d295
yea
FalloutFalcon May 28, 2024
69278a8
small stuff
FalloutFalcon May 28, 2024
8a842e3
yea
FalloutFalcon May 28, 2024
8a8121f
we are very close
FalloutFalcon May 28, 2024
ad74c95
yea
FalloutFalcon May 28, 2024
54ecbb1
sechud stuff works
FalloutFalcon May 28, 2024
e750ac4
alot
FalloutFalcon May 28, 2024
9f1f446
Revert "alot"
FalloutFalcon May 28, 2024
9ea5e32
Reapply "alot"
FalloutFalcon May 28, 2024
f4a9cea
simplification of behaviors
FalloutFalcon May 28, 2024
0b6dd1a
yea
FalloutFalcon May 28, 2024
ea477bf
notekeeper!
FalloutFalcon May 29, 2024
bdef490
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Jun 18, 2024
e02fd84
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Jul 10, 2024
7ea4d03
fixes bad paths
FalloutFalcon Jul 10, 2024
5050e2a
light prettier
FalloutFalcon Jul 10, 2024
4e7297a
not outpost by default
FalloutFalcon Jul 10, 2024
3ac148e
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Aug 10, 2024
92d6b86
fix bad computer path
FalloutFalcon Aug 10, 2024
4a79cd3
lets you link HUDS via helm
FalloutFalcon Aug 10, 2024
ee47dd3
Merge branch 'master' into datacore-port
FalloutFalcon Aug 30, 2024
29fa837
imma finish this soon.
FalloutFalcon Sep 11, 2024
6ba6507
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Sep 11, 2024
ee85aab
agh
FalloutFalcon Sep 11, 2024
4e09908
fixed a few things related to access
FalloutFalcon Sep 11, 2024
b100f5d
more changes
FalloutFalcon Sep 12, 2024
c183313
small fixes to tgui
FalloutFalcon Sep 13, 2024
42f27c5
fix bad path!
FalloutFalcon Sep 13, 2024
8e222de
typescript type stuff
FalloutFalcon Sep 13, 2024
d3cd1c1
no more linters?
FalloutFalcon Sep 14, 2024
1c0ecf5
prettier?
FalloutFalcon Sep 14, 2024
fd06095
Merge branch 'master' into datacore-port
FalloutFalcon Sep 14, 2024
590c10c
prettier fail again?
FalloutFalcon Sep 15, 2024
29be430
Merge branch 'datacore-port' of https://github.com/FalloutFalcon/Ship…
FalloutFalcon Sep 15, 2024
e988847
Merge branch 'master' into datacore-port
FalloutFalcon Sep 17, 2024
eb0446d
small tweak and should be good
FalloutFalcon Sep 21, 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
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3395,7 +3395,7 @@
/turf/open/floor/plating/rust,
/area/ruin/jungle/interceptor/starlauncherone)
"CU" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/records/sec,
/obj/structure/cable/orange{
icon_state = "2-8"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/LavaRuins/lavaland_abandonedlisteningpost.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@
/area/ruin/unpowered/listening_post/commons)
"rb" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/secure_data/laptop,
/obj/machinery/computer/records/sec/laptop,
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 4
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2920,7 +2920,7 @@
/area/overmap_encounter/planetoid/lava/explored)
"By" = (
/obj/structure/table/wood,
/obj/machinery/computer/secure_data/laptop{
/obj/machinery/computer/records/sec/laptop{
dir = 4;
pixel_x = -5;
pixel_y = 5
Expand Down Expand Up @@ -4953,7 +4953,7 @@
/turf/open/floor/plating/grass/lava/orange,
/area/overmap_encounter/planetoid/lava/explored)
"Xp" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/records/sec,
/turf/open/floor/carpet/nanoweave/red,
/area/ruin/lavaland/factory/adminstrative)
"Xv" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
/area/overmap_encounter/planetoid/rockplanet/explored)
"bc" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/med_data/laptop{
/obj/machinery/computer/records/med/laptop{
dir = 4;
pixel_x = -7;
pixel_y = 6
Expand Down Expand Up @@ -1329,7 +1329,7 @@
/obj/machinery/status_display/evac{
pixel_y = 32
},
/obj/machinery/computer/med_data/laptop{
/obj/machinery/computer/records/med/laptop{
pixel_x = 5;
pixel_y = 4
},
Expand Down Expand Up @@ -2395,11 +2395,11 @@
/area/ruin/rockplanet/nanotrasen)
"Po" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/med_data/laptop{
/obj/machinery/computer/records/med/laptop{
pixel_x = -5;
pixel_y = 3
},
/obj/machinery/computer/secure_data/laptop{
/obj/machinery/computer/records/sec/laptop{
pixel_x = 16;
pixel_y = 3
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/RockRuins/rockplanet_harmfactory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
/area/ruin/powered)
"cy" = (
/obj/structure/table/wood/reinforced,
/obj/machinery/computer/secure_data/laptop,
/obj/machinery/computer/records/sec/laptop,
/turf/open/floor/plating/rust,
/area/ruin/powered)
"cQ" = (
Expand All @@ -121,7 +121,7 @@
/area/ruin/powered)
"dr" = (
/obj/structure/table/wood/reinforced,
/obj/machinery/computer/med_data/laptop,
/obj/machinery/computer/records/med/laptop,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/newspaper{
pixel_x = 8;
Expand Down Expand Up @@ -271,7 +271,7 @@
/turf/open/floor/plating/rust,
/area/ruin/powered)
"gx" = (
/obj/structure/filingcabinet/employment,
/obj/structure/filingcabinet/record/gen,
/obj/structure/safe/floor,
/obj/item/keycard/harmfactory/office,
/turf/open/floor/plating/rust,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_nomadcrash.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,7 @@
dir = 4
},
/obj/structure/table,
/obj/machinery/computer/secure_data/laptop{
/obj/machinery/computer/records/sec/laptop{
dir = 8;
pixel_x = 2;
pixel_y = 6
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@
/area/ruin/rockplanet/shippingdocksecure)
"il" = (
/obj/structure/table,
/obj/machinery/computer/secure_data/laptop{
/obj/machinery/computer/records/sec/laptop{
dir = 8;
pixel_x = 1
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/power_puzzle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3178,7 +3178,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/computer/secure_data/laptop{
/obj/machinery/computer/records/sec/laptop{
dir = 1;
pixel_y = 5
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/spacemall.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall)
"fa" = (
/obj/machinery/computer/secure_data{
/obj/machinery/computer/records/sec{
dir = 1
},
/obj/effect/turf_decal/corner/opaque/red/mono,
Expand Down Expand Up @@ -8454,7 +8454,7 @@
/turf/open/floor/wood,
/area/ruin/space/has_grav/spacemall/maint)
"FC" = (
/obj/machinery/computer/secure_data/laptop{
/obj/machinery/computer/records/sec/laptop{
dir = 1
},
/obj/structure/table/reinforced,
Expand Down
50 changes: 25 additions & 25 deletions _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3781,7 +3781,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
"aLj" = (
/obj/machinery/computer/secure_data{
/obj/machinery/computer/records/sec{
dir = 4
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down Expand Up @@ -6479,7 +6479,7 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"bIA" = (
/obj/machinery/computer/secure_data,
/obj/machinery/computer/records/sec,
/obj/effect/turf_decal/industrial/warning,
/turf/open/floor/plasteel,
/area/centcom/control)
Expand Down Expand Up @@ -7010,7 +7010,7 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"cRF" = (
/obj/machinery/computer/med_data{
/obj/machinery/computer/records/med{
dir = 4
},
/obj/effect/turf_decal/corner/transparent/neutral{
Expand Down Expand Up @@ -7040,7 +7040,7 @@
/obj/structure/sign/poster/contraband/syndicate_recruitment{
pixel_x = -32
},
/obj/machinery/computer/secure_data/syndie{
/obj/machinery/computer/records/sec/syndie{
dir = 4
},
/turf/open/floor/mineral/plastitanium,
Expand Down Expand Up @@ -7217,7 +7217,7 @@
/turf/open/floor/plasteel,
/area/tdome/tdomeobserve)
"dsk" = (
/obj/structure/filingcabinet/security,
/obj/structure/filingcabinet/record/security,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
Expand Down Expand Up @@ -7341,7 +7341,7 @@
/turf/open/floor/plasteel,
/area/centcom)
"dGq" = (
/obj/machinery/computer/med_data{
/obj/machinery/computer/records/med{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/blue{
Expand Down Expand Up @@ -8170,7 +8170,7 @@
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
"fdr" = (
/obj/structure/filingcabinet/medical,
/obj/structure/filingcabinet/record/medical,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
Expand Down Expand Up @@ -8901,7 +8901,7 @@
/turf/open/floor/plasteel,
/area/centcom/supply)
"gLL" = (
/obj/machinery/computer/secure_data{
/obj/machinery/computer/records/sec{
dir = 8
},
/obj/machinery/button/door/indestructible{
Expand Down Expand Up @@ -9779,7 +9779,7 @@
/turf/open/floor/mineral/plastitanium,
/area/centcom)
"izl" = (
/obj/machinery/computer/secure_data{
/obj/machinery/computer/records/sec{
dir = 1
},
/obj/machinery/light/directional/south,
Expand Down Expand Up @@ -9972,7 +9972,7 @@
/obj/machinery/newscaster/directional/north{
pixel_y = -30
},
/obj/machinery/computer/med_data{
/obj/machinery/computer/records/med{
dir = 1
},
/obj/effect/turf_decal/corner/transparent/neutral{
Expand Down Expand Up @@ -10065,7 +10065,7 @@
/turf/open/floor/plasteel,
/area/centcom/supplypod/loading/ert)
"jly" = (
/obj/machinery/computer/med_data/syndie{
/obj/machinery/computer/records/med/syndie{
dir = 1
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down Expand Up @@ -10172,7 +10172,7 @@
/turf/open/floor/plasteel/dark,
/area/tdome/tdomeobserve)
"jvG" = (
/obj/machinery/computer/secure_data{
/obj/machinery/computer/records/sec{
dir = 1
},
/obj/effect/turf_decal/industrial/warning{
Expand Down Expand Up @@ -10958,7 +10958,7 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"lhE" = (
/obj/machinery/computer/secure_data{
/obj/machinery/computer/records/sec{
dir = 4
},
/obj/effect/turf_decal/corner/transparent/neutral{
Expand Down Expand Up @@ -11612,7 +11612,7 @@
/area/ctf)
"moE" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/secure_data/laptop{
/obj/machinery/computer/records/sec/laptop{
dir = 4;
pixel_y = 6;
pixel_x = -4
Expand Down Expand Up @@ -12436,7 +12436,7 @@
/obj/effect/turf_decal/corner/opaque/brown{
dir = 8
},
/obj/machinery/computer/secure_data,
/obj/machinery/computer/records/sec,
/obj/machinery/light/directional/north,
/turf/open/floor/plasteel,
/area/centcom)
Expand Down Expand Up @@ -12663,7 +12663,7 @@
/area/centcom/ferry)
"owZ" = (
/obj/structure/table/reinforced,
/obj/machinery/computer/med_data/laptop,
/obj/machinery/computer/records/med/laptop,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
Expand Down Expand Up @@ -13681,7 +13681,7 @@
/turf/open/floor/plasteel,
/area/centcom/supply)
"qxD" = (
/obj/structure/filingcabinet/medical,
/obj/structure/filingcabinet/record/medical,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
Expand Down Expand Up @@ -14574,7 +14574,7 @@
/turf/open/floor/plasteel/dark,
/area/tdome/tdomeobserve)
"sho" = (
/obj/structure/filingcabinet/security,
/obj/structure/filingcabinet/record/security,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
Expand Down Expand Up @@ -15156,7 +15156,7 @@
/turf/open/floor/plasteel/dark,
/area/ctf)
"tyD" = (
/obj/structure/filingcabinet/security,
/obj/structure/filingcabinet/record/security,
/obj/effect/turf_decal/industrial/warning{
dir = 9
},
Expand Down Expand Up @@ -15195,7 +15195,7 @@
/turf/open/floor/plasteel/patterned/grid,
/area/centcom)
"tAB" = (
/obj/structure/filingcabinet/medical,
/obj/structure/filingcabinet/record/medical,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
Expand Down Expand Up @@ -16008,7 +16008,7 @@
/turf/open/floor/plasteel/dark,
/area/ctf)
"vyk" = (
/obj/machinery/computer/secure_data{
/obj/machinery/computer/records/sec{
dir = 1
},
/obj/effect/turf_decal/corner/transparent/neutral{
Expand All @@ -16033,7 +16033,7 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"vAM" = (
/obj/machinery/computer/secure_data{
/obj/machinery/computer/records/sec{
dir = 8
},
/obj/effect/turf_decal/corner/transparent/neutral{
Expand Down Expand Up @@ -16438,7 +16438,7 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"wER" = (
/obj/structure/filingcabinet/medical,
/obj/structure/filingcabinet/record/medical,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
Expand Down Expand Up @@ -16724,7 +16724,7 @@
/turf/open/floor/plasteel,
/area/centcom/evac)
"xEN" = (
/obj/structure/filingcabinet/medical,
/obj/structure/filingcabinet/record/medical,
/obj/effect/turf_decal/industrial/warning{
dir = 5
},
Expand Down Expand Up @@ -16802,7 +16802,7 @@
/area/centcom/supply)
"xSR" = (
/obj/structure/table/wood,
/obj/machinery/computer/med_data/laptop,
/obj/machinery/computer/records/med/laptop,
/obj/effect/turf_decal/corner/transparent/neutral{
dir = 1
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_ice_40x40.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1555,7 +1555,7 @@
},
/area/hangar)
"Ps" = (
/obj/machinery/computer/secure_data{
/obj/machinery/computer/records/sec{
icon_state = "computer-left";
dir = 4;
pixel_x = -7
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_ice_56x40.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1462,7 +1462,7 @@
},
/area/hangar)
"Mt" = (
/obj/machinery/computer/secure_data{
/obj/machinery/computer/records/sec{
icon_state = "computer-left";
dir = 4;
pixel_x = -7
Expand Down
Loading
Loading