Commit Graph

38257 Commits

Author SHA1 Message Date
EmeraldSundisk
d47519c3fe and digi 2020-09-27 10:32:31 -07:00
EmeraldSundisk
f07ea6f7a1 pain 2020-09-27 10:25:12 -07:00
EmeraldSundisk
48b8ea2b19 agony 2020-09-27 10:24:54 -07:00
EmeraldSundisk
7f0834608e Merge pull request #65 from EmeraldSundisk/Citadel-Station-13-master
Citadel station 13 master
2020-09-27 10:09:12 -07:00
EmeraldSundisk
0c1e3fac2d Revert "DIGI"
This reverts commit 360b2131bc.
2020-09-27 10:08:30 -07:00
EmeraldSundisk
ae73055d50 Revert "FUCK"
This reverts commit b23f90b4a1.
2020-09-27 10:07:03 -07:00
EmeraldSundisk
85f7cd6a89 Revert "DIGIFIX"
This reverts commit 865ef8d06f.
2020-09-27 10:06:54 -07:00
EmeraldSundisk
9adcb1fe19 Revert "ICONS"
This reverts commit 92ecf6c0d2.
2020-09-27 10:05:08 -07:00
EmeraldSundisk
376e0a9a25 Revert "FINAL"
This reverts commit a70c71b72c.
2020-09-27 10:05:00 -07:00
EmeraldSundisk
aa9a8d7970 Merge pull request #64 from Citadel-Station-13/master
9/27
2020-09-27 10:02:50 -07:00
CitadelStationBot
1e8b8df596 Automatic changelog generation for PR #13439 [ci skip] 2020-09-27 02:37:09 -05:00
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
Putnam3145
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
Tupinambis
63c24e31b1 fixes a 5 year old hex value bug 2020-09-26 00:14:32 -05:00
LetterJay
4ce4cd3ed1 Merge pull request #13435 from Citadel-Station-13/halohair
Fixes missing hair when wearing halo
2020-09-25 22:07:36 -05:00
timothyteakettle
04a7c66561 fix turret removal 2020-09-26 01:38:04 +01:00
Changelogs
2ad1ca9ea2 Automatic changelog compile [ci skip] 2020-09-26 00:14:41 +00:00