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

Commit c94fb2c

Browse files
cowbot92cowbot92
committed
Merge remote-tracking branch 'upstream/master' into PortsPsionics
2 parents 4f74212 + 0cd1e57 commit c94fb2c

File tree

539 files changed

+193332
-18099
lines changed

Some content is hidden

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

539 files changed

+193332
-18099
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
}

0 commit comments

Comments
 (0)