Commit Graph

1466 Commits

Author SHA1 Message Date
Lin
be3260f7a6 Merge pull request #14870 from bunny232/metaxenodoor
Metastation xenobiology pen door
2021-06-21 10:12:51 -07:00
silicons
0cfe2ec4ca Merge pull request #14863 from miniusAreas/fdmm-patch-28485128-miniusAreas
Various Fixes (freelance)
2021-06-19 07:04:48 -07:00
bunny232
e7f4213082 Update MetaStation.dmm 2021-06-18 05:29:17 -04:00
EmeraldSundisk
d823c5b168 Update Snaxi.dmm 2021-06-16 21:58:32 -07:00
miniusAreas
cf0d7f704a AAAAAAAAAAA 2021-06-16 22:20:52 -04:00
miniusAreas
04b67e3584 metapubbydelta 2021-06-16 22:14:57 -04:00
EmeraldSundisk
4fec75fe87 initialfix 2021-06-14 08:48:14 -07:00
silicons
ddf885f42e Merge pull request #14818 from EmeraldSundisk/snaxiforrealthistime
HEY HEY! COME ON OVER, HAVE SOME FUN WITH SNOW TAXI!!!
2021-06-13 15:19:46 -07:00
EmeraldSundisk
686798b789 stronk 2021-06-12 21:21:43 -07:00
TripleShades
01a61b551c Update DeltaStation2.dmm 2021-06-12 01:08:22 -04:00
EmeraldSundisk
7980ee2c37 strongdmm 2021-06-10 21:54:00 -07:00
EmeraldSundisk
ebb4ab1f07 to finish 2021-06-09 21:21:24 -07:00
TripleShades
42b8120f74 Update DeltaStation2.dmm 2021-06-09 15:47:33 -04:00
TripleShades
0ca6e983c9 changies
delda changies good
2021-06-09 15:32:48 -04:00
Lin
697fffd347 Merge pull request #14792 from bunny232/meta-pool
More reasonable SUCC for the meta pool drain.
2021-06-05 16:27:12 -05:00
MrJWhit
d3f6b69a86 Update BoxStation.dmm 2021-06-04 13:26:06 -04:00
bunny232
e4c01b3f74 Woopsie, right vars are set now 2021-06-03 18:49:43 -04:00
bunny232
4b5b6a9063 Update MetaStation.dmm 2021-06-03 18:38:59 -04:00
coderbus13
2cfbee96ea Delete temp 2021-06-03 01:09:41 -05:00
coderbus13
9df9828666 Add files via upload 2021-06-03 01:08:36 -05:00
coderbus13
8ca433fadb Create temp 2021-06-03 01:08:20 -05:00
coderbus13
8dff4fa301 Delete _maps/map_files/PubbyStation directory
all my homies hate webedit
2021-06-03 01:06:35 -05:00
Lin
24f7576b92 Merge pull request #14785 from MrJWhit/metastation-fix
Metastation atmos fix
2021-06-02 20:23:06 -05:00
Lin
0ead4e0bbb Merge pull request #14784 from TripleShades/sigh-pubby
Tiny Pubby Additions
2021-06-02 19:44:55 -05:00
Lin
5876399d14 Merge pull request #14723 from bunny232/delta-ce-office-update
Delta ce office rearrangement
2021-06-02 19:41:45 -05:00
Lin
0fdfda7dc4 Merge pull request #14764 from MrJWhit/boxstation-touchups
Touching up boxstation engineering
2021-06-02 19:40:59 -05:00
MrJWhit
160882fb6c Update MetaStation.dmm 2021-06-01 21:48:22 -04:00
TripleShades
e08c10e5fb fucking pubby
this should be everything
2021-06-01 17:00:16 -04:00
bunny232
f70d6b9ea5 dir = 1 and adds a forgotten fire alarm. 2021-05-31 01:52:43 -04:00
bunny232
ff379e41b6 Think map preview think! 2021-05-31 01:47:49 -04:00
MrJWhit
0f0ad31aab Update BoxStation.dmm 2021-05-27 17:58:21 -04:00
bunny232
11a6cfd99c Delta station ce office, now with less microwave slaughter. 2021-05-27 03:27:10 -04:00
MrJWhit
7b152f2046 Update PubbyStation.dmm 2021-05-25 19:01:38 -04:00
MrJWhit
7262f3845f Update PubbyStation.dmm 2021-05-25 18:41:30 -04:00
bunny232
a1cdc7d5a7 Update MetaStation.dmm 2021-05-22 19:37:41 -04:00
bunny232
a2cd960e20 Update MetaStation.dmm 2021-05-15 00:34:54 -04:00
bunny232
3ae3caa14a Update DeltaStation2.dmm 2021-05-14 18:05:24 -04:00
bunny232
94bd7308ae Update DeltaStation2.dmm 2021-05-14 17:38:55 -04:00
bunny232
97685de715 Update MetaStation.dmm 2021-05-14 14:54:37 -04:00
bunny232
7dfe4771c8 Update DeltaStation2.dmm 2021-05-10 13:11:26 -04:00
bunny232
94db1c3d46 Update DeltaStation2.dmm 2021-05-07 08:31:49 -04:00
bunny232
3b12566a76 Create MetaStation.dmm 2021-05-02 23:03:25 -04:00
bunny232
869f5e940a Delete MetaStation.dmm 2021-05-02 23:02:50 -04:00
TripleShades
0c85455227 god i hate areas 2021-04-29 15:09:33 -04:00
TripleShades
ee3b69989b Update PubbyStation.dmm 2021-04-29 14:20:11 -04:00
TripleShades
e0eca566a9 Update PubbyStation.dmm 2021-04-29 14:04:04 -04:00
silicons
2e8d9f2ab7 Merge pull request #14584 from zeroisthebiggay/n
deletes box ghost burger
2021-04-18 18:47:41 -06:00
BlueWildrose
72c377d72c Fixes pods not returning to Centcomm (#14609) 2021-04-14 15:10:04 +02:00
zerothebigboy
3d5878dd26 i 2021-04-07 03:41:36 -04:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00