Commit Graph

45738 Commits

Author SHA1 Message Date
SandPoot
a444672abe Cit 2022-02-02 02:38:08 -03:00
SandPoot
283830a9ed oops 2022-02-02 02:17:09 -03:00
SandPoot
e3a4542ddd PLEASE DON'T MERGE WHEN I- AAAAAAAA 2022-02-02 02:12:13 -03:00
SandPoot
4c93bfc764 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui 2022-02-02 02:07:13 -03:00
SandPoot
29be8573ea Upload files 2022-02-02 02:01:04 -03:00
CitadelStationBot
79058b2b6d Automatic changelog generation for PR #15488 [ci skip] 2022-02-01 22:59:39 -06:00
Lin
daa8032712 Merge pull request #15488 from BlueWildrose/getouttathewaynerd
Get out of the way, you weaboos. The slimes were here first.
2022-02-02 04:59:36 +00:00
Lin
cc3ea5bf7d Merge pull request #14804 from Citadel-Station-13/pokerchips
[Ready] pokerchip set donator item
2022-02-02 04:59:17 +00:00
Linzolle
ab6f305805 Merge branch 'pokerchips' of github.com:Citadel-Station-13/Citadel-Station-13 2022-02-01 21:50:26 -07:00
Changelogs
03f0eae6f7 Automatic changelog compile [ci skip] 2022-02-02 00:31:30 +00:00
Changelogs
5599b43f3b Automatic changelog compile [ci skip] 2022-02-01 00:30:22 +00:00
CitadelStationBot
1bdac7efea Automatic changelog generation for PR #15490 [ci skip] 2022-01-31 18:24:20 -06:00
silicons
7a95fb03ff Merge pull request #15490 from SpiWat/patch-2
Tweenty --> Twenty
2022-01-31 17:24:17 -07:00
SpiWat
386a7480a7 Tweenty -> Twenty
Spelling.
2022-01-31 19:12:00 -05:00
BlueWildrose
a6237d41fa Rachnidian: r -> c 2022-01-31 01:55:39 -07:00
BlueWildrose
674dbaac1e Neo-kanji: k -> j 2022-01-31 01:55:10 -07:00
BlueWildrose
8cb9f17f1e Dwarvish: D -> w 2022-01-31 01:54:49 -07:00
BlueWildrose
1d2b30d07d sylvan language now speakable for real 2022-01-31 01:40:37 -07:00
Changelogs
e75bc8ff14 Automatic changelog compile [ci skip] 2022-01-30 00:29:44 +00:00
Changelogs
609b3898bd Automatic changelog compile [ci skip] 2022-01-29 00:27:07 +00:00
CitadelStationBot
1d4c3661f2 Automatic changelog generation for PR #15483 [ci skip] 2022-01-28 04:37:05 -06:00
silicons
45662dae6f Merge pull request #15483 from Arturlang/paperSheet
Fixes linter errors && PaperSheet not working
2022-01-28 02:37:01 -08:00
Changelogs
23fccc0ed6 Automatic changelog compile [ci skip] 2022-01-28 00:28:40 +00:00
CitadelStationBot
f5e57e7f49 Automatic changelog generation for PR #15477 [ci skip] 2022-01-27 18:06:25 -06:00
Lin
ba17f7180a Merge pull request #15477 from DeltaFire15/hunt-for-that-one-beaker
Certain reagents are once again invalid for blood dna relaying and therefore podcloning / decal detscanning.
2022-01-28 00:06:22 +00:00
CitadelStationBot
33f68d4cf5 Automatic changelog generation for PR #15479 [ci skip] 2022-01-27 17:51:09 -06:00
Lin
9cb86d3c79 Merge pull request #15479 from SpiWat/patch-1
The book has 10 pagess remaining.
2022-01-27 23:51:07 +00:00
Artur
8a4e12500c Fixes linter errors && PaperSheet not working 2022-01-27 19:49:14 +02:00
Changelogs
2b1964e460 Automatic changelog compile [ci skip] 2022-01-27 00:28:55 +00:00
Changelogs
f1ecf50f0f Automatic changelog compile [ci skip] 2022-01-26 00:32:51 +00:00
CitadelStationBot
3fc7b5281a Automatic changelog generation for PR #15317 [ci skip] 2022-01-25 02:07:04 -06:00
silicons
9205545d16 Merge pull request #15317 from LetterN/what-should-i-name-this-branch
TGUI hardsync & stuff
2022-01-25 00:06:59 -08:00
SpiWat
45c7ec0fdb The book has 10 pagess remaining. 2022-01-24 20:39:52 -05:00
Changelogs
2fbd384cac Automatic changelog compile [ci skip] 2022-01-25 00:31:49 +00:00
CitadelStationBot
51d3c15891 Automatic changelog generation for PR #15478 [ci skip] 2022-01-24 15:20:34 -06:00
Lin
f94d5b4436 Merge pull request #15478 from Putnam3145/tastes
Various chem tweaks
2022-01-24 21:20:31 +00:00
Putnam3145
07bd8437da I missed a couple 2022-01-22 17:04:18 -08:00
Putnam3145
a408957bc6 Various chem tweaks 2022-01-22 16:40:05 -08:00
Changelogs
b9c1deb907 Automatic changelog compile [ci skip] 2022-01-23 00:28:46 +00:00
CitadelStationBot
d1644f17c3 Automatic changelog generation for PR #15430 [ci skip] 2022-01-22 15:59:15 -06:00
silicons
f601580854 Merge pull request #15430 from DeltaFire15/synth-coolant
Synth stuff : Balancing Nightmare Edition (aka, coolant)
2022-01-22 13:59:12 -08:00
DeltaFire
4aa0332e99 no. 2022-01-22 19:38:02 +01:00
DeltaFire
e7ed288cc2 finishing touches
suitlinking now tells you on examining the cooling system readout.
miner gear suitlinking only works on the lavaland z.
corruption has a medium-severity readout jamming event added to the pool.
integrating coolant only counts as 40% of its volume for cooling efficiency purposes and is capped at adding at most 25% of current blood volume to cooling efficiency calculations.
2022-01-22 18:34:54 +01:00
LetterN
d6803d2eeb yarn moment 2022-01-22 20:44:29 +08:00
LetterN
7e326ed947 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-22 20:42:55 +08:00
silicons
f3332f8607 Merge pull request #15470 from Putnam3145/trit-messed-up
Fixes trit/hydrogen fires to have right products
2022-01-22 04:38:11 -08:00
CitadelStationBot
efb26ee532 Automatic changelog generation for PR #15449 [ci skip] 2022-01-22 06:35:01 -06:00
silicons
f85d0dbda0 Merge pull request #15449 from Putnam3145/gib-podpeople
Allows pod people to be made using other fluids
2022-01-22 04:34:59 -08:00
CitadelStationBot
afd1147e3a Automatic changelog generation for PR #15419 [ci skip] 2022-01-22 06:34:44 -06:00
silicons
a7993cd916 Merge pull request #15419 from Putnam3145/funny-atmos-event
Adds an event that speeds up/slows down atmos
2022-01-22 04:34:42 -08:00