Commit Graph

1332 Commits

Author SHA1 Message Date
Ghom
201a85464c Merge pull request #11366 from zeroisthebiggay/nerfsthekiloshuttle
kilo shuttle less eyesorey
2020-03-08 01:40:22 +01:00
Ghom
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
kevinz000
7de59975fc Merge pull request #11358 from bunny232/master
Box bar lightswitch/pipe fixes now with mapmerge
2020-03-07 03:24:29 -07:00
ZeroMan
96bd80ac54 map merge also exists 2020-03-06 15:52:33 -05:00
ZeroMan
e4c871a8d3 eva is maybe dangerous 2020-03-06 15:52:12 -05:00
ZeroMan
ef42a8c2f7 map merge also exists 2020-03-06 15:14:18 -05:00
ZeroMan
bee1f7cfe5 its time to vibe 2020-03-06 15:13:23 -05:00
bunny232
8f563797df Update BoxStation.dmm 2020-03-06 09:28:37 -05:00
bunny232
e13fef13fd a 2020-03-06 09:00:59 -05:00
Ghom
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
Trilbyspaceclone
5b808c511f better seeds 2020-03-06 07:09:16 -05:00
bunny232
8da5ca9319 Update BoxStation.dmm 2020-03-06 06:16:27 -05:00
Ghom
97ddde304b NO COMMENTS IN MAP FILES 2020-03-06 05:36:05 +01:00
MrJWhit
a31e0d1143 Create KiloStation.dmm 2020-03-05 21:45:20 -05:00
MrJWhit
252a97566f fract stop yelling
asdf
2020-03-05 21:28:30 -05:00
MrJWhit
0e330c2aba Merge branch 'master' of https://github.com/MrJWhit/Citadel-Station-13 2020-03-05 21:25:15 -05:00
MrJWhit
bc7782dcc7 Updates to kilostation
asdf
2020-03-04 20:21:25 -05:00
MrJWhit
fcfff59ea6 Update KiloStation.dmm 2020-03-04 20:11:28 -05:00
MrJWhit
f5f54196d7 Update KiloStation.dmm 2020-03-04 20:04:02 -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
MrJWhit
be6bebbed4 Minor elements to kilostation
asdf
2020-03-04 15:46:12 -05: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
Trilbyspaceclone
d0d8bfe0ac Update Lavaland.dmm 2020-03-01 00:21:12 -05:00
BlackMajor
fc4f9e7800 How about a few more roids. 2020-02-28 16:07:57 +13:00
BlackMajor
c326ca28a2 Adds the ruin spawn to KiloStation as well. 2020-02-26 23:57:53 +13:00
BlackMajor
be740ba690 Merge branch 'master' into SpaceRuins 2020-02-26 20:58:46 +13:00
Ghom
5ee2f0dcd8 Merge pull request #11169 from PersianXerxes/ohHeyKilo
Ports Kilo Station from Skyrat
2020-02-25 14:48:37 +01: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
Persi
f48fd43e82 Fixed dining room sofas, oops 2020-02-25 00:29:19 -05:00
BlackMajor
f2fe25d118 Updates maps with ruin border. Lowers ore gen on roids. 2020-02-25 17:33:18 +13:00
BlackMajor
fc85f62546 Merge branch 'master' into SpaceRuins 2020-02-25 16:51:39 +13:00
r4d6
f76a1c15f3 Port random mining base 2020-02-24 13:27:54 -05:00
TrilbySpaceClone
525cedf16a this just works 2020-02-24 11:45:47 -05:00
BlackMajor
6624155e3d Hey you know this is probably a smarter way to go about ruin spawning in station space. 2020-02-25 02:21:28 +13:00
kevinz000
8cf41997f5 Merge pull request #11201 from Hatterhat/bows
really just a lot of shit about bows
2020-02-24 02:33:54 -07:00
kevinz000
43c17b4ab3 Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
2020-02-24 02:30:36 -07: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
Persi
4af2eee9dd Haha, okay... this will break Kilo
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
2020-02-23 02:28:18 -05:00
Ghom
211be93718 Merge pull request #11182 from Trilbyspaceclone/doner_begone!
Removes doner items as well as armored hats from holodeck lockers
2020-02-22 22:30:34 +01:00
Hatterhat
2d29b37ce9 slab spawns and grammar shidd 2020-02-22 15:14:09 -06: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
TrilbySpaceClone
257cc813e2 Armorless 2020-02-21 01:10:34 -05:00
Detective Google
7889ea0d68 fix + maps 2020-02-20 22:58:43 -06:00
Ghom
91cbc8fb3c Merge pull request #11163 from MrJWhit/update-to-teg-design
Quick TEG update
2020-02-21 02:43:30 +01:00
Ghom
e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
2020-02-21 02:43:04 +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