Commit Graph

36057 Commits

Author SHA1 Message Date
Timothy Teakettle b5a16d8945 MORE CLOTHES 2020-07-29 18:20:46 +01:00
Timothy Teakettle 31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
timothyteakettle c15d0de20d subcategories work 2020-07-29 03:57:16 +01:00
Timothy Teakettle 721e018aec loadout stuff 2020-07-28 22:52:00 +01:00
CitadelStationBot 469ea17063 Automatic changelog generation for PR #12938 [ci skip] 2020-07-28 12:46:38 -05:00
silicons e9d1bcc899 Merge pull request #12938 from necromanceranne/sprite-fixes-rapier
adds some in-hands for the rapier sheath
2020-07-28 10:46:34 -07:00
CitadelStationBot 60825a79b8 Automatic changelog generation for PR #12937 [ci skip] 2020-07-28 12:46:22 -05:00
silicons 6c83beea02 Merge pull request #12937 from Ghommie/Ghommie-cit834
Fixing new bugs and stuff.
2020-07-28 10:46:17 -07:00
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
necromanceranne 3f84d44510 fixed it up aaaah 2020-07-28 21:33:50 +10: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
necromanceranne ef611995ed adds some in-hands for the rapier sheath 2020-07-28 00:19:47 +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
Ghom f946a157f4 Update mapping.dm 2020-07-27 14:54:46 +02:00
Ghom 7e18e7a7a8 Update mapping.dm 2020-07-27 14:52:05 +02:00
Ghommie f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +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