shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,703 Commits 5 Branches 0 Tags
9205545d16e8171fd4667acc827db09c5399f6c6
Commit Graph
45703 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
siliconsandGitHub 9205545d16 Merge pull request #15317 from LetterN/what-should-i-name-this-branch 
TGUI hardsync & stuff
 2022-01-25 00:06:59 -08: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
LinandGitHub 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
siliconsandGitHub 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 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
CitadelStationBot 0390e5e221 Automatic changelog generation for PR #15324 [ci skip] 2022-01-22 06:34:30 -06:00
siliconsandGitHub 2b726d7670 Merge pull request #15324 from Trilbyspaceclone/ashtree 
Ashen tree!
 2022-01-22 04:34:28 -08:00
Changelogs f02c54f31d Automatic changelog compile [ci skip] 2022-01-22 00:27:40 +00:00
Changelogs b0a2c983a0 Automatic changelog compile [ci skip] 2022-01-21 00:28:00 +00:00
Changelogs 4387c06efc Automatic changelog compile [ci skip] 2022-01-20 00:33:52 +00:00
LinandGitHub 35e6a5d59f Merge pull request #15473 from LetterN/revert-15468-dependabot/pip/tools/pillow-9.0.0 
Revert "Bump pillow from 8.3.2 to 9.0.0 in /tools"
 2022-01-18 07:28:55 +00:00
LetterN 7eb5e4a835 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-18 11:46:16 +08:00
Letter NandGitHub 023177cb45 Revert "Bump pillow from 8.3.2 to 9.0.0 in /tools" 2022-01-18 11:43:49 +08:00
Changelogs 3bf92703cc Automatic changelog compile [ci skip] 2022-01-18 00:32:02 +00:00
siliconsandGitHub 35c929287a Merge pull request #15471 from Citadel-Station-13/dependabot/npm_and_yarn/tgui/marked-4.0.10 
Bump marked from 2.0.3 to 4.0.10 in /tgui
 2022-01-15 17:39:03 -08:00
siliconsandGitHub 0d3ba30532 Merge pull request #15468 from Citadel-Station-13/dependabot/pip/tools/pillow-9.0.0 
Bump pillow from 8.3.2 to 9.0.0 in /tools
 2022-01-15 17:38:58 -08:00
Changelogs 3fd2208516 Automatic changelog compile [ci skip] 2022-01-16 00:32:33 +00:00
dependabot[bot]andGitHub 3771afdabd Bump marked from 2.0.3 to 4.0.10 in /tgui 
Bumps [marked](https://github.com/markedjs/marked) from 2.0.3 to 4.0.10.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v2.0.3...v4.0.10)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-15 02:39:28 +00:00
Changelogs fdb7fac057 Automatic changelog compile [ci skip] 2022-01-15 00:30:42 +00:00
Putnam3145 ece671087f Added a bit of enthalpy to tritium 2022-01-13 20:30:26 -08:00
Putnam3145 b1d05d4956 Fixes hydrogen fires to have right products 2022-01-13 20:25:53 -08:00
Changelogs ca5d388bc7 Automatic changelog compile [ci skip] 2022-01-14 00:31:04 +00:00
CitadelStationBot dfc439523d Automatic changelog generation for PR #15465 [ci skip] 2022-01-13 10:53:56 -06:00
LinandGitHub ad4df56506 Merge pull request #15465 from Putnam3145/supernova-rad-nerf 
Supernova rad storm tweaks
 2022-01-13 16:53:54 +00:00
CitadelStationBot 2d93037901 Automatic changelog generation for PR #15467 [ci skip] 2022-01-13 10:53:47 -06:00
LinandGitHub 1836134cca Merge pull request #15467 from Putnam3145/logging-for-container 
Added more logging for climax-in-container
 2022-01-13 16:53:43 +00:00
dependabot[bot]andGitHub 4db84cc664 Bump pillow from 8.3.2 to 9.0.0 in /tools 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.3.2...9.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 03:39:22 +00:00
Changelogs 65676ae59a Automatic changelog compile [ci skip] 2022-01-13 00:32:58 +00:00
Putnam3145 ef3e6923f8 Added more logging for climax-in-container 2022-01-11 17:39:50 -08:00
Changelogs d499ea1d9e Automatic changelog compile [ci skip] 2022-01-12 00:31:27 +00:00
Putnam3145 5f7ef21a7c More supernova tweaks 2022-01-10 21:56:48 -08:00
LetterN 958b0ef583 dupe defines bad 2022-01-11 10:01:35 +08:00
LetterN 18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
Changelogs 7bae2cdab3 Automatic changelog compile [ci skip] 2022-01-10 00:31:36 +00:00
HatterhatGitHubHatterhat
 		0077f682fd crusher gauntlets - resonator hitsound, sharpness to SHARP_NONE (#15458) 
* boo womp

* wrongsonator

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
 2022-01-09 18:46:48 +01:00
CitadelStationBot 91667debc7 Automatic changelog generation for PR #15398 [ci skip] 2022-01-09 10:23:51 -06:00
LinandGitHub d7cbb017f6 Fix few instances of bleeding white blood (#15398) 
* no longer bleed white blood

* parentheses man

* fix that one bdm map spawn too
 2022-01-09 17:23:48 +01:00
siliconsandGitHub 4de727ce6e Update SDQL_2.dm (#15462) 2022-01-09 16:59:29 +01:00