shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,011 Commits 5 Branches 0 Tags
cdb07797b2ecff1988e0587f4fcfccc24e8bb54c
Commit Graph

32011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dap
cdb07797b2 Merge remote-tracking branch 'upstream/master' into Lambdastation 2020-03-21 19:09:50 -06:00
CitadelStationBot
4e69cf0151 Automatic changelog generation for PR #11494 [ci skip] 2020-03-18 05:35:31 -05:00
kevinz000
8fbdae375c Merge pull request #11494 from Detective-Google/hudpatches 
Adds craftable HUDpatches, similar to the HoS'
 2020-03-18 03:35:28 -07:00
CitadelStationBot
e0fe2c26ad Automatic changelog generation for PR #11506 [ci skip] 2020-03-18 05:35:10 -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
CitadelStationBot
6eb5b1b609 Automatic changelog generation for PR #11505 [ci skip] 2020-03-17 21:15:15 -05:00
kevinz000
c11275e4ba Update robot.dm (#11505) 2020-03-18 03:15:12 +01:00
Putnam3145
239a805c45 Merge pull request #11513 from Citadel-Station-13/Linzolle-patch-2 
[s] fix beakers not emptying when thrown at mob
 2020-03-17 18:32:17 -07:00
Lin
1649f42570 bruh 2020-03-18 01:24:54 +00:00
Detective Google
6b392e09c2 Merge remote-tracking branch 'upstream/master' into hudpatches 2020-03-17 16:29:13 -05:00
Detective Google
1b72357925 might as well throw the other in whilst I wait. 2020-03-17 16:26:26 -05:00
Detective Google
72f086c79e one at a time perhaps. 2020-03-17 16:24:23 -05:00
Detective Google
e8d09b470d nobody can figure out why this isn't working :) 2020-03-17 16:22:42 -05: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
Detective Google
af872d1476 push 2020-03-17 16:10:15 -05:00
Detective Google
37aaac60e3 third times the charm 2020-03-17 16:07:25 -05:00
Detective Google
f7c9762583 icon conflicts suck 2020-03-17 16:00:24 -05:00
Detective Google
93ceaa0157 Revert "h^2" 
This reverts commit df45abfd0f.
 2020-03-17 15:56:57 -05:00
Detective Google
df45abfd0f h^2 2020-03-17 15:55:07 -05:00
Detective Google
c97591cc8f h 2020-03-17 15:54:17 -05:00
kevinz000
fcf51a285d Merge pull request #11502 from Citadel-Station-13/Ghommie-patch-5 
Positronic overlays fix.
 2020-03-17 09:29:39 -07:00
CitadelStationBot
7074209672 Automatic changelog generation for PR #11501 [ci skip] 2020-03-17 11:29:32 -05:00
kevinz000
00e0683889 Merge pull request #11501 from Citadel-Station-13/Ghommie-patch-4 
Ports "Makes iron sheets build the normal metal table again"
 2020-03-17 09:29:29 -07:00
kevinz000
7a9525d7c7 Merge pull request #11499 from Citadel-Station-13/Ghommie-patch-3 
Fixing right click / verb set_APTFT
 2020-03-17 09:29:17 -07:00
CitadelStationBot
a5be3a411b Automatic changelog generation for PR #11495 [ci skip] 2020-03-17 11:29:08 -05: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
CitadelStationBot
e5675c14da Automatic changelog generation for PR #11493 [ci skip] 2020-03-17 11:28:26 -05:00
kevinz000
4374b09a12 Merge pull request #11493 from Trilbyspaceclone/patch-311 
Blacklists two custom item flasks in "get drink" proc
 2020-03-17 09:28:24 -07:00
kevinz000
2ae50af752 Merge pull request #11487 from Ghommie/Ghommie-cit626 
Shortcut fix for a sticky situation.
 2020-03-17 09:28:01 -07:00
kevinz000
ade399dc31 Merge pull request #11486 from Citadel-Station-13/Ghommie-patch-2 
Webedit fixing a runtime.
 2020-03-17 09:27:36 -07:00
CitadelStationBot
0933109ed9 Automatic changelog generation for PR #11504 [ci skip] 2020-03-17 11:26:08 -05:00
kevinz000
0e944a2ac7 Merge pull request #11504 from necromanceranne/turret_fix 
Fixes being unable to remove turret guns
 2020-03-17 09:26:04 -07:00
CitadelStationBot
611977cc2d Automatic changelog generation for PR #11503 [ci skip] 2020-03-17 11:25:54 -05:00
kevinz000
a928681401 Merge pull request #11503 from necromanceranne/45_nerf_kitchengun_buff 
Removes stun bullet .45/Kitchen Gun a lot more desirable for heavy duty cleaning!
 2020-03-17 09:25:51 -07:00
CitadelStationBot
dbb35927dc Automatic changelog generation for PR #11500 [ci skip] 2020-03-17 11:25:47 -05:00
kevinz000
8bc8ea71ea Merge pull request #11500 from necromanceranne/electrostarve_sprite_fix 
Electrostaff Sprite Fix
 2020-03-17 09:25:44 -07:00
CitadelStationBot
254a34c809 Automatic changelog generation for PR #11498 [ci skip] 2020-03-17 11:25:35 -05:00
kevinz000
2e4282befa Merge pull request #11498 from necromanceranne/diaghud_fix 
Replaced and added missing Diagnostic HUDSunglasses sprites
 2020-03-17 09:25:32 -07:00
CitadelStationBot
2b5218085b Automatic changelog generation for PR #11484 [ci skip] 2020-03-16 15:23:49 -05:00
kevinz000
1585b34e41 Merge pull request #11484 from Citadel-Station-13/Ghommie-patch-1 
Fixing a couple issues with recyclers.
 2020-03-16 13:23:46 -07:00
kevinz000
b062c76ca7 Merge pull request #11485 from Ghommie/Ghommie-cit625 
Fixing a little issue with the musician trait etcetera.
 2020-03-16 13:23:25 -07:00
kevinz000
2e90761f88 Merge pull request #11482 from Ghommie/Ghommie-cit624 
fixing missing icon issues for some survival pod machinery.
 2020-03-16 13:23:06 -07:00
kevinz000
fd7bfaba06 Merge pull request #11480 from Ghommie/Ghommie-cit623 
Banana pies, beams. runtime errors and warnings.
 2020-03-16 13:22:49 -07:00
CitadelStationBot
b4338a81b0 Automatic changelog generation for PR #11483 [ci skip] 2020-03-16 15:22:26 -05:00
kevinz000
3c97782a87 Merge pull request #11483 from Hatterhat/mining-borg-nerfs 
mining borg nerfs - "they should be outclassed lategame"
 2020-03-16 13:22:23 -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