cdb07797b2
Merge remote-tracking branch 'upstream/master' into Lambdastation
2020-03-21 19:09:50 -06:00
b113166c3e
Merge pull request #11506 from zeroisthebiggay/kevinzdemandsthefix
...
Big Box Brig Boogaloo (kevinzs requests and stuffs)
2020-03-18 03:35:08 -07:00
f144e8fc37
Update lambda.dmm
...
fixes a couple issues
2020-03-17 21:07:20 -06:00
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
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
4e6dd9eed0
and all comes tumbling
2020-03-16 15:06:29 -04:00
2e866691e1
i hate my life
2020-03-16 15:05:35 -04:00
29d1eaf81d
and i wanna die
2020-03-16 14:36:20 -04:00
cf3812d222
and i wanna die
2020-03-16 14:35:36 -04:00
faa5a93510
Fixed missing pipe by box vault ( #11488 )
...
* Update BoxStation.dmm
* Update BoxStation.dmm
2020-03-16 16:23:11 +01:00
97b8d0ba27
small ash walker camp tweak
2020-03-16 19:51:47 +13:00
8da4521a91
and i hate lawyers
2020-03-15 16:16:49 -04:00
6968e94b06
and maybe it works
2020-03-15 12:58:33 -04:00
a1f4c0232e
a i wanna die
2020-03-15 12:57:55 -04:00
107a9fa2d2
and map merge exists
2020-03-15 11:29:49 -04:00
82b63081f6
a couple more tweaks
2020-03-15 11:28:57 -04:00
edb63ed212
and torture my cocknballs
2020-03-15 01:50:40 -04:00
74076eb351
and maybe thisll work
2020-03-15 01:23:23 -04:00
99b189844e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr
...
# Conflicts:
# _maps/map_files/BoxStation/BoxStation.dmm
2020-03-15 01:11:19 -04:00
23e9ecf97c
Update BoxStation.dmm ( #11456 )
2020-03-15 04:05:04 +01:00
d81247e15e
and also map merge
2020-03-14 21:26:40 -04:00
ec93e194d2
oh yeah disposals exists
2020-03-14 21:25:57 -04:00
d5bd1c1f4c
and map merge exists
2020-03-14 20:51:11 -04:00
3f3def6715
i am gonna choom
2020-03-14 20:50:08 -04:00
e54011c7c3
day one updates simulator
2020-03-14 17:38:40 -04:00
6a0b7ecdeb
my ocd takes over
2020-03-14 17:29:17 -04:00
1c92ef27b4
quite the quirky momentumeus
2020-03-14 17:21:00 -04:00
ea5fac9197
breathing is fine too
2020-03-14 16:56:33 -04:00
8970cb433e
i really hate life
2020-03-14 16:39:59 -04:00
6b486a64f5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr
...
# Conflicts:
# _maps/map_files/BoxStation/BoxStation.dmm
2020-03-14 16:34:06 -04:00
b726f274a7
map merge exists too
2020-03-14 16:14:05 -04:00
98c66d2fc9
and the finishing touches
2020-03-14 16:13:24 -04:00
863d564d38
couple more bug fixes
2020-03-14 16:02:43 -04:00
0d7237b3ec
do them more workies
2020-03-14 15:29:02 -04:00
caaff519d6
and heres some more
2020-03-14 12:03:33 -04:00
f5ed38ebf9
ae it is time
2020-03-14 00:49:54 -04:00
9e61d9cfb7
Update KiloStation.dmm
...
asdf
2020-03-11 16:53:12 -04:00
7fe564e192
Update BoxStation.dmm
2020-03-11 06:56:17 -04:00
31599f669a
Update BoxStation.dmm
2020-03-08 07:28:00 -04:00
201a85464c
Merge pull request #11366 from zeroisthebiggay/nerfsthekiloshuttle
...
kilo shuttle less eyesorey
2020-03-08 01:40:22 +01:00
6422b15430
Merge pull request #11339 from MrJWhit/teg-fix-so-fract-doesn't-yell
...
TEG fix so fract doesn't yell at me
2020-03-07 11:38:59 +01:00
7de59975fc
Merge pull request #11358 from bunny232/master
...
Box bar lightswitch/pipe fixes now with mapmerge
2020-03-07 03:24:29 -07:00
96bd80ac54
map merge also exists
2020-03-06 15:52:33 -05:00
e4c871a8d3
eva is maybe dangerous
2020-03-06 15:52:12 -05:00
ef42a8c2f7
map merge also exists
2020-03-06 15:14:18 -05:00
bee1f7cfe5
its time to vibe
2020-03-06 15:13:23 -05:00
8f563797df
Update BoxStation.dmm
2020-03-06 09:28:37 -05:00
e13fef13fd
a
2020-03-06 09:00:59 -05:00
f24c7fb142
Merge pull request #11222 from Trilbyspaceclone/ashwalkers
...
Ashwalkers now can make a well, got their livestock back and more!
2020-03-06 13:48:03 +01:00
5b808c511f
better seeds
2020-03-06 07:09:16 -05:00
Dap