Commit Graph

42121 Commits

Author SHA1 Message Date
silicons
af540ba4ef Merge pull request #14469 from timothyteakettle/puddles-2-electric-boogaloo
fixes puddles breaking
2021-03-20 14:30:10 -06:00
CitadelStationBot
1d9f074507 Automatic changelog generation for PR #14436 [ci skip] 2021-03-20 15:29:43 -05:00
silicons
74e26f7a0c Merge pull request #14436 from Putnam3145/supermatter-surge-rebalance
Buffed supermatter surge to make it up to 50x as strong as before.
2021-03-20 14:29:40 -06:00
CitadelStationBot
f41f69ccfa Automatic changelog generation for PR #14464 [ci skip] 2021-03-20 15:28:43 -05:00
silicons
e433aaf881 Merge pull request #14464 from GrayRachnid/filter
Enables the in character filter for server configuration
2021-03-20 14:28:40 -06:00
CitadelStationBot
6fa99c22e6 Automatic changelog generation for PR #14461 [ci skip] 2021-03-20 15:28:35 -05:00
silicons
6491615775 Merge pull request #14461 from Hatterhat/violent-cafe
removes pacifism from ghost cafe
2021-03-20 14:28:33 -06:00
CitadelStationBot
a94f304b52 Automatic changelog generation for PR #14458 [ci skip] 2021-03-20 15:28:28 -05:00
silicons
7bd2727d58 Merge pull request #14458 from GrayRachnid/particle-defender
Buffs the Warden's Particle defender to something that isn't pure dumpster trash
2021-03-20 14:28:26 -06:00
CitadelStationBot
e4f2e43701 Automatic changelog generation for PR #14457 [ci skip] 2021-03-20 15:28:10 -05:00
silicons
a1c4323653 Merge pull request #14457 from GrayRachnid/holopads
Fixes the bug that allows anybody(other than heads) to auto-call holopads and adds secure holopads.
2021-03-20 14:28:07 -06:00
CitadelStationBot
cd20cb85dc Automatic changelog generation for PR #14465 [ci skip] 2021-03-20 02:30:39 -05:00
silicons
1b622af5e7 Merge pull request #14465 from The-Sun-In-Splendour/fix-post-absorb-revive
Fixes post absorb revive
2021-03-20 01:30:37 -06:00
CitadelStationBot
d49f6e48ac Automatic changelog generation for PR #14400 [ci skip] 2021-03-20 02:08:50 -05:00
silicons
013560c064 Merge pull request #14400 from LetterN/art-art-art
Map addition & cleanups
2021-03-20 01:08:47 -06:00
Lin
a9a5bdc61a Merge pull request #14471 from Citadel-Station-13/silicons-patch-9
fixes being able to reach into closed bodybags (couldn't webedit 2 files in one PR without being not lazy)
2021-03-19 21:08:39 -05:00
Lin
9e06bafcfb Merge pull request #14470 from Citadel-Station-13/silicons-patch-8
no more bluespace bodybag of shotgun shells in pocket
2021-03-19 21:08:34 -05:00
Lin
51b955d47e Merge pull request #14460 from Hatterhat/exp-sup-con
moves the express supply console and upgrade disk to appropriate tabs
2021-03-19 19:18:19 -05:00
Changelogs
d1cf054a0e Automatic changelog compile [ci skip] 2021-03-20 00:14:29 +00:00
CitadelStationBot
4d1d3837cd Automatic changelog generation for PR #14462 [ci skip] 2021-03-19 18:52:19 -05:00
Lin
9941b5288b Merge pull request #14462 from Hatterhat/bsbeaker
adds a missing icon state for bluespace beaker filling
2021-03-19 18:52:17 -05:00
silicons
418532e3a9 Merge pull request #14474 from Citadel-Station-13/dependabot/pip/tools/pillow-8.1.1
Bump pillow from 7.2.0 to 8.1.1 in /tools
2021-03-19 14:32:31 -06:00
dependabot[bot]
8432f095f8 Bump pillow from 7.2.0 to 8.1.1 in /tools
Bumps [pillow](https://github.com/python-pillow/Pillow) from 7.2.0 to 8.1.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/7.2.0...8.1.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-03-19 16:09:09 +00:00
Changelogs
5e6122e554 Automatic changelog compile [ci skip] 2021-03-19 00:14:43 +00:00
silicons
1f58e1823e Update bodybag.dm 2021-03-18 17:00:16 -07:00
silicons
d434f60cb3 Update closets.dm 2021-03-18 16:59:03 -07:00
Timothy Teakettle
71d5528959 fix 2021-03-18 21:50:03 +00:00
CitadelStationBot
3afd1bbf03 Automatic changelog generation for PR #14444 [ci skip] 2021-03-18 07:41:41 -05:00
silicons
8c97297a47 Merge pull request #14444 from DeltaFire15/jar-removal
Locks Bluespace Jars to be admin-only
2021-03-18 06:41:38 -06:00
CitadelStationBot
0dc00784a8 Automatic changelog generation for PR #14442 [ci skip] 2021-03-18 07:40:53 -05:00
silicons
f6f2c27e90 Merge pull request #14442 from SandPoot/master
Adds the skirt variant of the "Tactitool Turtleneck" to the loadout
2021-03-18 06:40:51 -06:00
CitadelStationBot
3edcdf15db Automatic changelog generation for PR #14456 [ci skip] 2021-03-18 07:39:50 -05:00
silicons
3e8fcfe72a Merge pull request #14456 from Putnam3145/antag_pref
Added a "no antags please" pref
2021-03-18 06:39:48 -06:00
silicons
bb03d4ff41 Merge pull request #14446 from The-Sun-In-Splendour/secciejacket
shameless buff to sec jacket
2021-03-18 06:39:24 -06:00
CitadelStationBot
0be7ad78ac Automatic changelog generation for PR #14451 [ci skip] 2021-03-18 07:39:17 -05:00
silicons
f39cac6a46 Merge pull request #14451 from zeroisthebiggay/patch-5
fixes spriteless heretic book
2021-03-18 06:39:15 -06:00
CitadelStationBot
8ae79c09d1 Automatic changelog generation for PR #14391 [ci skip] 2021-03-18 07:38:43 -05:00
silicons
e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
Ludox
828cfaf58a Cellular Emporium is gone 🦀
Prevents you from seeing cellular emporium despite not being able to use it (Post-absorb)
2021-03-18 04:32:33 +01:00
GrayRachnid
5201cf6ac5 stops racism 2021-03-17 21:58:41 -04:00
Ludox
fca5ede923 Shitcode has arrived 2021-03-18 02:32:54 +01:00
The-Sun-In-Splendour
6a09b749b3 Merge pull request #1 from Citadel-Station-13/master
d
2021-03-18 01:24:28 +01:00
Changelogs
d64d0dad54 Automatic changelog compile [ci skip] 2021-03-18 00:14:44 +00:00
CitadelStationBot
246546570c Automatic changelog generation for PR #14448 [ci skip] 2021-03-17 16:32:14 -05:00
Lin
f3fb22a2ab Merge pull request #14448 from Arturlang/give_fixes
Literally just adds targets to give because i forgot to do that
2021-03-17 16:32:11 -05:00
Hatterhat
361acfd904 beaker fix 2021-03-17 16:15:38 -05:00
Hatterhat
dd44ebae46 peak funny 2021-03-17 16:10:32 -05:00
Hatterhat
5fa06109ac lemme get uh 2021-03-17 15:49:57 -05:00
GrayRachnid
1f668a0473 lowers number of shots back to 8 from 10 2021-03-17 14:11:50 -04:00
GrayRachnid
679d00f787 rebalances after further testing 2021-03-17 13:48:21 -04:00