Commit Graph

41828 Commits

Author SHA1 Message Date
R3dtail 25651e9144 Readability/Grammar alteration 2021-03-09 14:38:24 -06:00
silicons 3693eb1f16 Merge pull request #14374 from SandPoot/don't-litter-please
Makes it so you don't drop cans upon crushing them
2021-03-09 00:20:43 -07:00
silicons 9110ebcac1 Merge pull request #14375 from Putnam3145/repeated-mode-adjust-buff
Allows repeated mode adjust to be >100 total
2021-03-09 00:20:29 -07:00
CitadelStationBot 0b2156ab3d Automatic changelog generation for PR #14358 [ci skip] 2021-03-09 01:18:44 -06:00
silicons 58b69786c8 Merge pull request #14358 from Hatterhat/femur-breakies
femur breaker actually breaks legs any%
2021-03-09 00:18:41 -07:00
CitadelStationBot 67f3998920 Automatic changelog generation for PR #14351 [ci skip] 2021-03-09 01:17:49 -06:00
silicons 34c4887b69 Merge pull request #14351 from Putnam3145/teg-uncap
Uncaps TEG output
2021-03-09 00:17:47 -07:00
Changelogs f8440492cb Automatic changelog compile [ci skip] 2021-03-09 00:14:11 +00:00
CitadelStationBot 457077770e Automatic changelog generation for PR #14234 [ci skip] 2021-03-07 23:36:48 -06:00
silicons f12de77a19 Merge pull request #14234 from LetterN/hardsync-1.5
TG Hardsync 1.5
2021-03-07 22:36:43 -07:00
Letter N de6f1401bb final fix 2021-03-08 13:24:28 +08:00
Putnam a651b629c9 Allows repeated mode adjust to be >100 total 2021-03-07 19:28:50 -08:00
SandPoot 80cb870311 upload drinks.dm 2021-03-07 21:39:10 -03:00
Letter N 8c3c259850 pepegasort 2021-03-07 14:11:09 +08:00
Letter N 22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
Changelogs 6606a15367 Automatic changelog compile [ci skip] 2021-03-07 00:14:50 +00:00
CitadelStationBot ac1dcaf167 Automatic changelog generation for PR #14361 [ci skip] 2021-03-06 18:00:26 -06:00
silicons 87c7487344 Merge pull request #14361 from Putnam3145/hyper-nob-easier
Makes hyper-nob, nitryl easier to make
2021-03-06 17:00:24 -07:00
CitadelStationBot ccbdcd583b Automatic changelog generation for PR #14360 [ci skip] 2021-03-06 18:00:17 -06:00
silicons 06f6a7eb46 Merge pull request #14360 from Hatterhat/pipegun
pipe shotgun reskins
2021-03-06 17:00:15 -07:00
CitadelStationBot 3052d3bbf7 Automatic changelog generation for PR #14359 [ci skip] 2021-03-06 18:00:12 -06:00
silicons 4fdaf10049 Merge pull request #14359 from Hatterhat/traumannounce
funny trauma announce
2021-03-06 17:00:10 -07:00
CitadelStationBot 740cb6cb89 Automatic changelog generation for PR #14357 [ci skip] 2021-03-06 18:00:04 -06:00
silicons 0039055cd5 Merge pull request #14357 from Hatterhat/cat-tail-2
the one where i haphazardly replace a sprite - replaces cat tail sprite with EikoBiko's
2021-03-06 17:00:01 -07:00
CitadelStationBot 60f5e7af63 Automatic changelog generation for PR #14353 [ci skip] 2021-03-06 17:59:48 -06:00
silicons 21905f45f3 Merge pull request #14353 from dzahlus/small-big-iron-on-his-hip-in-his-pocket
MWS-01 Changes
2021-03-06 16:59:46 -07:00
Letter N 2de08b7bae lateinit mayhaps? 2021-03-06 20:01:14 +08:00
Letter N 4482453067 dihydrogen 2021-03-06 19:56:19 +08:00
Letter N 4463fd9513 paperwork mini update, also ASS_BLAST_USA 2021-03-06 19:28:29 +08:00
Letter N 709aaa5006 NEW() moment 2021-03-06 13:28:57 +08:00
Letter N e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
CitadelStationBot f6a3ca1cef Automatic changelog generation for PR #14352 [ci skip] 2021-03-05 20:50:37 -06:00
DeltaFire 357853863e Merge pull request #14352 from timothyteakettle/jar-nerf
exiting a bluespace jar through any means, hardstuns you for 5 seconds
2021-03-06 03:50:35 +01:00
DeltaFire 483790889c Merge pull request #14312 from Citadel-Station-13/silicons-patch-20
makes codebase compile on 514 (wow one line)
2021-03-06 03:41:59 +01:00
Letter N a43309a097 shuttle pog 2021-03-05 22:26:55 +08:00
Letter N c624c3ae14 economical inflation 2021-03-05 20:00:45 +08:00
Letter N 34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N 4f8d6c7c11 bruh 2021-03-05 17:21:22 +08:00
Letter N e967590dfa fix verb 2021-03-05 17:17:30 +08:00
Letter N edfe7220c4 lintfix 2021-03-05 15:45:57 +08:00
Letter N 2542fe05e9 mapmerge update + mats properly work 2021-03-05 15:38:35 +08:00
Letter N a0020c6fdf e 2021-03-05 14:51:00 +08:00
Letter N ada309185b shh 2021-03-05 14:41:15 +08:00
Letter N cb346a3847 a 2021-03-05 14:29:36 +08:00
Changelogs c4eebe56a5 Automatic changelog compile [ci skip] 2021-03-05 00:14:21 +00:00
CitadelStationBot 39320c3086 Automatic changelog generation for PR #14354 [ci skip] 2021-03-04 13:32:32 -06:00
Lin cf048e1f65 Merge pull request #14354 from Putnam3145/volume-change
Makes ash storm volume quieter
2021-03-04 13:32:29 -06:00
CitadelStationBot c96b3b77c7 Automatic changelog generation for PR #14356 [ci skip] 2021-03-04 11:33:48 -06:00
Putnam3145 43d66e90b7 Merge pull request #14356 from keronshb/RPlasmaTweak
Removes Superconuctivity from Reinforced Plasma Glass
2021-03-04 09:33:45 -08:00
Letter N 41f2e427a6 a 2021-03-04 22:23:30 +08:00