Commit Graph

1426 Commits

Author SHA1 Message Date
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
LetterN
123dfd8eda map men map men map map map men men men 2021-03-24 21:31:06 +08:00
silicons
a1c4323653 Merge pull request #14457 from GrayRachnid/holopads
Fixes the bug that allows anybody(other than heads) to auto-call holopads and adds secure holopads.
2021-03-20 14:28:07 -06:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
silicons
013560c064 Merge pull request #14400 from LetterN/art-art-art
Map addition & cleanups
2021-03-20 01:08:47 -06:00
GrayRachnid
b4969c4770 Fixes auto-calling for non-heads and adds secure holopads 2021-03-17 12:40:25 -04:00
DeltaFire
79a464ca8c Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00
LetterN
27d9238f3a mapfix 2021-03-15 21:59:06 +08:00
LetterN
a478555dbd mapfix 2021-03-15 21:02:50 +08:00
silicons
2a6ccada97 Merge pull request #14402 from Hatterhat/limbgrowers
limb growers for pubby and delta
2021-03-12 19:35:56 -07:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
Hatterhat
946096fd1d qm console announce 2021-03-10 22:35:33 -06:00
Hatterhat
2d157c51fa ok liberal 2021-03-10 09:09:50 -06:00
Letter N
69a054826b add art areas on meta, and adds lapvend on box,delta,meta.
Other map changes are cosmetic.
2021-03-10 16:34:37 +08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Dan-Neposh
2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
DeltaFire
6bcee44179 Merge pull request #14221 from MrJWhit/delta-station-fix
Random delta station fix
2021-02-11 04:33:30 +01:00
MrJWhit
dba9fd7134 Update DeltaStation2.dmm 2021-02-10 00:04:44 -05:00
MrJWhit
94b507dbf3 Update BoxStation.dmm 2021-02-09 16:31:58 -05:00
MrJWhit
c7f6c037f5 Boxstation disposals update 2021-02-06 16:31:30 -05:00
MrJWhit
ce675498f4 Gee kevin, why does atmos get /two/ air alarms? 2021-01-28 14:22:01 -05:00
silicons
34cb148232 Merge pull request #14067 from TripleShades/box-chapel
Box Chapel Redecoration [updated]
2021-01-27 19:11:20 -07:00
TripleShades
b13c2de218 fuck 2021-01-25 11:48:13 -08:00
TripleShades
3ae6d63290 i can always change it back right 2021-01-25 11:24:40 -08:00
MrJWhit
661a5e6580 WHOOPS DIDN'T MEAN TO DELETE THAT 2021-01-23 03:53:36 -05:00
MrJWhit
d8f76a023b Tada 2021-01-23 03:44:55 -05:00
Dan-Neposh
c38e5ca446 puts the eminence spire back in Reebe until the eminence vote changes 2021-01-21 23:46:21 -05:00
silicons
30755bfeb9 Merge pull request #14078 from MrJWhit/metastation-toxins-fix-2-electric-bogaloo
Gives metastation toxins storage a scrubber 'n vent
2021-01-20 15:21:55 -07:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
TripleShades
eb20501cc0 oops missed this light switch from earlier box surgery pr 2021-01-18 11:50:41 -08:00
MrJWhit
0c45aab261 Update MetaStation.dmm 2021-01-17 04:45:55 -05:00
MrJWhit
5f5c7667df Update MetaStation.dmm 2021-01-17 03:48:41 -05:00
TripleShades
1c9c0b7745 Update BoxStation.dmm 2021-01-15 17:42:36 -08:00
TripleShades
36e82c59d6 Update BoxStation.dmm 2021-01-15 17:30:10 -08:00
TripleShades
1f1605bbb6 Update BoxStation.dmm 2021-01-15 16:54:24 -08:00
MrJWhit
68f8258f82 Teehee oops 2021-01-15 09:52:39 -05:00
MrJWhit
02abd90e1f Update PubbyStation.dmm 2021-01-15 09:45:32 -05:00
Dan-Neposh
04d5721c4d Merge branch 'master' into clockcultrework_v2 2021-01-14 19:51:15 -05:00
Blue Wildrose
5436db5f3b Add a color mate to the ghost cafe as well, yeah 2021-01-12 13:55:42 -07:00
Blue Wildrose
32aa851062 somethings up with the HoS pet carp on Kilo, fixing that 2021-01-12 06:54:06 -07:00
Blue Wildrose
8111757e5b oops messed something up with kilo 2021-01-12 06:49:31 -07:00