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

Commit aa3c3f7

Browse files
SapphicOverloadSapphicOverload
committed
Merge remote-tracking branch 'upstream/master' into skill-issue
2 parents ad8b347 + 20e61de commit aa3c3f7

File tree

49 files changed

+178827
-154
lines changed

Some content is hidden

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

49 files changed

+178827
-154
lines changed

‎_maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -531,16 +531,6 @@
531531
/obj/structure/lattice/catwalk,
532532
/turf/open/space/basic,
533533
/area/space/nearstation)
534-
"jT" = (
535-
/obj/structure/ethernet_cable{
536-
icon_state = "0-2"
537-
},
538-
/obj/machinery/ai/networking{
539-
label = "Computer Science - 2";
540-
roundstart_connection = "Subcontroller"
541-
},
542-
/turf/open/floor/circuit/green/telecomms,
543-
/area/ai_monitored/turret_protected/ai)
544534
"jY" = (
545535
/obj/machinery/telecomms/broadcaster/preset_right,
546536
/turf/open/floor/circuit/green/telecomms/mainframe,
@@ -970,6 +960,16 @@
970960
},
971961
/turf/open/floor/plasteel/dark/telecomms,
972962
/area/ai_monitored/turret_protected/ai)
963+
"qx" = (
964+
/obj/structure/ethernet_cable{
965+
icon_state = "0-2"
966+
},
967+
/obj/machinery/ai/networking{
968+
label = "Main Core";
969+
roundstart_connection = "Computer Science"
970+
},
971+
/turf/open/floor/circuit/green/telecomms,
972+
/area/ai_monitored/turret_protected/ai)
973973
"rm" = (
974974
/obj/machinery/power/terminal{
975975
dir = 8
@@ -4738,7 +4738,7 @@ jR
47384738
PH
47394739
kY
47404740
PH
4741-
jT
4741+
qx
47424742
AS
47434743
uV
47444744
zW

‎_maps/_basemap.dm‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "map_files\YogStation\Yogstation.dmm"
1010
#include "map_files\IceMeta\IceMeta.dmm"
1111
#include "map_files\GaxStation\GaxStation.dmm"
12+
#include "map_files\MiniStation\MiniStation.dmm"
1213
#include "map_files\ManateeStation\ManateeStation.dmm"
1314
#include "map_files\DonutStation\DonutStation.dmm"
1415
#ifdef TRAVISBUILDING

‎_maps/gaxstation.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,14 @@
88
"ferry": "ferry_fancy",
99
"emergency": "emergency_box"
1010
},
11-
"cryo_spawn": true
11+
"cryo_spawn": true,
12+
"job_changes": {
13+
"Captain": {
14+
"special_charter": "ship"
15+
},
16+
"Psychiatrist": {
17+
"spawn_positions": 0,
18+
"total_positions": 0
19+
}
20+
}
1221
}

‎_maps/icemeta.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,10 @@
4545
"No Parallax": true
4646
}
4747
],
48-
"minetype": "none"
48+
"minetype": "none",
49+
"job_changes": {
50+
"Captain": {
51+
"special_charter": "moon"
52+
}
53+
}
4954
}

‎_maps/manateestation.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,10 @@
77
"ferry": "ferry_fancy",
88
"whiteship": "whiteship_box",
99
"emergency": "emergency_box"
10+
},
11+
"job_changes": {
12+
"Captain": {
13+
"special_charter": "asteroid"
14+
}
1015
}
1116
}

‎_maps/map_files/GaxStation/GaxStation.dmm‎

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -37498,17 +37498,6 @@
3749837498
},
3749937499
/turf/open/space/basic,
3750037500
/area/space/nearstation)
37501-
"seS" = (
37502-
/obj/docking_port/stationary{
37503-
dwidth = 2;
37504-
height = 5;
37505-
name = "fore bay 1";
37506-
roundstart_template = /datum/map_template/shuttle/labour/gax;
37507-
shuttle_id = "laborcamp_home";
37508-
width = 9
37509-
},
37510-
/turf/open/space/basic,
37511-
/area/space)
3751237501
"sfo" = (
3751337502
/obj/effect/turf_decal/stripes/line{
3751437503
dir = 4
@@ -72710,12 +72699,12 @@ vRP
7271072699
vRP
7271172700
vRP
7271272701
ubS
72713-
tkl
72714-
tkl
72715-
tkl
72716-
tkl
72717-
tkl
72718-
tkl
72702+
vRP
72703+
vRP
72704+
vRP
72705+
vRP
72706+
vRP
72707+
vRP
7271972708
dll
7272072709
dll
7272172710
dll
@@ -72967,7 +72956,7 @@ vRP
7296772956
vRP
7296872957
vRP
7296972958
aCD
72970-
tkl
72959+
vRP
7297172960
vRP
7297272961
vRP
7297372962
vRP
@@ -73224,7 +73213,7 @@ vRP
7322473213
vRP
7322573214
vRP
7322673215
ubS
73227-
tkl
73216+
vRP
7322873217
vRP
7322973218
vRP
7323073219
vRP
@@ -73481,12 +73470,12 @@ vRP
7348173470
vRP
7348273471
vRP
7348373472
aCD
73484-
tkl
7348573473
vRP
7348673474
vRP
7348773475
vRP
7348873476
vRP
73489-
seS
73477+
vRP
73478+
vRP
7349073479
eAe
7349173480
lUn
7349273481
bOF
@@ -73738,7 +73727,7 @@ vRP
7373873727
vRP
7373973728
vRP
7374073729
ubS
73741-
tkl
73730+
vRP
7374273731
vRP
7374373732
vRP
7374473733
vRP
@@ -73995,7 +73984,7 @@ vRP
7399573984
vRP
7399673985
vRP
7399773986
ubS
73998-
tkl
73987+
vRP
7399973988
vRP
7400073989
vRP
7400173990
vRP
@@ -74252,7 +74241,7 @@ vRP
7425274241
vRP
7425374242
vRP
7425474243
aCD
74255-
tkl
74244+
vRP
7425674245
vRP
7425774246
vRP
7425874247
vRP
@@ -74509,7 +74498,7 @@ vRP
7450974498
vRP
7451074499
vRP
7451174500
aCD
74512-
tkl
74501+
vRP
7451374502
vRP
7451474503
vRP
7451574504
vRP
@@ -74766,7 +74755,7 @@ vRP
7476674755
vRP
7476774756
vRP
7476874757
aCD
74769-
tkl
74758+
vRP
7477074759
vRP
7477174760
vRP
7477274761
vRP
@@ -75023,7 +75012,7 @@ vRP
7502375012
vRP
7502475013
vRP
7502575014
ubS
75026-
tkl
75015+
vRP
7502775016
vRP
7502875017
vRP
7502975018
vRP
@@ -75280,12 +75269,12 @@ vRP
7528075269
vRP
7528175270
vRP
7528275271
ubS
75283-
tkl
75284-
tkl
75285-
tkl
75286-
tkl
75287-
tkl
75288-
tkl
75272+
vRP
75273+
vRP
75274+
vRP
75275+
vRP
75276+
vRP
75277+
vRP
7528975278
tkl
7529075279
aCD
7529175280
lMu

0 commit comments

Comments
 (0)