Commit Graph

36044 Commits

Author SHA1 Message Date
CitadelStationBot
ff306b7005 Automatic changelog generation for PR #12936 [ci skip] 2020-07-28 12:45:58 -05:00
silicons
cac1627d26 Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion
Ports RP flannel jackets and a winter coat
2020-07-28 10:45:54 -07:00
CitadelStationBot
4dce4521f4 Automatic changelog generation for PR #12941 [ci skip] 2020-07-28 12:45:35 -05:00
silicons
a5063a92b9 Merge pull request #12941 from timothyteakettle/alien-embeds-work
aliens can remove embeds now
2020-07-28 10:45:31 -07:00
CitadelStationBot
c820efcaf1 Automatic changelog generation for PR #12940 [ci skip] 2020-07-28 12:45:20 -05:00
silicons
b17a191aeb Merge pull request #12940 from necromanceranne/stunbaton_sprite_new
Ports #52320, Stun baton sprites by Sirich96, and new stunsword sprites
2020-07-28 10:45:16 -07:00
CitadelStationBot
936fec5175 Automatic changelog generation for PR #12950 [ci skip] 2020-07-28 12:15:20 -05:00
silicons
475d8ed6fb Merge pull request #12950 from timothyteakettle/species-are-dumb
tail wagging fix
2020-07-28 10:15:17 -07:00
Timothy Teakettle
72972e1659 some species code fixes 2020-07-28 17:56:50 +01:00
CitadelStationBot
229c7d05b6 Automatic changelog generation for PR #12945 [ci skip] 2020-07-27 21:21:19 -05:00
silicons
2ba01663e5 Merge pull request #12945 from timothyteakettle/jar-fixes
bluespace jar / pet carrier logic tweak so it works correctly
2020-07-27 19:21:16 -07:00
timothyteakettle
f36071bb64 wouldnt it be cool if i tested the small logic change 2020-07-28 03:09:07 +01:00
Changelogs
3bb61e5f53 Automatic changelog compile [ci skip] 2020-07-28 00:11:02 +00:00
Timothy Teakettle
8d9c94c087 aliens can remove embeds now 2020-07-27 17:59:05 +01:00
CitadelStationBot
a4cc3d6030 Automatic changelog generation for PR #12862 [ci skip] 2020-07-27 11:46:40 -05:00
Lin
87eac49bbf Merge pull request #12862 from Citadel-Station-13/silicons-patch-44
you can now shoot yourself with a gun by using disarm intent will this cause balance issues maybe do i care not really
2020-07-27 11:46:37 -05:00
CitadelStationBot
2e63621de3 Automatic changelog generation for PR #12900 [ci skip] 2020-07-27 11:43:35 -05:00
Lin
2514f4111d Merge pull request #12900 from Citadel-Station-13/silicons-patch-53
drops 1.5 second taser alt fire delay to normal fire rate (0.4 seconds)
2020-07-27 11:43:31 -05:00
CitadelStationBot
533bf331e2 Automatic changelog generation for PR #12898 [ci skip] 2020-07-27 11:39:32 -05:00
Lin
f49b79db00 Merge pull request #12898 from Citadel-Station-13/silicons-patch-52
adds polychromatic cloaks to loadout
2020-07-27 11:39:28 -05:00
Lin
ea861148b9 Merge pull request #12822 from Citadel-Station-13/silicons-patch-37
experimental change (testmerge this!): going from a higher slowdown to a lower slowdown will immediately allow you to move at the lower slowdown
2020-07-27 11:33:04 -05:00
necromanceranne
e9cee24608 Updates the stunbaton sprites 2020-07-28 02:01:10 +10:00
CitadelStationBot
f9265c6b5e Automatic changelog generation for PR #12888 [ci skip] 2020-07-27 08:27:10 -05:00
Ghom
4fad4ad969 Merge pull request #12888 from Citadel-Station-13/silicons-patch-50
sorry gamers, no more self healing with a medbeam
2020-07-27 15:27:07 +02:00
CitadelStationBot
75f0daad06 Automatic changelog generation for PR #12934 [ci skip] 2020-07-27 01:01:11 -05:00
silicons
785c2b6e0b Merge pull request #12934 from dapnee/a-fan
Miscellaneous fixes to Kilo Station and a Fan for the Listening Outpost
2020-07-26 23:01:08 -07:00
CitadelStationBot
62bbd8f020 Automatic changelog generation for PR #12927 [ci skip] 2020-07-27 01:00:36 -05:00
silicons
e90671c846 Merge pull request #12927 from Ludox235/we-cant-have-nice-things
ZOMBIES. ACT LIKE ONE.
2020-07-26 23:00:33 -07:00
CitadelStationBot
43ac210b83 Automatic changelog generation for PR #12923 [ci skip] 2020-07-27 01:00:20 -05:00
silicons
e083689b4b Merge pull request #12923 from EmeraldSundisk/snaxattack
Adds more toilets, among other things to Snow Taxi.
2020-07-26 23:00:16 -07:00
CitadelStationBot
d395b84b14 Automatic changelog generation for PR #12921 [ci skip] 2020-07-27 00:59:58 -05:00
silicons
32b8528b16 Merge pull request #12921 from TheObserver-sys/LOOKGORDONATAG!
Adds tags to applicable clothing, stating the defenses and resistances said clothes have.
2020-07-26 22:59:55 -07:00
CitadelStationBot
3b4b90519d Automatic changelog generation for PR #12920 [ci skip] 2020-07-27 00:58:47 -05:00
silicons
6f9c310ea8 Merge pull request #12920 from zeroisthebiggay/blackboxfatcox
Ports the Black Box theft objective from TG
2020-07-26 22:58:43 -07:00
CitadelStationBot
a17946232d Automatic changelog generation for PR #12919 [ci skip] 2020-07-27 00:58:34 -05:00
silicons
850bc0dc33 Merge pull request #12919 from SiliconMain/patch-5
Dura belt tweaks
2020-07-26 22:58:31 -07:00
CitadelStationBot
0910ede761 Automatic changelog generation for PR #12918 [ci skip] 2020-07-27 00:58:01 -05:00
silicons
16a77f9641 Merge pull request #12918 from SiliconMain/patch-3
Minor paramed edit
2020-07-26 22:57:58 -07:00
CitadelStationBot
3a21af2050 Automatic changelog generation for PR #12916 [ci skip] 2020-07-27 00:57:40 -05:00
silicons
d9f9b2e974 Merge pull request #12916 from MrJWhit/meta-station-atmos-and-toxins-update
Metastation atmos and toxins map update
2020-07-26 22:57:36 -07:00
CitadelStationBot
911761de17 Automatic changelog generation for PR #12901 [ci skip] 2020-07-27 00:57:03 -05:00
silicons
401e8cf967 Merge pull request #12901 from CameronWoof/trumpet-cargo
Adds spaceman's trumpet seeds to the exotic seeds crate
2020-07-26 22:56:59 -07:00
silicons
f75069a37a Merge pull request #12899 from Hatterhat/masks
literally adds 3 pixels across the board for paper masks
2020-07-26 22:56:39 -07:00
silicons
d47b553527 Merge pull request #12892 from Literallynotpickles/hi
Reverts extinguishers into being alt-clickable
2020-07-26 22:56:22 -07:00
CitadelStationBot
e02e737f16 Automatic changelog generation for PR #12884 [ci skip] 2020-07-27 00:52:34 -05:00
silicons
e240453044 Merge pull request #12884 from timothyteakettle/fix-a-bad-bug/exploit
fixes a dumb bug to do with material crafting
2020-07-26 22:52:30 -07:00
CitadelStationBot
ca80f4221b Automatic changelog generation for PR #12876 [ci skip] 2020-07-27 00:52:04 -05:00
silicons
20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb
tidies up species files
2020-07-26 22:52:00 -07:00
CitadelStationBot
14cf45086f Automatic changelog generation for PR #12817 [ci skip] 2020-07-27 00:51:27 -05:00
silicons
67c002de7a Merge pull request #12817 from kappa-sama/patch-34
boosts stimpak cost back up to 5 from 3
2020-07-26 22:51:24 -07:00