 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 |
|
|
ZeroMan
|
863d564d38
|
couple more bug fixes
|
2020-03-14 16:02:43 -04:00 |
|
|
ZeroMan
|
0d7237b3ec
|
do them more workies
|
2020-03-14 15:29:02 -04:00 |
|
|
ZeroMan
|
caaff519d6
|
and heres some more
|
2020-03-14 12:03:33 -04:00 |
|
|
ZeroMan
|
f5ed38ebf9
|
ae it is time
|
2020-03-14 00:49:54 -04:00 |
|
|
MrJWhit
|
9e61d9cfb7
|
Update KiloStation.dmm
asdf
|
2020-03-11 16:53:12 -04:00 |
|
|
bunny232
|
7fe564e192
|
Update BoxStation.dmm
|
2020-03-11 06:56:17 -04:00 |
|
|
bunny232
|
31599f669a
|
Update BoxStation.dmm
|
2020-03-08 07:28:00 -04:00 |
|
|
kevinz000andGitHub
|
7de59975fc
|
Merge pull request #11358 from bunny232/master
Box bar lightswitch/pipe fixes now with mapmerge
|
2020-03-07 03:24:29 -07: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 |
|
|
GhomandGitHub
|
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 |
|
|
TrilbyspacecloneandGitHub
|
5b808c511f
|
better seeds
|
2020-03-06 07:09:16 -05:00 |
|
|
bunny232
|
8da5ca9319
|
Update BoxStation.dmm
|
2020-03-06 06:16:27 -05:00 |
|
|
GhomandGitHub
|
97ddde304b
|
NO COMMENTS IN MAP FILES
|
2020-03-06 05:36:05 +01:00 |
|
|
MrJWhit
|
bc7782dcc7
|
Updates to kilostation
asdf
|
2020-03-04 20:21:25 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
d0d8bfe0ac
|
Update Lavaland.dmm
|
2020-03-01 00:21:12 -05: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 |
|
|
GhomandGitHub
|
5ee2f0dcd8
|
Merge pull request #11169 from PersianXerxes/ohHeyKilo
Ports Kilo Station from Skyrat
|
2020-02-25 14:48:37 +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 |
|
|
kevinz000andGitHub
|
8cf41997f5
|
Merge pull request #11201 from Hatterhat/bows
really just a lot of shit about bows
|
2020-02-24 02:33:54 -07:00 |
|
|
kevinz000andGitHub
|
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 |
|
|
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 |
|
|
Hatterhat
|
2d29b37ce9
|
slab spawns and grammar shidd
|
2020-02-22 15:14:09 -06: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 |
|
|
GhomandGitHub
|
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 |
|
|
Persi
|
c4b4a90bd8
|
Oh hey it's KiloStation
Trying to make Kilo open...
Finally, the work begins!
Kilo added!
Kilo Station!
|
2020-02-20 00:58:54 -05:00 |
|
|
kevinz000andGitHub
|
14fdd90618
|
Nerfs public autolathes (#10970)
|
2020-02-16 07:37:24 +01:00 |
|
|
kevinz000andGitHub
|
eb33901046
|
Merge pull request #11002 from BlackMajor/walkerbois
Makes the Ash Walker camp a static spawn in lavaland.
|
2020-02-15 11:47:58 -07:00 |
|
|
GhomandGitHub
|
b3a530abc9
|
Merge pull request #11027 from ShadeAware/capsdrobe2
Captain's Locker De-bloat, plus the Captain's Wardrobe (NOW WITH NO MERGE CONFLICTS)!
|
2020-02-13 09:40:22 +01:00 |
|
|
ShadeAware
|
5afbe44be3
|
Attempt Numero Dos!
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
2020-02-11 17:27:40 -05:00 |
|
|
BlackMajor
|
dc4790bdd4
|
Move RCD to spawn room on suggestion
|
2020-02-11 16:44:39 +13:00 |
|