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 |
|
CitadelStationBot
|
a5aebcd6ff
|
Automatic changelog generation for PR #10530 [ci skip]
|
2020-01-14 17:47:41 -06: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 |
|
Lin
|
3510bf5150
|
Merge pull request #10560 from Ghommie/Ghommie-cit505
[s] makes master compile.
|
2020-01-14 22:01:35 +00:00 |
|
Ghommie
|
26d6e7f05c
|
Work.
|
2020-01-14 22:04:38 +01:00 |
|
Ghommie
|
3984943b0d
|
[s] makes master compile.
|
2020-01-14 20:02:26 +01:00 |
|
CitadelStationBot
|
1e14c0e09a
|
Automatic changelog generation for PR #10531 [ci skip]
|
2020-01-14 11:26:37 -06:00 |
|
Ghom
|
2cc87c3127
|
Merge pull request #10531 from Trilbyspaceclone/Seed-to-points
Hydroponics can now make sci points
|
2020-01-14 18:26:34 +01:00 |
|
CitadelStationBot
|
61885d0cd6
|
Automatic changelog generation for PR #10454 [ci skip]
|
2020-01-14 11:24:52 -06:00 |
|
Ghom
|
03ebab6ec5
|
Merge pull request #10454 from Commandersand/clothsfix
fixes clothing directional sprites(i swear not all of them are my fault)
|
2020-01-14 18:24:50 +01:00 |
|
TrilbySpaceClone
|
66c608512b
|
Merge branch 'Seed-to-points' of https://github.com/Trilbyspaceclone/Citadel-Station-13 into Seed-to-points
|
2020-01-14 10:45:00 -05:00 |
|
TrilbySpaceClone
|
ccfaa294bc
|
Update research.dm
|
2020-01-14 10:40:47 -05:00 |
|
Ghom
|
11cb7357c5
|
Stop web-editing like that, little one.
|
2020-01-14 16:22:41 +01:00 |
|
kappa-sama
|
bf3f8536a2
|
hi
|
2020-01-14 09:05:05 -05:00 |
|
kappa-sama
|
dcfa8df8f1
|
bye
|
2020-01-14 09:04:50 -05:00 |
|
kappa-sama
|
17604a672d
|
epic
|
2020-01-14 09:04:35 -05:00 |
|
Trilbyspaceclone
|
bc1e24cb7b
|
Update tips.txt
|
2020-01-14 08:40:58 -05:00 |
|
Trilbyspaceclone
|
c320143d53
|
Update tips.txt
|
2020-01-14 08:39:24 -05:00 |
|
CitadelStationBot
|
69d986df8a
|
Automatic changelog generation for PR #10538 [ci skip]
|
2020-01-14 06:52:13 -06:00 |
|
Ghom
|
99a6214d22
|
Merge pull request #10538 from Putnam3145/chemistry-aaa
Fixes to chemistry
|
2020-01-14 13:52:10 +01:00 |
|
CitadelStationBot
|
06d505cdf8
|
Automatic changelog generation for PR #10558 [ci skip]
|
2020-01-14 06:51:06 -06:00 |
|
Ghom
|
77bdc8ee58
|
Merge pull request #10558 from DeltaFire15/clockfixes
Slimepeople can no longer just chill on vitality matrixes
|
2020-01-14 13:51:03 +01:00 |
|
CitadelStationBot
|
3e9d6ceb8e
|
Automatic changelog generation for PR #10549 [ci skip]
|
2020-01-14 06:49:55 -06:00 |
|
Ghom
|
9189455fb1
|
Merge pull request #10549 from Seris02/durathread
durathread winter coats from hyper
|
2020-01-14 13:49:53 +01: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 |
|
kappa-sama
|
90e2fca5e7
|
augh
|
2020-01-13 23:15:07 -05:00 |
|
Seris02
|
d46f3232f9
|
tada
|
2020-01-14 10:57:32 +08:00 |
|
CitadelStationBot
|
f2bca71e82
|
Automatic changelog generation for PR #10552 [ci skip]
|
2020-01-13 17:33:50 -06:00 |
|
Ghom
|
8437d1f0c3
|
Merge pull request #10552 from Tupinambis/NotUglyFireAlarms
Pseudo Reverts Fire Alarms Back to Original Look: AKA Not Fuckugly
|
2020-01-14 00:33:47 +01:00 |
|
kappa-sama
|
269da0708b
|
thank you git bash
|
2020-01-13 16:41:29 -05:00 |
|
kappa-sama
|
4b1a5a8e53
|
hm
|
2020-01-13 16:40:58 -05:00 |
|
kappa-sama
|
3f57f30e14
|
Merge branch 'master' into modularer
|
2020-01-13 16:32:00 -05:00 |
|
CitadelStationBot
|
be7fef7048
|
Automatic changelog generation for PR #10287 [ci skip]
|
2020-01-13 15:15:45 -06:00 |
|
Lin
|
623ab1c661
|
Merge pull request #10287 from Ghommie/Ghommie-cit492
Minor captains closet cleanup.
|
2020-01-13 21:15:42 +00:00 |
|
Ghom
|
330d96d549
|
Merge pull request #10409 from kevinz000/isbanned2
IT WORKED ON LOCAL
|
2020-01-13 18:49:46 +01:00 |
|
CitadelStationBot
|
2be5756a6e
|
Automatic changelog generation for PR #10478 [ci skip]
|
2020-01-13 09:12:30 -06:00 |
|
Ghom
|
3c4d36ddd3
|
Merge pull request #10478 from Seris02/gorillashuttlesstopping
Makes the gorilla shuttle emag only
|
2020-01-13 16:12:26 +01:00 |
|
CitadelStationBot
|
93a9a9fa8a
|
Automatic changelog generation for PR #10539 [ci skip]
|
2020-01-13 09:07:31 -06:00 |
|
Ghom
|
984c43116c
|
Merge pull request #10539 from Savotta/cum
ports hShark snout from hyper-station-13
|
2020-01-13 16:07:28 +01:00 |
|
CitadelStationBot
|
e274b13b92
|
Automatic changelog generation for PR #10507 [ci skip]
|
2020-01-13 07:44:48 -06:00 |
|
Ghom
|
e87a3d1074
|
Merge pull request #10507 from LetterN/banjo
Ports banjo
|
2020-01-13 14:44:46 +01: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 |
|
Ghom
|
7af8579d17
|
Merge pull request #10550 from deathride58/fixestopicstatusproper
fixes status topic having a broken cooldown
|
2020-01-13 13:48:04 +01:00 |
|
CitadelStationBot
|
42a867df4f
|
Automatic changelog generation for PR #10493 [ci skip]
|
2020-01-13 06:46:42 -06:00 |
|
Ghom
|
00325e7de6
|
Merge pull request #10493 from Putnam3145/score-instead
Makes the post-secret gamemode vote score-based instead of schulze-based
|
2020-01-13 13:46:39 +01:00 |
|
CitadelStationBot
|
5de5b0b308
|
Automatic changelog generation for PR #10556 [ci skip]
|
2020-01-13 06:14:44 -06:00 |
|
Ghom
|
962e73d1bc
|
Merge pull request #10556 from AffectedArc07/lf-ci
CI to check for wrong line ending
|
2020-01-13 13:14:42 +01:00 |
|
AffectedArc07
|
4bee50a472
|
DME was wrong
|
2020-01-13 11:57:13 +00:00 |
|