Commit Graph

1675 Commits

Author SHA1 Message Date
silicons
f5974ab531 Merge pull request #12713 from MrJWhit/popping-the-monastery-tunnel
Popping the north monastery tunnel on Pubby
2020-07-11 00:48:22 -07:00
silicons
e4612a7c32 Merge pull request #12726 from Detective-Google/lambda
lambda now has a center gateway and (should) works
2020-07-11 00:46:50 -07:00
Detective Google
1faa8915f8 gateway center 2020-07-09 23:28:45 -05:00
EmeraldSundisk
bf97828e5e Add files via upload 2020-07-09 21:06:27 -07:00
EmeraldSundisk
4f17e7ab1d Update CogStation.dmm 2020-07-09 18:34:29 -07:00
EmeraldSundisk
b22f73e27f Update CogStation.dmm 2020-07-09 18:17:42 -07:00
EmeraldSundisk
e0428e946e Update CogStation.dmm 2020-07-09 12:46:29 -07:00
silicons
af9348c443 Merge pull request #12708 from EmeraldSundisk/poolby
Adds a pool to PubbyStation.
2020-07-09 02:26:39 -07:00
MrJWhit
886b196863 Lost decal 2020-07-08 13:49:10 -04:00
MrJWhit
22505097ec plz final update 2020-07-08 13:44:08 -04:00
MrJWhit
bbc9b47eee Update PubbyStation.dmm 2020-07-08 13:41:45 -04:00
MrJWhit
27abb80953 Removing the ugly pubby monastery hallway 2020-07-08 13:34:31 -04:00
Lin
33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833
mowing down experimental cloner copypasta.
2020-07-07 13:23:25 -05:00
EmeraldSundisk
e0a0d0bed8 Add files via upload 2020-07-07 09:05:31 -07:00
EmeraldSundisk
96f48c8237 Update PubbyStation.dmm 2020-07-07 00:01:25 -07:00
EmeraldSundisk
672f86a318 Add files via upload 2020-07-05 09:39:53 -07:00
EmeraldSundisk
75b2a7dad5 Update CogStation.dmm 2020-07-05 09:18:26 -07:00
EmeraldSundisk
d9f269280b Update CogStation.dmm 2020-07-04 23:45:08 -07:00
EmeraldSundisk
45a14f16d4 Revert "?"
This reverts commit c6b5bac0d8.
2020-07-04 21:39:23 -07:00
EmeraldSundisk
c6b5bac0d8 ? 2020-07-04 21:33:29 -07:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
silicons
27f7224d4d Merge pull request #12407 from Trilbyspaceclone/lavaland-ruin-tweaks
Much better looking lava land ruins!
2020-07-01 16:11:06 -07:00
Ghom
8666f83848 Merge pull request #12620 from EmeraldSundisk/omegasec2
Gives Omega Station genpop.
2020-07-01 19:52:44 +02:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
silicons
e51bee9649 Merge pull request #12607 from Detective-Google/cog-2
cog fixes round 2
2020-06-27 14:54:31 -07:00
silicons
7115df73f7 Merge pull request #12591 from MrJWhit/snow-snaxi-update
Snow Snaxi update
2020-06-27 14:53:52 -07:00
EmeraldSundisk
2926f8dab1 Add files via upload 2020-06-26 16:40:01 -07:00
EmeraldSundisk
37f2242eec Update OmegaStation.dmm 2020-06-26 15:08:21 -07:00
Detective Google
57fca41e20 aeugh2 2020-06-25 15:22:11 -05:00
Detective Google
42ae6233db aeugh 2020-06-25 15:18:11 -05:00
Detective Google
5d99f68d8c stinky panda goes in the box 2020-06-25 14:57:41 -05:00
Detective Google
f33586a4b5 coggers 2020-06-25 14:41:03 -05:00
EmeraldSundisk
71576d79ee Update OmegaStation.dmm 2020-06-24 15:01:58 -07:00
MrJWhit
922abf5994 Just doing it myself 2020-06-24 01:30:30 -04:00
MrJWhit
5b91340e47 Update Snaxi.dmm 2020-06-24 01:18:12 -04:00
MrJWhit
ca93891014 AAAAAAAAAAAAAAAAAAAAAAAAAH 2020-06-23 23:39:15 -04:00
Ghommie
265acb6876 travis check. 2020-06-23 15:38:04 +02:00
Detective Google
5b0886a150 and that's all folks (for now) 2020-06-22 20:32:12 -05:00
Detective Google
a406927c95 euthanizes spacebattle, helps wildwest a little (it's still shit) 2020-06-22 20:31:14 -05:00
Detective Google
98756b3bc7 snowdin is wack 2020-06-22 20:24:19 -05:00
Detective Google
46805bc872 more progress 2020-06-22 20:11:18 -05:00
Detective Google
a8b6bb7957 step 2; de-looting the caves 2020-06-22 19:46:48 -05:00
Detective Google
dc81519380 whoops me forget to hit save first 2020-06-22 19:29:01 -05:00
Detective Google
d4dd1a162a loot-yeet #1; wizard academy 2020-06-22 19:28:47 -05:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
EmeraldSundisk
7f6e8f8670 Update OmegaStation.dmm 2020-06-21 00:30:30 -07:00
Detective Google
4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald 2020-06-20 14:00:14 -05:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
2020-06-17 20:10:04 -07:00
Detective Google
898480af84 fixes some missing icon statesa on moonoutpost and UO45 2020-06-17 19:48:28 -05:00
Detective Google
0e1db216c8 Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy) 2020-06-17 19:33:14 -05:00