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
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
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
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
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
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
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
ZeroMan
edb63ed212
and torture my cocknballs
2020-03-15 01:50:40 -04:00
ZeroMan
74076eb351
and maybe thisll work
2020-03-15 01:23:23 -04:00
ZeroMan
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
bunny232
23e9ecf97c
Update BoxStation.dmm ( #11456 )
2020-03-15 04:05:04 +01:00
ZeroMan
d81247e15e
and also map merge
2020-03-14 21:26:40 -04:00
ZeroMan
ec93e194d2
oh yeah disposals exists
2020-03-14 21:25:57 -04:00
ZeroMan
d5bd1c1f4c
and map merge exists
2020-03-14 20:51:11 -04:00
ZeroMan
3f3def6715
i am gonna choom
2020-03-14 20:50:08 -04:00
ZeroMan
e54011c7c3
day one updates simulator
2020-03-14 17:38:40 -04:00
ZeroMan
6a0b7ecdeb
my ocd takes over
2020-03-14 17:29:17 -04:00
ZeroMan
1c92ef27b4
quite the quirky momentumeus
2020-03-14 17:21:00 -04:00
ZeroMan
ea5fac9197
breathing is fine too
2020-03-14 16:56:33 -04:00
ZeroMan
8970cb433e
i really hate life
2020-03-14 16:39:59 -04:00
ZeroMan
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
ZeroMan
b726f274a7
map merge exists too
2020-03-14 16:14:05 -04:00
ZeroMan
98c66d2fc9
and the finishing touches
2020-03-14 16:13:24 -04:00
