Commit Graph

342 Commits

Author SHA1 Message Date
MrJWhit
252a97566f fract stop yelling
asdf
2020-03-05 21:28:30 -05:00
Ghom
d78cdb9b37 Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
2020-03-04 23:46:10 +01:00
BlackMajor
43e77f7d3a Last few fixes. Adds arcane wand to dead wizard roid. 2020-03-04 19:12:56 +13:00
YakumoChen
1e34e3d081 Add files via upload 2020-03-01 05:19:27 -05:00
YakumoChen
cc2e0a6440 makes mining base less ugly 2020-03-01 03:45:03 -05:00
BlackMajor
fc4f9e7800 How about a few more roids. 2020-02-28 16:07:57 +13:00
BlackMajor
be740ba690 Merge branch 'master' into SpaceRuins 2020-02-26 20:58:46 +13:00
Ghom
ea5774e713 Merge pull request #11225 from r4d6/Random-Mining
Make the mining base's placement random
2020-02-25 14:41:40 +01:00
Ghom
5adfb5ca46 Merge pull request #11212 from r4d6/engine
Fix AM engine map
2020-02-25 14:23:56 +01:00
BlackMajor
f2fe25d118 Updates maps with ruin border. Lowers ore gen on roids. 2020-02-25 17:33:18 +13:00
r4d6
f76a1c15f3 Port random mining base 2020-02-24 13:27:54 -05:00
BlackMajor
ca6341aac4 Merge branch 'master' into SpaceRuins 2020-02-24 19:47:52 +13:00
r4d6
12ea22fdbf Fix 2020-02-23 14:52:12 -05:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Ghom
91cbc8fb3c Merge pull request #11163 from MrJWhit/update-to-teg-design
Quick TEG update
2020-02-21 02:43:30 +01:00
BlackMajor
984b57560b Fixes cults being able to summon at ruins. As well as stops the ash storm sound. 2020-02-21 01:39:16 +13:00
BlackMajor
cf0b1bbac6 Replace ablative bat with spear. Give ruins a max distance from the transit edge, to dissuade spawning too close to the station. 2020-02-21 00:22:50 +13: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
BlackMajor
9a54b451eb Added two more ruins, Owai's suggestions. 2020-02-18 12:57:48 +13:00
BlackMajor
aff71e7f14 Initial Commit. Adds space ruins to station z. 2020-02-17 23:44:06 +13: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
Ghommie
55fa48737e Forgot about not versioned files. 2020-02-02 01:28:16 +01: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