Commit Graph
42109 Commits
Author SHA1 Message Date
LetterN 123dfd8eda map men map men map map map men men men 2021-03-24 21:31:06 +08:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
CitadelStationBot cd20cb85dc Automatic changelog generation for PR #14465 [ci skip] 2021-03-20 02:30:39 -05:00
siliconsandGitHub 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
siliconsandGitHub 013560c064 Merge pull request #14400 from LetterN/art-art-art
Map addition & cleanups
2021-03-20 01:08:47 -06:00
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
siliconsandGitHub 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]andGitHub 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
siliconsandGitHub 1f58e1823e Update bodybag.dm 2021-03-18 17:00:16 -07:00
siliconsandGitHub d434f60cb3 Update closets.dm 2021-03-18 16:59:03 -07:00
CitadelStationBot 3afd1bbf03 Automatic changelog generation for PR #14444 [ci skip] 2021-03-18 07:41:41 -05:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 3e8fcfe72a Merge pull request #14456 from Putnam3145/antag_pref
Added a "no antags please" pref
2021-03-18 06:39:48 -06:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
Ludox fca5ede923 Shitcode has arrived 2021-03-18 02:32:54 +01:00
The-Sun-In-SplendourandGitHub 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
LinandGitHub 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 5fa06109ac lemme get uh 2021-03-17 15:49:57 -05:00
CitadelStationBot fe9c36e069 Automatic changelog generation for PR #14406 [ci skip] 2021-03-17 11:01:54 -05:00
DeltaFireandGitHub 45c3f2b222 Merge pull request #14406 from Hatterhat/hypoprints
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
2021-03-17 17:01:47 +01:00
Hatterhat 97e0e01265 ok 2021-03-17 03:25:06 -05:00
Putnam f3ea1b1a0c Relabeled to "Antag"; unambiguized in 2021-03-16 22:53:55 -07:00
Putnam d990328e29 Added a "no antags please" button 2021-03-16 22:37:39 -07:00
SandPootandGitHub 6bf711d7ec Update syndicate.dm 2021-03-16 22:54:59 -03:00
LinandGitHub 40fb1f2a0b Merge pull request #14445 from Citadel-Station-13/silicons-patch-7
ghost swords now properly set force instead of just working on mobs
2021-03-16 20:48:10 -05:00
Changelogs 400485c527 Automatic changelog compile [ci skip] 2021-03-17 00:14:31 +00:00
zeroisthebiggayandGitHub 7f1b0e388c Update eldritch_book.dm 2021-03-16 18:22:13 -04:00
CitadelStationBot 4053758828 Automatic changelog generation for PR #14347 [ci skip] 2021-03-16 14:32:01 -05:00
DeltaFireandGitHub b105a3c831 Merge pull request #14347 from timothyteakettle/language-tab
the speech panel pr
2021-03-16 20:31:58 +01:00
kiwedespars 158008b80f maybe too big a buff 2021-03-16 11:05:49 -07:00
kiwedespars 1886bef04e changes
- void blade requires colder temps
- boogie woogie fueltank swap
- sicklebreak buff
- big domain expansion buff
- grasping carving nerf
- clamps silence maybe
2021-03-16 03:23:18 -07:00
Artur fe218150f0 Literally just adds targets to give because i forgot to do that 2021-03-16 11:48:21 +02:00