 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 |
|
|
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 |
|
|
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
|
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 |
|
|
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 |
|
|
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 |
|
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
|
Ghommie
|
268146bb93
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374
|
2020-01-12 17:19:57 +01:00 |
|
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
Hatterhat
|
0773f1b7fa
|
sweet merciful FUCK what is this merge
|
2020-01-12 02:53:30 -06:00 |
|
|
Hatterhat
|
55c6e0d97e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
|
2020-01-12 02:51:21 -06:00 |
|
|
Hatterhat
|
2842434d00
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
|
2020-01-12 02:49:58 -06:00 |
|
|
kevinz000
|
e1ae3f3c07
|
Merge pull request #10492 from Trilbyspaceclone/plastic__world
Plastic snow
|
2020-01-12 00:49:39 -08:00 |
|
|
kevinz000
|
f210971889
|
Merge pull request #10393 from chefferz/chefferz-forcefieldstostronk
Significantly lowers the forcefield projector health, lowers armor.
|
2020-01-12 00:47:17 -08:00 |
|
|
kevinz000
|
60524fb9c7
|
Merge pull request #10416 from r4d6/RCD-Updates
Massive RCD Port & Updates
|
2020-01-12 00:45:21 -08:00 |
|
|
Putnam3145
|
01db064038
|
Merge pull request #10532 from Ghommie/Ghommie-cit503
A few reagents related fixes.
|
2020-01-12 00:41:00 -08:00 |
|
|
kevinz000
|
c69d882943
|
Merge pull request #10521 from BlackMajor/master
Fixes roundstart borg spawns, plus a little bit extra.
|
2020-01-12 00:40:48 -08:00 |
|
|
kevinz000
|
4b4864740b
|
Merge pull request #10522 from Hatterhat/syndi-sleeper
printable syndicate sleepers - this is blackmajors fault im not gonna lie
|
2020-01-12 00:40:17 -08:00 |
|
|
kevinz000
|
ddff903532
|
Merge pull request #10518 from Seris02/explosionport
ports the explosion rework thingamajig
|
2020-01-12 00:38:43 -08:00 |
|
|
Seris02
|
b22ec2ffd8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade
|
2020-01-12 11:14:33 +08:00 |
|
|
Putnam
|
38dcb78625
|
chemistry fixes
|
2020-01-11 18:15:50 -08:00 |
|
|
Ghommie
|
16db38a08f
|
Travis man good
|
2020-01-11 20:51:15 +01:00 |
|
|
kappa-sama
|
5eb08e25c2
|
Merge pull request #32 from kappa-sama/moredular
i wanna kill myself
|
2020-01-11 12:35:59 -05:00 |
|
|
kappa-sama
|
8a7e6d49a6
|
e
|
2020-01-11 12:35:49 -05:00 |
|
|
kappa-sama
|
eb93e3d1d3
|
hi
|
2020-01-11 12:35:04 -05:00 |
|
|
kappa-sama
|
108e585cf1
|
shit
|
2020-01-11 12:25:38 -05:00 |
|
|
kappa-sama
|
1aee5e880a
|
god
|
2020-01-11 12:24:23 -05:00 |
|
|
Ghom
|
34502cab1d
|
Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
|
2020-01-11 15:29:25 +01:00 |
|