 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 |
|
|
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 |
|
|
bunny232
|
8f563797df
|
Update BoxStation.dmm
|
2020-03-06 09:28:37 -05:00 |
|
|
bunny232
|
e13fef13fd
|
a
|
2020-03-06 09:00:59 -05:00 |
|
|
bunny232
|
8da5ca9319
|
Update BoxStation.dmm
|
2020-03-06 06:16:27 -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 |
|
|
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
|
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 |
|
|
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 |
|
|
kevinz000andGitHub
|
14fdd90618
|
Nerfs public autolathes (#10970)
|
2020-02-16 07:37:24 +01:00 |
|
|
ShadeAware
|
5afbe44be3
|
Attempt Numero Dos!
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
2020-02-11 17:27:40 -05:00 |
|
|
Detective Google
|
8643b0103e
|
fucking MAGIC FLOATING LIGHTS AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
2020-02-08 01:23:08 -06:00 |
|
|
Detective Google
|
c434382d6d
|
fixes map conflicts on this pr for the (3rd? 4th? I've lost count.) time.
|
2020-02-08 01:20:50 -06:00 |
|
|
Detective Google
|
949e8c4104
|
hate..
|
2020-02-07 16:27:53 -06:00 |
|
|
TrilbySpaceClone
|
205c38a7c5
|
edits 4-5 things, gets 40000 lines of code edits
|
2020-02-04 17:40:25 -05:00 |
|
|
Tupinambis
|
ffa7590203
|
Status Displays should now actually work
|
2020-01-30 16:07:26 -06:00 |
|
|
LinandGitHub
|
cde6601c60
|
Merge pull request #10759 from Ghommie/Ghommie-cit534
demodularize and removes lot of unused clothing with missing sprites.
|
2020-01-29 19:58:26 +00:00 |
|
|
Detective Google
|
8e3830f4a1
|
Adds the pool to box(again) to fix a merge conflict- implements some feedback
|
2020-01-28 21:22:17 -06:00 |
|
|
Detective Google
|
b61269c7e2
|
brings the map back to standard (so I can re-do it and make it not conflict)
|
2020-01-28 20:06:15 -06:00 |
|
|
GhomandGitHub
|
2643fd053b
|
Merge pull request #10748 from Trilbyspaceclone/door-
correct door to vault being all access
|
2020-01-29 01:59:42 +01:00 |
|
|
TrilbySpaceClone
|
a3ce2b06f6
|
tada
|
2020-01-28 16:09:49 -05:00 |
|
|
TrilbySpaceClone
|
92e355267f
|
Revert "correct door to vault being all access"
This reverts commit f145dd1730.
|
2020-01-28 16:07:15 -05:00 |
|
|
Ghommie
|
e860110771
|
Ruskie battle hats in box maint, get some (their armor is fairly weak)
|
2020-01-28 03:55:30 +01:00 |
|
|
KathrinBailey
|
13d9509610
|
removes backup
|
2020-01-28 02:24:32 +00:00 |
|
|
KathrinBailey
|
bc7c28a62f
|
removes improvements
this is now solely bug fixes
|
2020-01-28 02:22:56 +00:00 |
|
|
TrilbySpaceClone
|
f145dd1730
|
correct door to vault being all access
|
2020-01-27 02:31:19 -05:00 |
|
|
Detective Google
|
d034467cb2
|
adds the pool to the map again
|
2020-01-25 18:59:46 -06:00 |
|
|
KathrinBailey
|
28fcbe444d
|
map merge
|
2020-01-24 18:37:22 +00:00 |
|
|
KathrinBailey
|
8ff628343b
|
box updates
slight cargo jiggery
slight hop jiggery
stamps, stamps, stamps! (and paperwork)
Garden has botany vendors
|
2020-01-24 18:35:06 +00:00 |
|
|
KathrinBailey
|
b826926bf9
|
Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework
|
2020-01-21 17:22:17 +00:00 |
|