Commit Graph

1605 Commits

Author SHA1 Message Date
Timothy Teakettle
818d7b2ebf initial wrestling arena 2020-03-28 23:13:24 +00:00
EmeraldSundisk
ac93fecf2c Add files via upload 2020-03-27 19:46:04 -07:00
Ghommie
5933563485 one line fix to a box mapping issue 2020-03-27 13:43:28 +01:00
EmeraldSundisk
a96857a401 Update CogStation.dmm 2020-03-26 08:54:08 -07:00
bunny232
4199792576 Boxstation secmos is no longer connected to the scrubber loop (#11630)
* Update BoxStation.dmm

* Update BoxStation.dmm
2020-03-26 15:45:30 +01:00
KathrinBailey
52138696d0 PROTO KINETIC dream CRUSHER
oh yeah give me all the shutters daddy
2020-03-26 13:08:37 +00:00
EmeraldSundisk
4f8e36ebd6 Update CogStation.dmm 2020-03-24 16:50:46 -07:00
EmeraldSundisk
a000220157 Update CogStation.dmm 2020-03-23 12:46:39 -07:00
kevinz000
ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627
More or less ports "Clothing /under repath"
2020-03-23 10:40:31 -07:00
EmeraldSundisk
9337536897 Update CogStation.dmm 2020-03-22 22:05:16 -07:00
keronshb
7776fff850 Lavaland change
Revert
2020-03-22 16:00:24 -04:00
keronshb
830f646383 Revert "Merge pull request #11225 from r4d6/Random-Mining"
This reverts commit ea5774e713.
2020-03-22 15:55:08 -04:00
EmeraldSundisk
0a539949a0 Update CogStation.dmm 2020-03-22 10:19:13 -07:00
Xantholne
80baf85300 Bumbles, the Humble Bumblebee finally finalized the contract to move into his new home in Hydroponics (#11543)
* Maps Bumbles in for once

* Hopefully fixes merge conflicts?
2020-03-22 13:13:40 +01:00
Detective-Google
043de9dcd2 Removes the roundstart syringe guns on each map, replacing them with medidart guns. (#11560)
* nukes roundstart syringe guns for roundstart dart guns.

* fixes the delta and meta maint syringes to have an identical change.

* brings lambda up to date with master.
2020-03-22 13:11:37 +01:00
Dap
f530f2f45c haha
bamda is updoot
2020-03-22 04:31:28 -06:00
EmeraldSundisk
624916ff18 Add files via upload 2020-03-21 20:09:34 -07:00
Dap
e320ad7830 Various Fixes to Lambdastation
haha imaigne having it right the first time when no one tested it with me
2020-03-21 19:12:07 -06:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
EmeraldSundisk
b384982a92 Update CogStation.dmm 2020-03-21 17:12:17 -07:00
kevinz000
82a4121807 Merge pull request #11512 from dapnee/Lambdastation
Fuck it, Lambda Station, here we go!
2020-03-20 22:46:45 -07:00
zeroisthebiggay
5d8f6163d5 fixes a box oopsies (#11532)
* apparently i forgot them

* and also map merge

* two more minor issues

* and also map merge
2020-03-21 01:48:01 +01:00
EmeraldSundisk
bc6b217565 minimapfix 2020-03-19 15:27:54 -07:00
Hatterhat
ab7fc2dc72 me and the boys stealing prs (#11517)
Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2020-03-19 13:38:31 +01:00
EmeraldSundisk
4f63b3dd09 Update CogStation.dmm 2020-03-18 16:59:38 -07:00
EmeraldSundisk
6855d2d9a4 Let's try this again. 2020-03-18 14:29:34 -07:00
EmeraldSundisk
fc1416d237 Create FOLDER.txt 2020-03-18 14:18:35 -07:00
nik707
9b71b1a9a2 Merge pull request #11511 from EmeraldSundisk/cogshuttles
Let's just start with the shuttles.
2020-03-18 14:37:27 -05:00
kevinz000
b113166c3e Merge pull request #11506 from zeroisthebiggay/kevinzdemandsthefix
Big Box Brig Boogaloo (kevinzs requests and stuffs)
2020-03-18 03:35:08 -07:00
Dap
f144e8fc37 Update lambda.dmm
fixes a couple issues
2020-03-17 21:07:20 -06:00
Dap
a21c630318 Fuck it, Lambda Station, here we go!
## About The Pull Request
Welcome to Lambdastation! After almost two years in developement, the map is complete. Starting as a community project on Oracle station in which different players worked in game to create the map, headed by AndrewMontagne who created code to save the project as it was being worked on. After work on cargo, escape, medical, and parts of engineering, the project ended and I asked for the file.

I continued working on the file for a few months before jumping to a newer tg branch, in which I had to recreate the map from scratch. After another move to continue working the map on Citadel code, I have finally finished the map!

I'd like to thank Sishen for converting this to tgm formatting, and the original team of players that worked to shape the map before I finished it.

## Why It's Good For The Game
New map, with a large maintenance system that allows additional rooms to be made, along with genpop! Good for mid to high population.

## Changelog
🆑
add: Lambdastation and it's accompanying files
/🆑
2020-03-17 15:11:22 -06:00
EmeraldSundisk
0df0910543 Add files via upload 2020-03-17 11:59:45 -07:00
EmeraldSundisk
4391afa295 Add files via upload 2020-03-17 11:50:50 -07:00
kevinz000
039c56f3a9 Merge pull request #11495 from BlackMajor/SpaceRuins
Ash walker camp tweak because Ghommie asked me to.
2020-03-17 09:29:05 -07:00
EmeraldSundisk
01d90f5cc8 shut 2020-03-17 08:37:24 -07:00
EmeraldSundisk
dfe73565a1 Revert "shut"
This reverts commit 7502cec756.
2020-03-17 08:33:53 -07:00
EmeraldSundisk
e3cbf88989 Revert "5"
This reverts commit 17877d0d75.
2020-03-17 08:33:32 -07:00
EmeraldSundisk
17877d0d75 5 2020-03-17 08:22:17 -07:00
EmeraldSundisk
7502cec756 shut 2020-03-17 08:19:45 -07:00
ZeroMan
4e6dd9eed0 and all comes tumbling 2020-03-16 15:06:29 -04:00
ZeroMan
2e866691e1 i hate my life 2020-03-16 15:05:35 -04:00
ZeroMan
29d1eaf81d and i wanna die 2020-03-16 14:36:20 -04:00
ZeroMan
cf3812d222 and i wanna die 2020-03-16 14:35:36 -04:00
bunny232
faa5a93510 Fixed missing pipe by box vault (#11488)
* Update BoxStation.dmm

* Update BoxStation.dmm
2020-03-16 16:23:11 +01:00
BlackMajor
97b8d0ba27 small ash walker camp tweak 2020-03-16 19:51:47 +13:00
ZeroMan
8da4521a91 and i hate lawyers 2020-03-15 16:16:49 -04:00
ZeroMan
6968e94b06 and maybe it works 2020-03-15 12:58:33 -04:00
ZeroMan
a1f4c0232e a i wanna die 2020-03-15 12:57:55 -04:00
ZeroMan
107a9fa2d2 and map merge exists 2020-03-15 11:29:49 -04:00
ZeroMan
82b63081f6 a couple more tweaks 2020-03-15 11:28:57 -04:00