 kevinz000
|
b22e1a1cb4
|
compile
|
2020-01-16 02:27:35 -07:00 |
|
|
kevinz000
|
1d184b8cad
|
s
|
2020-01-16 00:21:21 -07:00 |
|
|
kevinz000
|
350c5aa060
|
compile
|
2020-01-16 00:18:40 -07:00 |
|
|
kevinz000
|
26525b8fa7
|
s
|
2020-01-16 00:14:03 -07:00 |
|
|
kevinz000
|
1acac87da3
|
compile
|
2020-01-15 23:54:30 -07:00 |
|
|
Tupinambis
|
dd9e62c8bb
|
Sillycon law prevention clause removal.
|
2020-01-15 23:15:18 -06:00 |
|
|
Ghom
|
7d9f4f9fe5
|
Merge pull request #10417 from kevinz000/nightshift_1
Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc
|
2020-01-16 03:21:49 +01:00 |
|
|
kevinz000
|
45c92bcb6f
|
s
|
2020-01-15 19:07:47 -07:00 |
|
|
kevinz000
|
02841f8e92
|
compile
|
2020-01-15 18:49:37 -07:00 |
|
|
r4d6
|
755b0fac3c
|
Merge branch 'master' into Passive-Vents
|
2020-01-15 19:15:50 -05:00 |
|
|
r4d6
|
6045d818d8
|
Add passive vents
|
2020-01-15 19:12:13 -05:00 |
|
|
Artur
|
8b8a112d2c
|
Ohkay
|
2020-01-15 09:41:33 +02:00 |
|
|
Seris02
|
a8e4989d74
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-15 12:15:13 +08:00 |
|
|
Ghom
|
8a06f2f45c
|
Merge pull request #10499 from Hatterhat/tg-40046
more /tg/station ports - tools! logging! some other fun stuff!
|
2020-01-15 01:05:36 +01:00 |
|
|
Ghom
|
5dee355381
|
Merge pull request #10530 from kappa-sama/modularer
deletes modular items but this time i don't get cucked
|
2020-01-15 00:47:38 +01:00 |
|
|
Seris02
|
cb3a4caa63
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-14 23:42:37 +08:00 |
|
|
Ghom
|
11cb7357c5
|
Stop web-editing like that, little one.
|
2020-01-14 16:22:41 +01:00 |
|
|
kappa-sama
|
17604a672d
|
epic
|
2020-01-14 09:04:35 -05:00 |
|
|
Putnam
|
21dde64da2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa
|
2020-01-14 03:27:03 -08:00 |
|
|
Hatterhat
|
464b893790
|
Merge branch 'master' into tg-40046
|
2020-01-13 23:06:48 -06:00 |
|
|
Ghommie
|
a0f35f5cfc
|
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
|
2020-01-14 00:55:28 +01:00 |
|
|
Detective-Google
|
fce73c84c7
|
Merge branch 'master' into the-p-o-o-l
|
2020-01-13 16:38:53 -06:00 |
|
|
Detective Google
|
2c4daf3a99
|
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
|
2020-01-13 16:32:18 -06:00 |
|
|
Ghommie
|
1d948907f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-13 23:26:21 +01:00 |
|
|
kappa-sama
|
3f57f30e14
|
Merge branch 'master' into modularer
|
2020-01-13 16:32:00 -05:00 |
|
|
Lin
|
623ab1c661
|
Merge pull request #10287 from Ghommie/Ghommie-cit492
Minor captains closet cleanup.
|
2020-01-13 21:15:42 +00:00 |
|
|
TrilbySpaceClone
|
04eab97058
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware
|
2020-01-13 11:54:14 -05:00 |
|
|
Letter N
|
6ace5fc4b3
|
ell eff
|
2020-01-13 21:19:21 +08:00 |
|
|
Letter N
|
450cb2b01a
|
Merge branch 'master' into banjo
|
2020-01-13 20:53:30 +08:00 |
|
|
TrilbySpaceClone
|
92dc5e61c3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware
|
2020-01-13 03:42:20 -05:00 |
|
|
Seris02
|
16b5c83a3a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-13 12:53:52 +08:00 |
|
|
Seris02
|
10944719b1
|
erge branch 'master' of https://github.com/Citadel-Station-16/Citade-Station-18 into bowmanupgrade
nope
|
2020-01-13 11:50:39 +08:00 |
|
|
kevinz000
|
8f5d4a0a49
|
Merge remote-tracking branch 'citadel/master' into nightshift_1
|
2020-01-12 18:27:03 -08:00 |
|
|
Putnam
|
c7e3b167e2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak
|
2020-01-12 17:40:26 -08:00 |
|
|
Putnam
|
bb0d012d7a
|
well that works
|
2020-01-12 16:08:49 -08:00 |
|
|
Ghommie
|
f45f979c27
|
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
|
2020-01-12 23:21:03 +01:00 |
|
|
Ghommie
|
9dad810edf
|
Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492
|
2020-01-12 23:11:02 +01:00 |
|
|
Ghommie
|
b2ab8959f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492
|
2020-01-12 23:00:05 +01:00 |
|
|
Detective Google
|
6589065c38
|
scream
|
2020-01-12 15:25:51 -06:00 |
|
|
Detective Google
|
97c26c704d
|
Update Space_Station_13_areas.dm
|
2020-01-12 15:24:51 -06:00 |
|
|
Detective Google
|
81d3225819
|
?
|
2020-01-12 15:23:45 -06:00 |
|
|
Detective Google
|
99ba77ce01
|
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
2020-01-12 15:23:05 -06:00 |
|
|
Detective Google
|
c7dcd0c8a3
|
grug hates merge conflicts
|
2020-01-12 15:19:44 -06:00 |
|
|
Detective Google
|
f6c5f81a83
|
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
|
2020-01-12 15:16:17 -06:00 |
|
|
kappa-sama
|
3e199ed780
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
|
2020-01-12 14:23:38 -05:00 |
|
|
kappa-sama
|
4e3a5379a4
|
augh
|
2020-01-12 14:21:06 -05:00 |
|
|
kevinz000
|
b341818f04
|
mobility flags
|
2020-01-12 11:00:12 -08:00 |
|
|
Hatterhat
|
9aedc62ddb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
|
2020-01-12 12:39:17 -06:00 |
|
|
Hatterhat
|
83f8e42fb3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40046
|
2020-01-12 12:37:19 -06:00 |
|
|
kevinz000
|
90dd0909b8
|
Merge branch 'master' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into god_wish_your_plushies_holy_shit
|
2020-01-12 10:25:50 -08:00 |
|