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.

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

[MDB IGNORE] [PRE-ALPHA] MiniStation #22568

Merged
merged 167 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
9e149e5
Create MiniStation new.dmm
ToasterBiome Jan 9, 2024
b5bcc52
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Feb 18, 2024
2c8b5fe
ministation
ToasterBiome Feb 18, 2024
ebf448c
Update MiniStation.dmm
ToasterBiome Mar 11, 2024
52097c5
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Apr 23, 2024
3dad975
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome May 25, 2024
682e1bc
Update MiniStation.dmm
ToasterBiome Jun 8, 2024
85ad62b
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Aug 5, 2024
99f9288
Update MiniStation.dmm
ToasterBiome Aug 5, 2024
6246955
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Aug 8, 2024
ffdaf97
ministayion
ToasterBiome Aug 8, 2024
9d66fbe
Update MiniStation.dmm
ToasterBiome Aug 9, 2024
9275d3e
Update MiniStation.dmm
ToasterBiome Aug 9, 2024
895d8a0
Update MiniStation.dmm
ToasterBiome Aug 10, 2024
c013bf8
actual changes oops
ToasterBiome Aug 10, 2024
8bb3778
Update MiniStation.dmm
ToasterBiome Aug 11, 2024
e0008c3
Update MiniStation.dmm
ToasterBiome Aug 16, 2024
55e6417
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Aug 30, 2024
84f9ace
miniaturestation
ToasterBiome Aug 30, 2024
ad9c587
Update maps.txt
ToasterBiome Aug 30, 2024
21bed31
more fixes
ToasterBiome Aug 30, 2024
5e44905
fixes broken path
ToasterBiome Aug 30, 2024
775f829
more fixes
ToasterBiome Aug 30, 2024
b046baa
Update MiniStation.dmm
ToasterBiome Aug 30, 2024
7c81740
Update MiniStation.dmm
ToasterBiome Aug 30, 2024
4bebeb3
filters
ToasterBiome Aug 31, 2024
d5e70a9
robotics changes
ToasterBiome Aug 31, 2024
2193bf4
fixes pipes
ToasterBiome Sep 2, 2024
f57429e
Update MiniStation.dmm
ToasterBiome Sep 2, 2024
d2a248f
Update MiniStation.dmm
ToasterBiome Sep 2, 2024
1326655
Update MiniStation.dmm
ToasterBiome Sep 2, 2024
a048e1c
spawns + job overrides
ToasterBiome Sep 2, 2024
4b95d26
Update MiniStation.dmm
ToasterBiome Sep 2, 2024
ac8e044
Update MiniStation.dmm
ToasterBiome Sep 2, 2024
c379002
Update MiniStation.dmm
ToasterBiome Sep 2, 2024
38c28b2
Update MiniStation.dmm
ToasterBiome Sep 2, 2024
81327a5
more work
ToasterBiome Sep 3, 2024
1db5492
Update MiniStation.dmm
ToasterBiome Sep 3, 2024
eb27d8e
misc stuff
ToasterBiome Sep 3, 2024
a7e8d9b
maint stuff
ToasterBiome Sep 3, 2024
abd15d8
uopdates
ToasterBiome Sep 4, 2024
a893d53
fixes bad area and chair
ToasterBiome Sep 4, 2024
28399ec
tool storage + fixes
ToasterBiome Sep 4, 2024
e885963
mining APC
ToasterBiome Sep 4, 2024
081afb7
cargo + hooks up some disposals
ToasterBiome Sep 4, 2024
8fd267c
more disposals + launcher
ToasterBiome Sep 4, 2024
1b34e3c
lights
ToasterBiome Sep 4, 2024
3df9a61
more fixes
ToasterBiome Sep 4, 2024
57f009a
Update MiniStation.dmm
ToasterBiome Sep 4, 2024
e51a09c
Update MiniStation.dmm
ToasterBiome Sep 4, 2024
c0182fa
more fixes
ToasterBiome Sep 4, 2024
50a7c1a
sink
ToasterBiome Sep 4, 2024
4a9675d
remove sign
ToasterBiome Sep 4, 2024
ef2bb21
expand janitor room
ToasterBiome Sep 4, 2024
03975fc
Update MiniStation.dmm
ToasterBiome Sep 4, 2024
93cbb62
ai stuff + more firealarms
ToasterBiome Sep 5, 2024
449d648
meeting room, etc
ToasterBiome Sep 5, 2024
d767d29
fixes wire
ToasterBiome Sep 5, 2024
eefc3ad
Update MiniStation.dmm
ToasterBiome Sep 5, 2024
91c5b32
fixes
ToasterBiome Sep 6, 2024
20c0280
Update MiniStation.dmm
ToasterBiome Sep 6, 2024
0b02201
yep!
ToasterBiome Sep 6, 2024
01d9e29
atmos area
ToasterBiome Sep 6, 2024
ce354f8
fixes some map errors
ToasterBiome Sep 6, 2024
abf891b
bookbinder
ToasterBiome Sep 6, 2024
1c0c838
robo shutters
ToasterBiome Sep 6, 2024
cc7d74a
stair and chem fix
ToasterBiome Sep 6, 2024
5f61eec
fixes bad decals
ToasterBiome Sep 6, 2024
67dfb4b
honesly no clue what's different
ToasterBiome Sep 6, 2024
93ff61b
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Sep 6, 2024
8db283c
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Sep 6, 2024
8564462
disposals + pets
ToasterBiome Sep 6, 2024
a742fea
Update MiniStation.dmm
ToasterBiome Sep 6, 2024
7aa8943
asteroid area
ToasterBiome Sep 6, 2024
d16ffcd
more fixes
ToasterBiome Sep 6, 2024
99abcb5
medbay mixup
ToasterBiome Sep 7, 2024
c79c1d4
choom button
ToasterBiome Sep 7, 2024
b501023
wire toxin room to grid
ToasterBiome Sep 7, 2024
19cac69
remove this
ToasterBiome Sep 7, 2024
a16ca51
more fixes
ToasterBiome Sep 7, 2024
0291397
Update ai_whale.dmm
ToasterBiome Sep 7, 2024
42a472f
more cameras
ToasterBiome Sep 7, 2024
4b0e488
Update networking_machines.dm
ToasterBiome Sep 7, 2024
23097f6
update freezer
ToasterBiome Sep 7, 2024
fab60ef
Update MiniStation.dmm
ToasterBiome Sep 7, 2024
7e5e69c
Update MiniStation.dmm
ToasterBiome Sep 7, 2024
c823e56
Update MiniStation.dmm
ToasterBiome Sep 7, 2024
21f1b4f
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Sep 10, 2024
9956d2c
new service
ToasterBiome Sep 10, 2024
65eaebd
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Sep 10, 2024
8b5c7c0
hawk + tuah + backrooms
ToasterBiome Sep 10, 2024
98fc7a4
special charters
ToasterBiome Sep 10, 2024
33c68cb
remove that lol
ToasterBiome Sep 10, 2024
9d2e32d
move him a little
ToasterBiome Sep 10, 2024
68848d4
Update MiniStation.dmm
ToasterBiome Sep 11, 2024
b89f63f
yeah
ToasterBiome Sep 11, 2024
4615d12
Update MiniStation.dmm
ToasterBiome Sep 11, 2024
73110ce
psych office + more fixes + robo stuff
ToasterBiome Sep 11, 2024
e0038fc
thermomachines
ToasterBiome Sep 11, 2024
a367fa3
Update MiniStation.dmm
ToasterBiome Sep 11, 2024
79c4752
maints + APCs
ToasterBiome Sep 12, 2024
45a4e23
all this stuff
ToasterBiome Sep 12, 2024
88af172
cameras
ToasterBiome Sep 12, 2024
994bd26
air alarms
ToasterBiome Sep 12, 2024
adf9699
RD office and the like
ToasterBiome Sep 12, 2024
976ac79
Update MiniStation.dmm
ToasterBiome Sep 12, 2024
fb47b58
fixes these
ToasterBiome Sep 12, 2024
5549b0e
glass floors
ToasterBiome Sep 12, 2024
1d0615b
Update MiniStation.dmm
ToasterBiome Sep 13, 2024
84ee8df
more firelocks
ToasterBiome Sep 13, 2024
cd94a50
Update MiniStation.dmm
ToasterBiome Sep 13, 2024
87f6a70
Update MiniStation.dmm
ToasterBiome Sep 13, 2024
7fc9c9d
Update MiniStation.dmm
ToasterBiome Sep 13, 2024
fbc4ab6
Update MiniStation.dmm
ToasterBiome Sep 13, 2024
deaf19c
Update MiniStation.dmm
ToasterBiome Sep 13, 2024
af99055
extra pipe moment
ToasterBiome Sep 13, 2024
0655dab
Update MiniStation.dmm
ToasterBiome Sep 14, 2024
5a260a1
looking up and down/fixes
ToasterBiome Sep 14, 2024
d7427bd
neat
ToasterBiome Sep 14, 2024
622f199
wire
ToasterBiome Sep 14, 2024
756daee
Update MiniStation.dmm
ToasterBiome Sep 15, 2024
4890db1
fixes some issues
ToasterBiome Sep 17, 2024
5aeb8f4
asdad
ToasterBiome Sep 17, 2024
db20e89
better SM stuff
ToasterBiome Sep 17, 2024
f68d2cf
amon gus
ToasterBiome Sep 17, 2024
cbf839b
fixing falling
ToasterBiome Sep 17, 2024
ef3fe5b
Update MiniStation.dmm
ToasterBiome Sep 18, 2024
b2aef04
Update MiniStation.dmm
ToasterBiome Sep 18, 2024
7dca5f2
fixes this
ToasterBiome Sep 18, 2024
a939543
fixes
ToasterBiome Sep 19, 2024
e1e7601
Update MiniStation.dmm
ToasterBiome Sep 19, 2024
008718e
remove stairs
ToasterBiome Sep 19, 2024
45118df
Update MiniStation.dmm
ToasterBiome Sep 19, 2024
2c9c37b
Update MiniStation.dmm
ToasterBiome Sep 20, 2024
cd1cbd9
Update MiniStation.dmm
ToasterBiome Sep 20, 2024
d8205c3
fixes some ai stuff
ToasterBiome Sep 21, 2024
5baf267
Update MiniStation.dmm
ToasterBiome Sep 21, 2024
7c96c04
adds some missing bells
ToasterBiome Sep 25, 2024
09a7be5
maint
ToasterBiome Sep 26, 2024
96e93c2
more maint stuff
ToasterBiome Sep 28, 2024
07b9bf2
ai upload and goodbye meeting room
ToasterBiome Sep 29, 2024
d9446ea
fixes multiz pda stuff
ToasterBiome Sep 29, 2024
365fcfa
fixes locker
ToasterBiome Sep 30, 2024
6ba08d2
ministation fixes
ToasterBiome Sep 30, 2024
09d859b
requested changes
ToasterBiome Sep 30, 2024
a268892
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Oct 2, 2024
adaee40
shadows
ToasterBiome Oct 3, 2024
b32f204
removes shadows
ToasterBiome Oct 3, 2024
b7a0bcd
adds medhuds
ToasterBiome Oct 3, 2024
0938a5f
no smoking
ToasterBiome Oct 3, 2024
18eb2c7
move up/down
ToasterBiome Oct 4, 2024
a087d90
correct medhuds
ToasterBiome Oct 5, 2024
c5b20bb
brig stuff
ToasterBiome Oct 6, 2024
fc8e880
cameras
ToasterBiome Oct 6, 2024
b79b8c3
fixes
ToasterBiome Oct 9, 2024
f132614
more lights
ToasterBiome Oct 9, 2024
e742a02
more fixes
ToasterBiome Oct 9, 2024
068283d
fix one turf
ToasterBiome Oct 9, 2024
2c966e5
idk randomstuff
ToasterBiome Oct 9, 2024
72599f3
more lights
ToasterBiome Oct 9, 2024
d3cc51c
navigation nation (thanks plant)
ToasterBiome Oct 9, 2024
ce2a809
fixes + better flooring
ToasterBiome Oct 10, 2024
a5f9c5f
jamie changes
ToasterBiome Oct 14, 2024
50712a8
myriad changes
ToasterBiome Oct 14, 2024
7b86c32
Merge remote-tracking branch 'upstream/master' into ministation2
ToasterBiome Oct 15, 2024
5cdd81b
some more stuff
ToasterBiome Oct 17, 2024
9eaf1cc
server room fix
ToasterBiome Oct 17, 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
22 changes: 11 additions & 11 deletions _maps/RandomRuins/StationRuins/GaxStation/ai_whale.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -531,16 +531,6 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/space/nearstation)
"jT" = (
/obj/structure/ethernet_cable{
icon_state = "0-2"
},
/obj/machinery/ai/networking{
label = "Computer Science - 2";
roundstart_connection = "Subcontroller"
},
/turf/open/floor/circuit/green/telecomms,
/area/ai_monitored/turret_protected/ai)
"jY" = (
/obj/machinery/telecomms/broadcaster/preset_right,
/turf/open/floor/circuit/green/telecomms/mainframe,
Expand Down Expand Up @@ -970,6 +960,16 @@
},
/turf/open/floor/plasteel/dark/telecomms,
/area/ai_monitored/turret_protected/ai)
"qx" = (
/obj/structure/ethernet_cable{
icon_state = "0-2"
},
/obj/machinery/ai/networking{
label = "Main Core";
roundstart_connection = "Computer Science"
},
/turf/open/floor/circuit/green/telecomms,
/area/ai_monitored/turret_protected/ai)
"rm" = (
/obj/machinery/power/terminal{
dir = 8
Expand Down Expand Up @@ -4738,7 +4738,7 @@ jR
PH
kY
PH
jT
qx
AS
uV
zW
Expand Down
1 change: 1 addition & 0 deletions _maps/_basemap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "map_files\YogStation\Yogstation.dmm"
#include "map_files\IceMeta\IceMeta.dmm"
#include "map_files\GaxStation\GaxStation.dmm"
#include "map_files\MiniStation\MiniStation.dmm"
#include "map_files\ManateeStation\ManateeStation.dmm"
#include "map_files\DonutStation\DonutStation.dmm"
#ifdef TRAVISBUILDING
Expand Down
11 changes: 10 additions & 1 deletion _maps/gaxstation.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,14 @@
"ferry": "ferry_fancy",
"emergency": "emergency_box"
},
"cryo_spawn": true
"cryo_spawn": true,
"job_changes": {
"Captain": {
"special_charter": "ship"
},
"Psychiatrist": {
"spawn_positions": 0,
"total_positions": 0
}
}
}
7 changes: 6 additions & 1 deletion _maps/icemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,10 @@
"No Parallax": true
}
],
"minetype": "none"
"minetype": "none",
"job_changes": {
"Captain": {
"special_charter": "moon"
}
}
}
5 changes: 5 additions & 0 deletions _maps/manateestation.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,10 @@
"ferry": "ferry_fancy",
"whiteship": "whiteship_box",
"emergency": "emergency_box"
},
"job_changes": {
"Captain": {
"special_charter": "asteroid"
}
}
}
55 changes: 22 additions & 33 deletions _maps/map_files/GaxStation/GaxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -37493,17 +37493,6 @@
},
/turf/open/space/basic,
/area/space/nearstation)
"seS" = (
/obj/docking_port/stationary{
dwidth = 2;
height = 5;
name = "fore bay 1";
roundstart_template = /datum/map_template/shuttle/labour/gax;
shuttle_id = "laborcamp_home";
width = 9
},
/turf/open/space/basic,
/area/space)
"sfo" = (
/obj/effect/turf_decal/stripes/line{
dir = 4
Expand Down Expand Up @@ -72713,12 +72702,12 @@ vRP
vRP
vRP
ubS
tkl
tkl
tkl
tkl
tkl
tkl
vRP
vRP
vRP
vRP
vRP
vRP
dll
dll
dll
Expand Down Expand Up @@ -72970,7 +72959,7 @@ vRP
vRP
vRP
aCD
tkl
vRP
vRP
vRP
vRP
Expand Down Expand Up @@ -73227,7 +73216,7 @@ vRP
vRP
vRP
ubS
tkl
vRP
vRP
vRP
vRP
Expand Down Expand Up @@ -73484,12 +73473,12 @@ vRP
vRP
vRP
aCD
tkl
vRP
vRP
vRP
vRP
seS
vRP
vRP
eAe
lUn
bOF
Expand Down Expand Up @@ -73741,7 +73730,7 @@ vRP
vRP
vRP
ubS
tkl
vRP
vRP
vRP
vRP
Expand Down Expand Up @@ -73998,7 +73987,7 @@ vRP
vRP
vRP
ubS
tkl
vRP
vRP
vRP
vRP
Expand Down Expand Up @@ -74255,7 +74244,7 @@ vRP
vRP
vRP
aCD
tkl
vRP
vRP
vRP
vRP
Expand Down Expand Up @@ -74512,7 +74501,7 @@ vRP
vRP
vRP
aCD
tkl
vRP
vRP
vRP
vRP
Expand Down Expand Up @@ -74769,7 +74758,7 @@ vRP
vRP
vRP
aCD
tkl
vRP
vRP
vRP
vRP
Expand Down Expand Up @@ -75026,7 +75015,7 @@ vRP
vRP
vRP
ubS
tkl
vRP
vRP
vRP
vRP
Expand Down Expand Up @@ -75283,12 +75272,12 @@ vRP
vRP
vRP
ubS
tkl
tkl
tkl
tkl
tkl
tkl
vRP
vRP
vRP
vRP
vRP
vRP
tkl
aCD
lMu
Expand Down
Loading
Loading