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

Express Console Supremacy #2994

Merged
merged 15 commits into from
Jul 16, 2024
Merged

Express Console Supremacy #2994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f9aa603
one cargo console
FalloutFalcon May 15, 2024
62784f3
one cargo console
FalloutFalcon May 15, 2024
6ff0ac3
javascript stuff
FalloutFalcon May 15, 2024
5f39bc8
more cruft behavior
FalloutFalcon May 15, 2024
904728b
how did that get unticked
FalloutFalcon May 15, 2024
63998c9
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon May 31, 2024
e874284
hm
FalloutFalcon May 31, 2024
d038fe8
dead varibles
FalloutFalcon May 31, 2024
fd00663
prettier
FalloutFalcon May 31, 2024
7d77647
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Jun 18, 2024
5752744
fix new bad path
FalloutFalcon Jun 18, 2024
c5adac5
remove commented out code
FalloutFalcon Jun 26, 2024
0823eca
text2path removed, updated regex
FalloutFalcon Jun 26, 2024
39a2373
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Jul 3, 2024
d466bd5
agh
FalloutFalcon Jul 10, 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_cavecrew.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1762,7 +1762,7 @@
/turf/open/floor/plasteel/tech,
/area/ruin/jungle/cavecrew/security)
"vr" = (
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/turf/open/floor/plasteel/patterned,
/area/ruin/jungle/cavecrew/cargo)
"vH" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/singularity_lab.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3490,7 +3490,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{
dir = 9
},
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/turf/open/floor/carpet/nanoweave/beige,
/area/ruin/space/has_grav/singularitylab/cargo)
"nT" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_asteroid_20x20.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
},
/area/hangar)
"jw" = (
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/obj/structure/railing{
dir = 8;
layer = 4.1
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_asteroid_40x20.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@
},
/area/hangar)
"tH" = (
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/obj/item/toy/plush/knight{
pixel_y = 25;
pixel_x = 9
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_asteroid_40x40.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
/obj/effect/turf_decal/techfloor{
dir = 4
},
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/machinery/light/directional/east,
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_asteroid_56x20.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
},
/area/hangar)
"kx" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8;
pixel_x = 7
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_asteroid_56x40.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@
},
/area/hangar)
"Ed" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8;
pixel_x = 7
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/nanotrasen_asteroid.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5585,7 +5585,7 @@
/turf/open/floor/concrete/reinforced,
/area/outpost/maintenance/aft)
"tW" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/techfloor{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_beluga.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4742,7 +4742,7 @@
/area/ship/crew)
"UO" = (
/obj/effect/turf_decal/industrial/traffic/corner,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/machinery/light/directional/south,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_box.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,7 +1802,7 @@
/obj/effect/turf_decal/corner/opaque/blue{
dir = 4
},
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/machinery/firealarm/directional/south,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_bubble.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@
},
/obj/item/circuitboard/computer/selling_pad_control,
/obj/item/circuitboard/machine/selling_pad,
/obj/item/circuitboard/computer/cargo/express,
/obj/item/circuitboard/computer/cargo,
/obj/structure/closet/crate/engineering,
/turf/open/floor/plasteel,
/area/ship/cargo)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_dwayne.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1974,7 +1974,7 @@
/obj/effect/turf_decal/corner/opaque/blue/half{
dir = 4
},
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 8
},
/turf/open/floor/plasteel/dark,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_junker.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2277,7 +2277,7 @@
},
/obj/effect/decal/cleanable/glass,
/obj/structure/safe/floor,
/obj/item/circuitboard/computer/cargo/express,
/obj/item/circuitboard/computer/cargo,
/turf/open/floor/pod/dark,
/area/ship/crew/office)
"Rj" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_kilo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,7 +1252,7 @@
/area/ship/crew)
"sW" = (
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/machinery/airalarm/directional/east,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_lagoon.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
/turf/open/floor/plasteel,
/area/ship/external)
"bt" = (
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 4
},
/turf/open/floor/plasteel/patterned/cargo_one,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_mudskipper.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@
/obj/structure/sign/warning/incident{
pixel_x = -32
},
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 4
},
/turf/open/floor/plasteel/tech/grid,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_rigger.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2231,7 +2231,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/obj/item/radio/intercom/directional/north,
/turf/open/floor/carpet/blue,
/area/ship/bridge)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_schmiedeberg.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -756,7 +756,7 @@
/turf/open/floor/wood/walnut,
/area/ship/crew/canteen)
"ka" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/item/radio/intercom/directional/south,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_shetland.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5480,7 +5480,7 @@
/obj/effect/turf_decal/corner/opaque/neutral/three_quarters{
dir = 1
},
/obj/machinery/computer/cargo/express/retro,
/obj/machinery/computer/cargo/retro,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"VD" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_sunskipper.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2047,7 +2047,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"AP" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
icon_state = "computer-right";
dir = 8
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_colossus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@
/area/ship/hallway/fore)
"iX" = (
/obj/item/radio/intercom/wideband/directional/south,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/effect/turf_decal/borderfloor,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_hound.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1580,7 +1580,7 @@
dir = 1
},
/obj/effect/turf_decal/steeldecal/steel_decals_central4,
/obj/machinery/computer/cargo/express,
/obj/machinery/computer/cargo,
/obj/item/radio/intercom/wideband/directional/north{
pixel_y = 25;
pixel_x = 6
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_talos.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2330,7 +2330,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/security/armory)
"os" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/brown{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_valor.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3940,7 +3940,7 @@
/turf/open/floor/plasteel/patterned,
/area/ship/cargo)
"Ko" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/effect/turf_decal/corner/opaque/brown{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_vaquero.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2897,7 +2897,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"TK" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/yellow,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_delta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2530,7 +2530,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Lv" = (
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/nsorange,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4290,7 +4290,7 @@
/turf/open/floor/plasteel/grimy,
/area/ship/crew)
"RK" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 4
},
/obj/item/radio/intercom/directional/west,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10099,7 +10099,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"LS" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/structure/railing{
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/nanotrasen/nanotrasen_meta.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"dg" = (
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/blue/three_quarters{
Expand Down Expand Up @@ -2647,7 +2647,7 @@
/area/ship/cargo)
"Du" = (
/obj/effect/turf_decal/corner/transparent/neutral/full,
/obj/machinery/computer/cargo/express/retro{
/obj/machinery/computer/cargo/retro{
dir = 8
},
/obj/effect/decal/cleanable/dirt/dust,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_mimir.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4024,7 +4024,7 @@
/turf/open/floor/plasteel,
/area/ship/security/prison)
"xT" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/turf/open/floor/plasteel/telecomms_floor,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
/obj/structure/disposalpipe/segment{
dir = 8
},
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/brown{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@
/turf/open/floor/plasteel/white,
/area/ship/hallway/port)
"eE" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/turf/open/floor/plasteel/tech,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4235,7 +4235,7 @@
"JA" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/turf/open/floor/plasteel/dark,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/pgf/pgf_crying_sun.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/hallway/port)
"dK" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/structure/catwalk/over/plated_catwalk/dark,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/roumain/srm_elder.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3609,7 +3609,7 @@
/turf/open/floor/wood/maple,
/area/ship/crew/cryo)
"Sg" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/effect/turf_decal/spline/fancy/wood{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/solgov/solgov_chronicle.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
/turf/open/floor/wood,
/area/ship/crew)
"da" = (
/obj/machinery/computer/cargo/express/solgov{
/obj/machinery/computer/cargo/solgov{
dir = 4
},
/obj/item/radio/intercom/directional/west,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/solgov/solgov_inkwell.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2139,7 +2139,7 @@
/turf/open/floor/plasteel/mono,
/area/ship/cargo)
"nO" = (
/obj/machinery/computer/cargo/express/solgov,
/obj/machinery/computer/cargo/solgov,
/turf/open/floor/wood/maple,
/area/ship/bridge)
"nR" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/solgov/solgov_paracelsus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2725,7 +2725,7 @@
/obj/structure/railing/wood{
dir = 8
},
/obj/machinery/computer/cargo/express/solgov{
/obj/machinery/computer/cargo/solgov{
dir = 4
},
/obj/effect/turf_decal/siding/wood{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@
/turf/open/floor/plasteel/stairs,
/area/ship/cargo)
"fk" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/obj/machinery/button/door{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -952,7 +952,7 @@
"pI" = (
/obj/item/radio/intercom/wideband/directional/east,
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 1
},
/obj/effect/turf_decal/borderfloorblack,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3507,7 +3507,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ship/hallway/central)
"HI" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
layer = 3
},
/obj/effect/turf_decal/techfloor{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_litieguai.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2608,7 +2608,7 @@
/turf/open/floor/plasteel/white,
/area/ship/hallway/central)
"TA" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/turf/open/floor/plasteel/dark,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_panacea.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@
/turf/open/floor/suns/dark/plain,
/area/ship/crew/office/lobby)
"fG" = (
/obj/machinery/computer/cargo/express{
/obj/machinery/computer/cargo{
dir = 8
},
/turf/open/floor/suns/dark,
Expand Down
Loading
Loading