Commit Graph
7557 Commits
Author SHA1 Message Date
LetterJayandGitHub 02f0c1573a Merge pull request #3491 from Citadel-Station-13/upstream-merge-31851
[MIRROR] Fixes liches not blocking roundend properly.
2017-10-19 09:08:25 -04:00
LetterJayandGitHub 6a1035b6f4 Merge pull request #3483 from Citadel-Station-13/upstream-merge-31823
[MIRROR] Very minor refactor of gas mixture heat_capacity()
2017-10-19 09:07:20 -04:00
CitadelStationBot 0f3a6d8390 Automatic changelog generation for PR #3482 [ci skip] 2017-10-19 08:05:20 -05:00
LetterJayandGitHub 9076721384 Merge pull request #3482 from Citadel-Station-13/upstream-merge-31842
[MIRROR] GPS renaming fix
2017-10-19 09:05:18 -04:00
LetterJayandGitHub 96e8196175 Merge pull request #3481 from Citadel-Station-13/upstream-merge-31839
[MIRROR] Rewords networked fibers description
2017-10-19 09:02:50 -04:00
LetterJayandGitHub cf73ddcdbb Merge pull request #3489 from Citadel-Station-13/upstream-merge-31847
[MIRROR] Fixes a misnamed arg in a clockwork proc
2017-10-19 09:02:40 -04:00
CitadelStationBot ea960345a4 Automatic changelog generation for PR #3488 [ci skip] 2017-10-19 08:02:07 -05:00
LetterJayandGitHub 2e430ec33c Merge pull request #3488 from Citadel-Station-13/upstream-merge-31814
[MIRROR] Adds missing petbed on Meta
2017-10-19 09:02:05 -04:00
CitadelStationBot 87d8266eb3 Automatic changelog generation for PR #3487 [ci skip] 2017-10-19 07:57:30 -05:00
LetterJayandGitHub d07b44268c Merge pull request #3487 from Citadel-Station-13/upstream-merge-31820
[MIRROR] Humans now use the generic fire sprite if they have 3 or less firestacks
2017-10-19 08:57:29 -04:00
CitadelStationBot 6e376e5f13 Automatic changelog generation for PR #3486 [ci skip] 2017-10-19 07:57:19 -05:00
LetterJayandGitHub b31d291ede Merge pull request #3486 from Citadel-Station-13/upstream-merge-31753
[MIRROR] Radiation makes you vomit blood and some more balance changes
2017-10-19 08:57:18 -04:00
CitadelStationBot 3a820f76fe Automatic changelog generation for PR #3484 [ci skip] 2017-10-19 07:56:46 -05:00
LetterJayandGitHub b8267b062e Merge pull request #3484 from Citadel-Station-13/upstream-merge-31830
[MIRROR] Gives engi borgs geiger counters
2017-10-19 08:56:44 -04:00
LetterJayandGitHub 626993d116 Merge pull request #3480 from Citadel-Station-13/upstream-merge-31836
[MIRROR] Fixes recipient in pda logs
2017-10-19 08:56:25 -04:00
LetterJay cf6caf2845 fuk 2017-10-19 07:55:48 -05:00
LetterJay de4b8ec485 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-10-19 07:53:43 -05:00
LetterJay 1e8d8ab019 icon fix 2017-10-19 07:53:17 -05:00
CitadelStationBot 98a583b249 Automatic changelog generation for PR #3478 [ci skip] 2017-10-19 04:02:00 -05:00
PoojawaandGitHub 45eeebd001 Sleeper nerfs (#3478) 2017-10-19 04:01:59 -05:00
LetterJay 02fcc06eb1 missing item state 2017-10-18 20:56:51 -05:00
LetterJay d85dfb4aed i hate it all 2017-10-18 20:41:38 -05:00
CitadelStationBot 77d4de7361 Fixes liches not blocking roundend properly. 2017-10-18 18:27:14 -05:00
AnturKandCitadelStationBot daeffc5b03 Fixes liches not blocking roundend properly. (#31851) 2017-10-18 18:27:14 -05:00
LetterJay fa7bbd50e5 fuck 2017-10-18 15:25:33 -05:00
LetterJay 8eb325ba1f icon 2017-10-18 15:15:47 -05:00
CitadelStationBot 5411f38db0 Fixes a misnamed arg in a clockwork proc 2017-10-18 11:56:09 -05:00
RobustinandCitadelStationBot 1945f16dee Bad Argument Runtime Removed 2017-10-18 11:56:09 -05:00
CitadelStationBot f713c7cb03 Adds missing petbed on Meta 2017-10-18 11:54:56 -05:00
ShizCalevandCitadelStationBot 592f6d89f2 Adds missing petbed on Meta 2017-10-18 11:54:56 -05:00
CitadelStationBot 8800a7cab2 Humans now use the generic fire sprite if they have 3 or less firestacks 2017-10-18 10:18:14 -05:00
MoreRobustThanYouandCitadelStationBot dc74b9d488 Humans now use the generic sprite if they have 3 or less firestacks (#31820)
To show that they're still on fire, but not AS on fire as you would be with 4+ firestacks
2017-10-18 10:18:14 -05:00
CitadelStationBot d384bade95 Radiation makes you vomit blood and some more balance changes 2017-10-18 09:25:11 -05:00
Emmett GainesandCitadelStationBot 04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
LetterJay 215681a23e AHHHHHHHHHHH 2017-10-18 08:10:12 -05:00
LetterJay 5760fbfc2f MORE CUSTOM ITEMS 2017-10-18 08:07:31 -05:00
CitadelStationBot 674e35b61c Gives engi borgs geiger counters 2017-10-18 07:24:53 -05:00
LeoandCitadelStationBot 5ad2b5d866 Merge pull request #31830 from ShizCalev/geiger-borg
Gives engi borgs geiger counters
2017-10-18 07:24:53 -05:00
CitadelStationBot 9a1bb677ee Very minor refactor of gas mixture heat_capacity() 2017-10-18 07:24:46 -05:00
LeoandCitadelStationBot 371857cc35 Merge pull request #31823 from duncathan/atmos-patch12
Very minor refactor of gas mixture heat_capacity()
2017-10-18 07:24:46 -05:00
CitadelStationBot bc7748b430 GPS renaming fix 2017-10-18 07:23:31 -05:00
LeoandCitadelStationBot 29e20a55de Merge pull request #31842 from GunHog/GPS_Name_Fix
GPS renaming fix
2017-10-18 07:23:31 -05:00
CitadelStationBot f83f4f8318 Rewords networked fibers description 2017-10-18 07:23:20 -05:00
LeoandCitadelStationBot c3b7b324e4 Merge pull request #31839 from ShizCalev/networked-fibers-grammar
Rewords networked fibers description
2017-10-18 07:23:20 -05:00
CitadelStationBot d61d420d67 Fixes recipient in pda logs 2017-10-18 07:23:12 -05:00
LeoandCitadelStationBot 060d43768e Merge pull request #31836 from AnturK/pdalogfix
Fixes recipient in pda logs
2017-10-18 07:23:12 -05:00
LetterJayandGitHub 250f55e072 Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630
[MIRROR] Datum rev & related upgrades to base datum antag
2017-10-18 07:42:54 -04:00
LetterJayandGitHub 799e52c5b0 Merge pull request #3479 from Citadel-Station-13/upstream-merge-31838
[MIRROR] Fixes foam layer popping
2017-10-18 07:42:48 -04:00
CitadelStationBot 3562f7f7f3 Automatic changelog generation for PR #3476 [ci skip] 2017-10-18 06:39:28 -05:00
LetterJayandGitHub c2be4a21a6 Merge pull request #3476 from Citadel-Station-13/upstream-merge-31831
[MIRROR] Filters allow air to pass through when not set to filter any gas
2017-10-18 07:39:26 -04:00