Commit Graph

41747 Commits

Author SHA1 Message Date
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
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
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
CitadelStationBot 30cf91be16 Automatic changelog generation for PR #14362 [ci skip] 2021-03-03 20:50:10 -06:00
silicons 5c865aef0b Merge pull request #14362 from Putnam3145/disable-minesweeper
[s] Massively reduced max-size minesweeper
2021-03-03 19:50:07 -07:00
Putnam 2137818d76 Massively reduced max-size minesweeper 2021-03-03 18:42:35 -08:00
Changelogs f88fdd15b2 Automatic changelog compile [ci skip] 2021-03-04 00:13:57 +00:00
CitadelStationBot c0d62c4969 Automatic changelog generation for PR #14270 [ci skip] 2021-03-03 01:53:48 -06:00
silicons 8989394742 Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
2021-03-03 00:53:46 -07:00
Letter N 889802a376 a 2021-03-03 14:16:36 +08:00
Letter N 4b62633fd8 a 2021-03-03 14:11:38 +08:00
Hatterhat fcdebd7d63 lets get it 2021-03-02 23:19:45 -06:00
Hatterhat c02cf7d551 funny trauma announce 2021-03-02 22:35:08 -06:00
Hatterhat 532342ef81 the one where i haphazardly replace a sprite 2021-03-02 20:59:20 -06:00
keronshb b105556603 No Superconductivity with Reinforced Plasma Glass
Removes heat going through RPlasma Glass
2021-03-02 21:45:36 -05:00
dzahlus 594aa9b3c0 sorry no funny taser 2021-03-03 01:34:19 +01:00
Changelogs d8196613da Automatic changelog compile [ci skip] 2021-03-03 00:14:17 +00:00
CitadelStationBot 041961a110 Automatic changelog generation for PR #14344 [ci skip] 2021-03-02 17:57:28 -06:00
silicons 824f346763 Merge pull request #14344 from qweq12yt/pacifist-flamethrower-fix
[FIX] More pacifism bug squashing
2021-03-02 16:57:26 -07:00
Lin 195d05b051 Merge pull request #14343 from Hatterhat/thanks-jay
no more nt chokers society has progressed past the need for nt chokers
2021-03-02 15:09:39 -06:00
Putnam 235f916c61 Makes ash storm volume quieter. 2021-03-02 12:32:14 -08:00
keronshb 901181125e Merge remote-tracking branch 'upstream/master' 2021-03-02 13:52:06 -05:00
dzahlus d214392a9c Update rechargable.dm 2021-03-02 18:18:23 +01:00
dzahlus a168f79287 god i hate byond sound engine 2021-03-02 18:14:58 +01:00
timothyteakettle f0d219e999 Update pet_carrier.dm 2021-03-02 14:26:53 +00:00
timothyteakettle a5c17eead4 Update pet_carrier.dm 2021-03-02 14:25:44 +00:00
Letter N 6514f4034c a 2021-03-02 12:57:26 +08:00
Letter N 364381937f fix+disallows admins rigging votes 2021-03-02 10:18:30 +08:00
Letter N 1fdb7fd639 cleanup 2021-03-02 09:49:49 +08:00
CitadelStationBot 0d7b25dec6 Automatic changelog generation for PR #14324 [ci skip] 2021-03-01 19:42:30 -06:00
silicons 1d8533c1cd Merge pull request #14324 from dzahlus/ash-drake-transform-powergaming
Changes to ash drake transformation
2021-03-01 18:42:28 -07:00
dzahlus ca1fe9d6c0 Update shapeshift.dm
for keb
2021-03-02 02:40:23 +01:00
CitadelStationBot 482e8c63e8 Automatic changelog generation for PR #14290 [ci skip] 2021-03-01 19:35:39 -06:00
silicons b5bb90ecf8 Merge pull request #14290 from SandPoot/properlegioninheritance
Legions pass their type to the mob they infect
2021-03-01 18:35:37 -07:00
silicons 7af3c986ad Merge pull request #14328 from R3dtail/patch-3
Makes Clownification Less Abysmal :honk:
2021-03-01 18:32:29 -07:00
CitadelStationBot 253c8c4fde Automatic changelog generation for PR #14342 [ci skip] 2021-03-01 19:31:28 -06:00
silicons 6c6ebb3002 Merge pull request #14342 from MarinaGryphon/patch-1
Fixes #14341
2021-03-01 18:31:25 -07:00
CitadelStationBot 159dd3988c Automatic changelog generation for PR #14295 [ci skip] 2021-03-01 19:30:30 -06:00