 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 |
|
|
r4d6
|
1ae106cca2
|
Fixes
|
2020-01-21 09:23:34 -05:00 |
|
|
GhomandGitHub
|
d709edb1c2
|
Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
|
2020-01-18 20:32:14 +01:00 |
|
|
Putnam
|
3788bc6676
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-17 21:33:13 -08:00 |
|
|
KathrinBailey
|
c4be412564
|
Fixes bugs
Changelog will be on PR
|
2020-01-17 20:55:13 +00:00 |
|
|
r4d6
|
98bb9397ea
|
fix cyborgs spawns
|
2020-01-16 21:05:51 -05:00 |
|
|
r4d6
|
a360a89f86
|
Map Changes
|
2020-01-16 15:10:57 -05:00 |
|
|
BlackMajor
|
30fc5b560b
|
Couple of lingering fixes
|
2020-01-11 17:57:18 +13:00 |
|
|
Putnam
|
57530ab1c9
|
Added one to box, too
|
2020-01-09 19:36:44 -08:00 |
|
|
BlackMajor
|
b41c9cd844
|
Sync with master
|
2020-01-08 12:25:22 +13:00 |
|
|
TrilbySpaceClone
|
304ac7b20b
|
fixes
|
2020-01-02 21:06:31 -05:00 |
|
|
TrilbySpaceClone
|
9adb7a718d
|
random airlock b-gone
|
2019-12-30 03:10:13 -05:00 |
|
|
TrilbySpaceClone
|
51742d5da5
|
tada
|
2019-12-29 20:08:30 -05:00 |
|
|
TrilbySpaceClone
|
c8dcdcbcf2
|
Update BoxStation.dmm
|
2019-12-29 18:09:45 -05:00 |
|
|
TrilbySpaceClone
|
0edbbc5a04
|
remves cable
|
2019-12-29 00:33:39 -05:00 |
|
|
TrilbySpaceClone
|
7d23e543e2
|
readds cell 4
|
2019-12-28 00:24:20 -05:00 |
|
|
TrilbySpaceClone
|
1d40732e3f
|
weh
|
2019-12-27 23:41:34 -05:00 |
|
|
TrilbySpaceClone
|
1c34ab661d
|
Update BoxStation.dmm
|
2019-12-25 02:07:33 -05:00 |
|
|
TrilbySpaceClone
|
b7ee64dd5d
|
Steos are bad
|
2019-12-22 02:45:07 -05:00 |
|
|
TrilbySpaceClone
|
d3a8025675
|
Wew
|
2019-12-22 02:17:24 -05:00 |
|
|
LinandGitHub
|
4d466e17f3
|
Merge pull request #10173 from Ghommie/Ghommie-cit461
Fixing a boxstation pipenet mapping issue.
|
2019-12-19 23:43:16 +00:00 |
|
|
Ghommie
|
3cb8391f38
|
Hopefully this won't screw up travis.
|
2019-12-17 12:15:28 +01:00 |
|
|
Ghommie
|
0b879f0f73
|
Fixing a boxstation pipenet mapping issue.
|
2019-12-13 16:57:48 +01:00 |
|