 ZeroMan
|
82b63081f6
|
a couple more tweaks
|
2020-03-15 11:28:57 -04:00 |
|
|
ZeroMan
|
edb63ed212
|
and torture my cocknballs
|
2020-03-15 01:50:40 -04:00 |
|
|
ZeroMan
|
74076eb351
|
and maybe thisll work
|
2020-03-15 01:23:23 -04:00 |
|
|
ZeroMan
|
99b189844e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr
# Conflicts:
# _maps/map_files/BoxStation/BoxStation.dmm
|
2020-03-15 01:11:19 -04:00 |
|
|
bunny232andGitHub
|
23e9ecf97c
|
Update BoxStation.dmm (#11456)
|
2020-03-15 04:05:04 +01:00 |
|
|
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 |
|
|
GhomandGitHub
|
201a85464c
|
Merge pull request #11366 from zeroisthebiggay/nerfsthekiloshuttle
kilo shuttle less eyesorey
|
2020-03-08 01:40:22 +01:00 |
|
|
GhomandGitHub
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
YakumoChenandGitHub
|
1e34e3d081
|
Add files via upload
|
2020-03-01 05:19:27 -05:00 |
|
|
YakumoChenandGitHub
|
cc2e0a6440
|
makes mining base less ugly
|
2020-03-01 03:45:03 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
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 |
|