Commit Graph

323 Commits

Author SHA1 Message Date
Ghom
91cbc8fb3c Merge pull request #11163 from MrJWhit/update-to-teg-design
Quick TEG update
2020-02-21 02:43:30 +01:00
MrJWhit
c498b1df95 Quick TEG update
asdf
2020-02-19 22:00:15 -05:00
kevinz000
aeb8087441 Merge pull request #10904 from Hatterhat/golem-ship-gps
granting golems GPSes that are off by default
2020-02-19 19:00:24 -07:00
Hatterhat
aedd8b87f6 maybe giving them an active gps is a bad idea 2020-02-16 02:33:14 -06:00
Ghom
ce5208a1df Merge pull request #11007 from r4d6/random-fixes
Mining Shuttle Fix
2020-02-12 10:10:16 +01:00
r4d6
dccbb49626 Fixes 2020-02-10 11:59:14 -05:00
Persi
4c2359de3b Separates gulag and public mining, removes sec vendor from gulag 2020-02-09 21:45:57 -05:00
kevinz000
b17b98ff5f Merge pull request #10907 from Citadel-Station-13/Ghommie-patch-2
Fixes no-grav lavaland labor/mining shuttle areas.
2020-02-05 23:43:21 -07:00
Ghom
20a5f905bc Merge pull request #10832 from r4d6/shitters
Mining Update : Real update
2020-02-05 07:20:02 +01:00
Ghom
aaa58ef1e8 Update Mining_Station_Public_01.dmm 2020-02-05 05:13:36 +01:00
Hatterhat
7ef8b36324 golems have gpses now 2020-02-04 18:45:31 -06:00
r4d6
f42ef66846 Move the lockers and the beacon 2020-02-04 19:25:10 -05:00
r4d6
60163330f7 closets 2020-02-04 19:07:01 -05:00
r4d6
32f3eec050 Real 2020-02-04 19:03:45 -05:00
r4d6
f9ccca9c8f Anti-Shitter mining update 2020-02-01 00:08:01 -05:00
r4d6
4bcf2a60c3 missing pipe 2020-01-26 21:57:54 -05:00
r4d6
968e4a91b7 Two manifolds were invisible 2020-01-26 21:57:10 -05:00
r4d6
4884165d4f Add TEG, Code & config 2020-01-26 20:58:16 -05:00
r4d6
5ef47ce60d Budget engine 2020-01-25 21:36:19 -05:00
r4d6
e5d33e766e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Moar-Engines 2020-01-25 20:18:34 -05:00
r4d6
0896d124dc Add stuff 2020-01-25 20:18:29 -05:00
Ghom
047059617c Merge pull request #10645 from r4d6/Modular-Lavaland
Modularize the mining base
2020-01-23 02:53:34 +01:00
r4d6
e3cb379bde Add the Mining Base as a submap 2020-01-21 20:31:40 -05:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
r4d6
f11cc9bcee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into quick-fix 2020-01-10 00:09:24 -05:00
r4d6
48abd31dee Fix SM 5x5 2020-01-10 00:06:06 -05:00
Ghommie
825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
r4d6
46041edab8 stuff more collectors in the 1x3 SM. 2020-01-02 22:31:20 -05:00
r4d6
91a8a434f5 Fix a bug and allow for the three crystals to be hit. 2020-01-02 01:58:34 -05:00
r4d6
0fad4aff75 change a x of place to make more sense. 2020-01-02 01:34:17 -05:00
r4d6
4010d72b7a Add 3 SM Variations 2020-01-02 01:31:21 -05:00
Ghommie
7837688426 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-28 23:41:10 +01:00
r4d6
f4b3fd7369 Also give Tesla's emitters R-floors 2019-12-22 17:09:39 -05:00
r4d6
3524bc24ea Fix areas and tiles getting ripped off 2019-12-22 17:04:08 -05:00
r4d6
b53c3869ca Connect the fuel pipe to somewhere 2019-12-22 08:19:23 -05:00
r4d6
aa0507dc03 Forgot a button on the Tesla 2019-12-21 23:46:12 -05:00
r4d6
04f0496322 Forgot a " 2019-12-21 23:23:32 -05:00
r4d6
5a189b2354 QoL Update
- Rename the cameras and place two more

- Unanchor the shields generators and emitters because they were bugged and will save more time

- Put more rad closets on the Singulo

- Put more insuls on the Tesla since they protect

- Moved the Engineer clothing locker to Boxstation instead of having it in the Engine

- Added a button to the shutters on the north side of PA

- Added a marker to show where to place the console

- Rewire the power wire to be more in a straight line.
2019-12-21 23:09:43 -05:00
r4d6
c5aef98252 Make things even more organized 2019-12-21 09:17:15 -05:00
r4d6
fb078e18f9 QoL Update
Move the Engines to a subfolder to be cleaner when there will be 20 submaps on different maps and change the Tesla Submap to incorporate a few changes I did for the Singulo submap.
2019-12-21 09:12:04 -05:00
Ghommie
9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
r4d6
61a702bad5 Merge remote-tracking branch 'upstream/master' into substationV2 2019-12-19 23:51:14 -05:00
r4d6
8a4b3f2681 Add Engines submaps 2019-12-19 15:20:32 -05:00
Useroth
8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01:00
Useroth
5e836c51e4 Forgot to track the new files 2019-12-08 14:05:05 +01:00
Ghommie
e0caf6007b Fixes space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter... 2019-12-07 04:02:33 +01:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
Ghommie
19a511929d and "Replaces the slime extract in the clown biodome with a superlube sprayer." 2019-11-11 23:39:03 +01:00
Ghommie
e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00