1797 Commits
Author SHA1 Message Date
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
Putnam e580c504fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-05-21 18:52:16 -07: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 47489c21d6 Merge remote-tracking branch 'citadel/master' into auxtools-atmos 2021-04-27 00:59:45 -07:00
siliconsandGitHub 2e8d9f2ab7 Merge pull request #14584 from zeroisthebiggay/n
deletes box ghost burger
2021-04-18 18:47:41 -06:00
BlueWildroseandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
DeltaFireandGitHub 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
siliconsandGitHub 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
Putnam cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08:00
Putnam f07a9c13fb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-02 01:44:58 -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
DeltaFireandGitHub 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
Putnam 6faf6af961 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-29 16:31:01 -08:00
MrJWhit ce675498f4 Gee kevin, why does atmos get /two/ air alarms? 2021-01-28 14:22:01 -05:00
siliconsandGitHub 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