Commit Graph
38243 Commits
Author SHA1 Message Date
Tupinambis 0bb889932d Completed! 2020-09-30 19:05:56 -05:00
Tupinambis a3a5fe4c2d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into spooder 2020-09-30 16:07:21 -05:00
Tupinambis 8828440575 fix 2020-09-30 16:06:56 -05:00
Tupinambis 113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
siliconsandGitHub 28ea9cc91c Merge pull request #13469 from Citadel-Station-13/revert-13436-worse-idea
Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA"
2020-09-30 11:54:52 -07:00
CitadelStationBot 0a64b35d1c Automatic changelog generation for PR #13416 [ci skip] 2020-09-30 11:22:28 -05:00
siliconsandGitHub 9f3b456583 Merge pull request #13416 from BlueWildrose/slimenoises
Unique slimeperson screams and laughter, and adds new customizable speech verbs
2020-09-30 09:22:25 -07:00
Changelogs 56e4205d2d Automatic changelog compile [ci skip] 2020-09-30 00:15:26 +00:00
ZandarioandGitHub 9104e2c041 Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA" 2020-09-29 15:40:12 -05:00
Changelogs 924c866e8d Automatic changelog compile [ci skip] 2020-09-29 00:15:19 +00:00
CitadelStationBot 0da65793b3 Automatic changelog generation for PR #13462 [ci skip] 2020-09-28 16:23:06 -05:00
ZandarioandGitHub aca490f7a9 Merge pull request #13462 from timothyteakettle/eye-typo
fixes a typo causing your right eye colour to save as the left eye colour
2020-09-28 16:23:02 -05:00
Timothy Teakettle 783c33067b typo moment 2020-09-28 22:13:33 +01:00
Changelogs 2a765b7633 Automatic changelog compile [ci skip] 2020-09-28 00:15:20 +00:00
CitadelStationBot 1e8b8df596 Automatic changelog generation for PR #13439 [ci skip] 2020-09-27 02:37:09 -05:00
siliconsandGitHub 7300ab26e3 Merge pull request #13439 from Tupinambis/polywantabugfix
Fixes a 5+ year old bug with ghost poly's hex value that potentially causes runtimes and crashes.
2020-09-27 00:37:06 -07:00
CitadelStationBot f38702ca2d Automatic changelog generation for PR #13437 [ci skip] 2020-09-27 02:35:10 -05:00
siliconsandGitHub 4d82c219f5 Merge pull request #13437 from timothyteakettle/turret-fix
turrets will now break instead of magically poofing out of existence
2020-09-27 00:35:06 -07:00
CitadelStationBot ff96a3236d Automatic changelog generation for PR #13436 [ci skip] 2020-09-27 02:34:53 -05:00
siliconsandGitHub 5b71d84486 Merge pull request #13436 from Putnam3145/worse-idea
C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA
2020-09-27 00:34:50 -07:00
CitadelStationBot c5d54dafce Automatic changelog generation for PR #13432 [ci skip] 2020-09-27 02:33:17 -05:00
siliconsandGitHub 9fc169a3ae Merge pull request #13432 from SiliconMain/patch-6
Tweaks a thing
2020-09-27 00:33:14 -07:00
CitadelStationBot 0f3e6ca942 Automatic changelog generation for PR #13427 [ci skip] 2020-09-27 02:18:16 -05:00
siliconsandGitHub 511dfa84c0 Merge pull request #13427 from Trilbyspaceclone/booze
More animated drinks
2020-09-27 00:18:12 -07:00
CitadelStationBot 14765f085d Automatic changelog generation for PR #13424 [ci skip] 2020-09-27 02:16:48 -05:00
siliconsandGitHub 987cfc7582 Merge pull request #13424 from Putnam3145/fix-cryo-objective-bull
Makes cryo pods no longer replace already-won objectives.
2020-09-27 00:16:45 -07:00
CitadelStationBot 0a986f6efd Automatic changelog generation for PR #13421 [ci skip] 2020-09-27 02:15:44 -05:00
siliconsandGitHub 2b5a166425 Merge pull request #13421 from raspy-on-osu/teg-finale
alters the TEG's logistic power generation
2020-09-27 00:15:41 -07:00
CitadelStationBot 29c69a44b9 Automatic changelog generation for PR #13420 [ci skip] 2020-09-27 02:13:56 -05:00
siliconsandGitHub e699f32a3b Merge pull request #13420 from thakyZ/lightreplacer-change
Light replacer can print at Engineering
2020-09-27 00:13:50 -07:00
CitadelStationBot ee34de4cb1 Automatic changelog generation for PR #13419 [ci skip] 2020-09-27 02:11:33 -05:00
siliconsandGitHub c17929e889 Merge pull request #13419 from Degirin2120/09/22/20_engi_hazard_jumpsuits
Adds engineering hazard jumpsuits
2020-09-27 00:11:30 -07:00
CitadelStationBot 98b5bec342 Automatic changelog generation for PR #13415 [ci skip] 2020-09-27 02:11:02 -05:00
siliconsandGitHub 441d8de7aa Merge pull request #13415 from Tupinambis/moresprite
Sprite Improvements! Jetpacks, TEG, Antimatter.
2020-09-27 00:10:58 -07:00
CitadelStationBot fd8acadf36 Automatic changelog generation for PR #13414 [ci skip] 2020-09-27 02:10:30 -05:00
siliconsandGitHub c6d7bc886f Merge pull request #13414 from Putnam3145/its-2-seconds-yall
Fixed an erroneous comment that may cause issues.
2020-09-27 00:10:26 -07:00
CitadelStationBot e38f8b95b0 Automatic changelog generation for PR #13413 [ci skip] 2020-09-27 02:10:15 -05:00
siliconsandGitHub f66c60884d Merge pull request #13413 from Putnam3145/fix-fuid-too-fast
Properly standardizes fuid production rate.
2020-09-27 00:10:12 -07:00
CitadelStationBot 58c7606ddf Automatic changelog generation for PR #13412 [ci skip] 2020-09-27 02:09:59 -05:00
siliconsandGitHub e602284bcb Merge pull request #13412 from Putnam3145/supermatter-bad
Removed the supermatter sabotage objective; reworked non-murder MI13 objective picking.
2020-09-27 00:09:56 -07:00
CitadelStationBot 0613951a17 Automatic changelog generation for PR #13411 [ci skip] 2020-09-27 02:09:21 -05:00
siliconsandGitHub 9c53bd24c6 Merge pull request #13411 from Tupinambis/sprite
Eris Chair Port and Bed Sprite Improvements
2020-09-27 00:09:18 -07:00
CitadelStationBot 5670ad1f99 Automatic changelog generation for PR #13397 [ci skip] 2020-09-27 02:03:46 -05:00
siliconsandGitHub 1092eacc6e Merge pull request #13397 from ArchieBeepBoop/microfans
Micro Powered Fans!
2020-09-27 00:03:43 -07:00
CitadelStationBot f9c7e1757f Automatic changelog generation for PR #13286 [ci skip] 2020-09-27 02:01:03 -05:00
siliconsandGitHub 00ab73d0a3 Merge pull request #13286 from timothyteakettle/heterochromia
heterochromia: you can select individual eye colours
2020-09-27 00:01:00 -07:00
Changelogs 9b0d1bcac3 Automatic changelog compile [ci skip] 2020-09-27 00:15:06 +00:00
CitadelStationBot c8d899adb4 Automatic changelog generation for PR #13433 [ci skip] 2020-09-26 13:27:35 -05:00
Putnam3145andGitHub 4314159ab3 Merge pull request #13433 from SiliconMain/patch-7
Makes holosigns uncontaminable
2020-09-26 11:27:33 -07:00
Tupinambis cd5b108627 Alpha 2020-09-26 12:47:11 -05:00