Commit Graph

20701 Commits

Author SHA1 Message Date
Coolgat3
674e8a4227 Glubbs 2019-05-30 18:59:43 +02:00
CitadelStationBot
0c644995a5 Automatic changelog generation for PR #8408 [ci skip] 2019-05-27 17:09:14 -05:00
kevinz000
aca63ebea3 Merge pull request #8408 from Ghommie/Ghommie-cit13
Fixing cult rounds potentially stalling if the sac target is erased from this realm.
2019-05-27 15:09:11 -07:00
CitadelStationBot
928450f34f Automatic changelog generation for PR #8439 [ci skip] 2019-05-27 16:08:54 -05:00
kevinz000
e8036a8a9b Merge pull request #8439 from Ghommie/Ghommie-cit18
stunbaton status rework.
2019-05-27 14:08:52 -07:00
CitadelStationBot
0f14ec188a Automatic changelog generation for PR #8443 [ci skip] 2019-05-27 16:08:06 -05:00
kevinz000
76314e463e Merge pull request #8443 from deathride58/stripfix
Item stripping no longer gets interrupted by changes in your actively held item
2019-05-27 14:08:04 -07:00
CitadelStationBot
c332807827 Automatic changelog generation for PR #8465 [ci skip] 2019-05-27 13:21:43 -05:00
kevinz000
f971cd6d96 Merge pull request #8465 from Useroth/magmags
[FIX] Magpistol magazines no longer invisible.
2019-05-27 11:21:40 -07:00
Useroth
4cb2468722 Magpistol magazines no longer invisible. 2019-05-27 12:42:17 +02:00
CitadelStationBot
1e7149afc7 Automatic changelog generation for PR #8404 [ci skip] 2019-05-27 05:31:51 -05:00
kevinz000
ff82569c6f Merge pull request #8404 from WhiteHusky/flavor-text-bugfix
Flavor text with special characters don't get partially unescaped
2019-05-27 03:31:49 -07:00
kevinz000
4be6b352e0 Merge pull request #8423 from Sishen1542/EngiShower3
Engineering Showers! (Fixed 4 REALZIES this time)
2019-05-27 03:31:16 -07:00
kevinz000
e0a0be9e4e Merge pull request #8440 from BurgerLUA/Sensor-Improvement
Improves Crew Monitoring Console Sorting
2019-05-27 03:30:39 -07:00
kevinz000
843bfc3a3e Merge pull request #8427 from CalamaBanana/quick-fix-for-importing-custom-colored-circuits
Removes color-whitelist blocking custom-colored circuit blueprints from being imported
2019-05-27 03:30:07 -07:00
CitadelStationBot
5d164a67cd Automatic changelog generation for PR #8437 [ci skip] 2019-05-27 05:29:04 -05:00
kevinz000
573f60fbc2 Merge pull request #8437 from Trilbyspaceclone/patch-138
[Ready] Adds more box crafting and white gloves to cloth
2019-05-27 03:29:01 -07:00
CitadelStationBot
57bce9b22b Automatic changelog generation for PR #8456 [ci skip] 2019-05-27 05:27:24 -05:00
kevinz000
45146b28c8 Merge pull request #8456 from Trilbyspaceclone/patch-151
suppressors now only cost 1 tc
2019-05-27 03:27:22 -07:00
CitadelStationBot
125a3a2d85 Automatic changelog generation for PR #8455 [ci skip] 2019-05-27 05:26:47 -05:00
kevinz000
433d6cae4b Merge pull request #8455 from Trilbyspaceclone/patch-150
Binary Translator Key costs 2 from 5
2019-05-27 03:26:45 -07:00
CitadelStationBot
77ef5e9feb Automatic changelog generation for PR #8454 [ci skip] 2019-05-27 05:26:28 -05:00
kevinz000
625901bfe3 Merge pull request #8454 from Trilbyspaceclone/patch-149
Adv Syndicate Surgery Duffel Bag tweaks
2019-05-27 03:26:26 -07:00
CitadelStationBot
0f8276fb7a Automatic changelog generation for PR #8448 [ci skip] 2019-05-27 05:25:58 -05:00
kevinz000
2f79f36a38 Merge pull request #8448 from Trilbyspaceclone/patch-143
Makes laser scatter shot cost 4 not 5
2019-05-27 03:25:56 -07:00
CitadelStationBot
10b03cdc7d Automatic changelog generation for PR #8460 [ci skip] 2019-05-27 05:24:50 -05:00
kevinz000
b718460cf6 Merge pull request #8460 from Trilbyspaceclone/patch-154
ultra clown fireing pins
2019-05-27 03:24:47 -07:00
CitadelStationBot
065105bd9f Automatic changelog generation for PR #8450 [ci skip] 2019-05-27 05:23:35 -05:00
kevinz000
e20206a6cb Merge pull request #8450 from Trilbyspaceclone/patch-145
Reduces FRAME cart by 2tc
2019-05-27 03:23:33 -07:00
Trilbyspaceclone
21ade7bb2c Update uplink_items.dm 2019-05-26 22:49:07 -04:00
Trilbyspaceclone
b28e374640 Update uplink_items.dm 2019-05-26 22:35:12 -04:00
Trilbyspaceclone
ea6b538d0b Update uplink_items.dm 2019-05-26 22:32:10 -04:00
Trilbyspaceclone
4138748616 Update uplink_items.dm 2019-05-26 22:29:55 -04:00
Trilbyspaceclone
a633d3202a It was 2019-05-26 22:22:31 -04:00
kevinz000
fa4e1f44ff Merge pull request #8438 from BurgerLUA/AssFix
Ass Fix
2019-05-26 19:19:13 -07:00
Trilbyspaceclone
5a0c7df824 Update uplink_items.dm 2019-05-26 21:59:01 -04:00
Trilbyspaceclone
06bacf3436 Update uplink_items.dm 2019-05-26 21:52:28 -04:00
Ghommie
37aa491fa5 removes emp downtime, Kev's request. 2019-05-27 02:30:03 +02:00
CitadelStationBot
33d40c0e94 Automatic changelog generation for PR #8435 [ci skip] 2019-05-26 19:23:07 -05:00
kevinz000
d4026d70ff Merge pull request #8435 from Ghommie/Ghommie-cit17
lazyinitlist on IAA targets stealing.
2019-05-26 17:23:05 -07:00
CitadelStationBot
81da063fa8 Automatic changelog generation for PR #8419 [ci skip] 2019-05-26 19:22:46 -05:00
kevinz000
e204cdc84e Merge pull request #8419 from UntoldTactics/Cult-Changes
Rewords Blood Cult 'offer' rune click here prompt.
2019-05-26 17:22:43 -07:00
deathride58
375965d731 Item stripping no longer gets interrupted by changes in your actively held item 2019-05-26 16:22:15 -04:00
BurgerLua
e3aaff68b7 Added 2019-05-26 00:34:37 -07:00
Ghommie
a47a7b31ba more leniency. 2019-05-26 06:56:02 +02:00
Ghommie
cfa53d53f1 updating old teleprods. 2019-05-26 06:49:58 +02:00
Ghommie
288f97dd13 further tweaking. 2019-05-26 06:38:04 +02:00
Ghommie
7289d8a999 tweaking. 2019-05-26 06:31:25 +02:00
BurgerLua
125db4c6b4 Added 2019-05-25 21:21:52 -07:00
Ghommie
9b2ab8fc2a 21 minutes sounds, I don't really wanna overly punish. 2019-05-26 05:21:17 +02:00