 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 |
|
|
r4d6
|
f76a1c15f3
|
Port random mining base
|
2020-02-24 13:27:54 -05: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 |
|
|
r4d6
|
dccbb49626
|
Fixes
|
2020-02-10 11:59:14 -05:00 |
|
|
BlackMajor
|
4dddca9c7a
|
forgot that
|
2020-02-10 21:50:20 +13:00 |
|
|
BlackMajor
|
d778273083
|
Make ash walkers a static spawn
|
2020-02-10 21:46:03 +13: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 |
|
|
GhomandGitHub
|
278a9cf9ae
|
Merge pull request #10966 from r4d6/mininge
Fix mining base having holes to space
|
2020-02-08 05:06:22 +01:00 |
|
|
r4d6
|
f4c148d44f
|
Fix mining base having holes to space
|
2020-02-07 22:58:47 -05:00 |
|
|
kevinz000andGitHub
|
3f5805a9e8
|
Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
|
2020-02-06 23:52:49 -07:00 |
|
|
kevinz000andGitHub
|
cf99ad9671
|
Merge pull request #10901 from Trilbyspaceclone/more-box-fixes-and-tweaks
Corrects Box'es caps office + some other tweaks
|
2020-02-06 03:47:28 -07:00 |
|
|
TrilbySpaceClone
|
205c38a7c5
|
edits 4-5 things, gets 40000 lines of code edits
|
2020-02-04 17:40:25 -05:00 |
|
|
EmeraldSundiskandGitHub
|
8c25277913
|
Add files via upload
|
2020-02-04 12:17:28 -08:00 |
|
|
EmeraldSundiskandGitHub
|
ab1730ad1f
|
Add files via upload
|
2020-02-04 11:38:36 -08:00 |
|
|
necromanceranne
|
0779b67acc
|
whoops
|
2020-02-03 15:51:07 +11:00 |
|
|
necromanceranne
|
07a4515b23
|
Thankfully I didn't fuck it up this way
|
2020-02-03 15:03:16 +11:00 |
|
|
Tupinambis
|
ffa7590203
|
Status Displays should now actually work
|
2020-01-30 16:07:26 -06:00 |
|
|
GhomandGitHub
|
f74475a6e0
|
Merge pull request #10749 from kevinz000/duke_moxley
It's high noon...
|
2020-01-30 00:19:37 +01: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 |
|
|
GhomandGitHub
|
2643fd053b
|
Merge pull request #10748 from Trilbyspaceclone/door-
correct door to vault being all access
|
2020-01-29 01:59:42 +01:00 |
|
|
kevinz000andGitHub
|
9dfcef68ed
|
Merge branch 'master' into duke_moxley
|
2020-01-28 17:53:08 -07: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 |
|
|
kevinz000
|
fa2cc0cfdf
|
adds
|
2020-01-27 03:39:27 -07:00 |
|
|
TrilbySpaceClone
|
f145dd1730
|
correct door to vault being all access
|
2020-01-27 02:31:19 -05:00 |
|
|
KathrinBailey
|
c4610fdff7
|
okay goodbye meta changes
|
2020-01-26 08:29:17 +00:00 |
|
|
KathrinBailey
|
c4e7f85b17
|
ignore this commit
bruh I need the new meta
|
2020-01-26 08:26:15 +00:00 |
|
|
KathrinBailey
|
0c186d235d
|
Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework
|
2020-01-26 08:21:54 +00: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 |
|
|
Ghommie
|
95a2479c6a
|
Additional runtime fixes.
|
2020-01-24 04:59:56 +01:00 |
|
|
GhomandGitHub
|
047059617c
|
Merge pull request #10645 from r4d6/Modular-Lavaland
Modularize the mining base
|
2020-01-23 02:53:34 +01:00 |
|
|
GhomandGitHub
|
4435bd4d56
|
Merge pull request #10622 from Owai-Seek/mojodojo
Ghost Cafe Cleanup
|
2020-01-23 02:41:18 +01:00 |
|