Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

tgs-dmapi-update

tweaks-and-fixes

up-to-date

Mono Color

• 6162d812f4 Merge pull request #4825 from Citadel-Station-13/upstream-merge-34123 deathride58andGitHub 2018-01-14 20:42:40 +00:00
• 45e4374a0d Automatic changelog generation for PR #4823 [ci skip] CitadelStationBot 2018-01-14 14:42:15 -06:00
• 96ffb89fc1 Merge pull request #4823 from Citadel-Station-13/message-visibility deathride58andGitHub 2018-01-14 20:42:13 +00:00
• 1d80b18d6f Automatic changelog generation for PR #4822 [ci skip] CitadelStationBot 2018-01-14 14:41:44 -06:00
• 2c6ef0a90a Merge pull request #4822 from Citadel-Station-13/ak47s4er1 deathride58andGitHub 2018-01-14 20:41:42 +00:00
• 927913662d hopefully fixes new characters having underwear and fixes human tails/ears not saving deathride58 2018-01-14 15:25:13 -05:00
• 0d3362f174 Moves GLOB.movement_keys into SSinput and adds movement direction badminry CitadelStationBot 2018-01-14 13:39:01 -06:00
• e27346812f Moves GLOB.movement_keys into SSinput and adds movement direction badminry (#34123) Emmett GainesandCitadelStationBot 2018-01-14 14:37:59 -05:00
• f2539f2b34 Merge pull request #4824 from Citadel-Station-13/upstream-merge-34434 deathride58andGitHub 2018-01-14 19:21:37 +00:00
• afe0e9b53f Enforces utf-8 encoding on all changelog files. CitadelStationBot 2018-01-14 12:39:49 -06:00
• 597111234e Enforces utf-8 encoding on all changelog files. (#34434) AnturKandCitadelStationBot 2018-01-14 19:39:27 +01:00
• e385ab090e Fixes message visibility for vorish play PoojawaandGitHub 2018-01-14 12:01:24 -06:00
• 7498bae414 Re-adds AK-47s button PoojawaandGitHub 2018-01-14 04:18:17 -06:00
• 655067471a Fixes *wag for mammals PoojawaandGitHub 2018-01-14 03:50:26 -06:00
• 703275c86f Merge pull request #4803 from Citadel-Station-13/upstream-merge-34276 LetterJayandGitHub 2018-01-14 03:12:31 -06:00
• 33954016b8 Merge pull request #4820 from Citadel-Station-13/upstream-merge-34407 deathride58andGitHub 2018-01-14 06:49:38 +00:00
• 7ce34c9345 these bastards are now slippery theTiji0 2018-01-14 00:45:36 -05:00
• 30264e5e19 Make traitor panel clearer when toggling completion state CitadelStationBot 2018-01-13 23:21:46 -06:00
• f7d70d1454 Merge pull request #34407 from optimumtact/anturredtextsmyevent Jordan BrownandCitadelStationBot 2018-01-14 00:21:43 -05:00
• b8a93b6ca1 Automatic changelog generation for PR #4818 [ci skip] CitadelStationBot 2018-01-13 22:24:57 -06:00
• 1c2bcd7f3f Merge pull request #4818 from deathride58/preffix deathride58andGitHub 2018-01-14 04:24:54 +00:00
• 9332db5bb0 Fixes character slot changing runtiming deathride58 2018-01-13 23:08:50 -05:00
• cc29b029c8 Automatic changelog generation for PR #4817 [ci skip] CitadelStationBot 2018-01-13 22:01:35 -06:00
• 87b614aaf9 Merge pull request #4817 from Citadel-Station-13/upstream-merge-34338 deathride58andGitHub 2018-01-14 04:01:33 +00:00
• ef29d783e9 Merge pull request #4816 from Citadel-Station-13/upstream-merge-34328 deathride58andGitHub 2018-01-14 04:01:15 +00:00
• 942eb9f59e Automatic changelog generation for PR #4815 [ci skip] CitadelStationBot 2018-01-13 22:00:56 -06:00
• 8717e2f04e Merge pull request #4815 from Citadel-Station-13/upstream-merge-34359 deathride58andGitHub 2018-01-14 04:00:54 +00:00
• 1cbc4596d3 Merge pull request #4814 from Citadel-Station-13/upstream-merge-34376 deathride58andGitHub 2018-01-14 04:00:39 +00:00
• 3b0cb3a6c2 Merge pull request #4813 from Citadel-Station-13/upstream-merge-34365 deathride58andGitHub 2018-01-14 04:00:24 +00:00
• 94c3069e6f Replaces cached get_area vars to grab area names with get_area_name() CitadelStationBot 2018-01-13 20:56:11 -06:00
• 80095fea0a Replaces cached get_area vars for names (#34338) ShizCalevandCitadelStationBot 2018-01-13 21:55:47 -05:00
• d33f42cfb5 added the spiders as a functioning mob theTiji0 2018-01-13 19:00:09 -05:00
• 551b86356e Updates TIMER_UNIQUE documentation CitadelStationBot 2018-01-13 17:23:47 -06:00
• effea9f679 Updates TIMER_UNIQUE documentation (#34328) Jordan BrownandCitadelStationBot 2018-01-13 18:22:51 -05:00
• 99d1fa4784 Makes the NT Lepton Violet over lava windows lava proof CitadelStationBot 2018-01-13 14:52:21 -06:00
• 077ec06f78 Rebases and redoes it with the fix with mapmerge2 Dax DupontandCitadelStationBot 2018-01-12 15:53:00 +01:00
• 9b2d395d28 Fixes mecha pilot speed. CitadelStationBot 2018-01-13 14:51:10 -06:00
• 50529187d6 Fixes mecha pilot speed. AnturKandCitadelStationBot 2018-01-12 23:41:08 +01:00
• 0722f96e8b Fixes cables/lattices for lateloaded templates. CitadelStationBot 2018-01-13 14:51:03 -06:00
• 269cbab223 Fixes cables/lattices for lateloaded templates. AnturKandCitadelStationBot 2018-01-12 18:08:21 +01:00
• 036dc82e12 initial commit - initial pref edits and file copypasting from hippie deathride58 2018-01-13 15:45:08 -05:00
• 3a2ac4d102 Automatic changelog generation for PR #4812 [ci skip] CitadelStationBot 2018-01-13 14:29:28 -06:00
• bfd2f6cd24 Merge pull request #4812 from Citadel-Station-13/upstream-merge-34362 deathride58andGitHub 2018-01-13 20:29:26 +00:00
• 257ee69202 Merge pull request #4811 from Citadel-Station-13/upstream-merge-34360 deathride58andGitHub 2018-01-13 20:29:01 +00:00
• 5815ac156d Automatic changelog generation for PR #4810 [ci skip] CitadelStationBot 2018-01-13 14:28:46 -06:00
• 6b5f8b0cad Merge pull request #4810 from Citadel-Station-13/upstream-merge-34347 deathride58andGitHub 2018-01-13 20:28:43 +00:00
• 27a695ce5f Automatic changelog generation for PR #4809 [ci skip] CitadelStationBot 2018-01-13 14:28:24 -06:00
• a572a24dfe Merge pull request #4809 from Citadel-Station-13/upstream-merge-34355 deathride58andGitHub 2018-01-13 20:28:22 +00:00
• f6c53d8f6e Automatic changelog generation for PR #4808 [ci skip] CitadelStationBot 2018-01-13 14:27:56 -06:00
• c47008b123 Merge pull request #4808 from Citadel-Station-13/upstream-merge-34357 deathride58andGitHub 2018-01-13 20:27:54 +00:00
• 6df769de46 Merge pull request #4807 from Citadel-Station-13/upstream-merge-34358 deathride58andGitHub 2018-01-13 20:27:12 +00:00
• 412e43674c Merge pull request #4806 from Citadel-Station-13/upstream-merge-34342 deathride58andGitHub 2018-01-13 20:26:49 +00:00
• dd09677c7b Automatic changelog generation for PR #4805 [ci skip] CitadelStationBot 2018-01-13 14:26:30 -06:00
• 3da566f86b Merge pull request #4805 from Citadel-Station-13/upstream-merge-34346 deathride58andGitHub 2018-01-13 20:26:28 +00:00
• efde92c5b4 Automatic changelog generation for PR #4802 [ci skip] CitadelStationBot 2018-01-13 14:25:31 -06:00
• 7d5c3897e3 Merge pull request #4802 from Citadel-Station-13/upstream-merge-34350 deathride58andGitHub 2018-01-13 20:25:29 +00:00
• 9742597382 Merge pull request #4801 from Citadel-Station-13/upstream-merge-34343 deathride58andGitHub 2018-01-13 20:25:01 +00:00
• 7ec007d204 Merge pull request #4800 from Citadel-Station-13/upstream-merge-34352 deathride58andGitHub 2018-01-13 20:24:42 +00:00
• fb2a6a1f54 Automatic changelog generation for PR #4799 [ci skip] CitadelStationBot 2018-01-13 14:24:15 -06:00
• 0cad3946c3 Merge pull request #4799 from Citadel-Station-13/upstream-merge-34161 deathride58andGitHub 2018-01-13 20:24:13 +00:00
• 8c03304151 Automatic changelog generation for PR #4798 [ci skip] CitadelStationBot 2018-01-13 14:23:06 -06:00
• b586ec55a7 Merge pull request #4798 from Citadel-Station-13/upstream-merge-33958 deathride58andGitHub 2018-01-13 20:23:03 +00:00
• 4c21247700 Automatic changelog generation for PR #4797 [ci skip] CitadelStationBot 2018-01-13 14:22:25 -06:00
• 9c19710b72 Merge pull request #4797 from Citadel-Station-13/upstream-merge-34155 deathride58andGitHub 2018-01-13 20:22:23 +00:00
• c7d71df466 Automatic changelog generation for PR #4796 [ci skip] CitadelStationBot 2018-01-13 14:22:07 -06:00
• 90b35d405a Merge pull request #4796 from Citadel-Station-13/upstream-merge-33699 deathride58andGitHub 2018-01-13 20:22:05 +00:00
• fe442e262c Automatic changelog generation for PR #4795 [ci skip] CitadelStationBot 2018-01-13 14:21:45 -06:00
• 9ccd21605d Merge pull request #4795 from Citadel-Station-13/pbchange deathride58andGitHub 2018-01-13 20:21:43 +00:00
• e9785d8512 Merge pull request #4794 from Citadel-Station-13/upstream-merge-34296 deathride58andGitHub 2018-01-13 20:21:21 +00:00
• 2900cde32f Automatic changelog generation for PR #4793 [ci skip] CitadelStationBot 2018-01-13 14:21:05 -06:00
• 80c4d1d92e Merge pull request #4793 from Citadel-Station-13/upstream-merge-34313 deathride58andGitHub 2018-01-13 20:21:03 +00:00
• 2f49b41ee9 Automatic changelog generation for PR #4792 [ci skip] CitadelStationBot 2018-01-13 14:20:46 -06:00
• 9c28302717 Merge pull request #4792 from Citadel-Station-13/upstream-merge-34316 deathride58andGitHub 2018-01-13 20:20:43 +00:00
• dce7931477 Code fix for stat_entry on NO_FIRE subsystems CitadelStationBot 2018-01-13 13:26:34 -06:00
• 4f8791c5b3 Merge pull request #34362 from Leshana/vplk-bitfields LeoandCitadelStationBot 2018-01-13 17:25:27 -02:00
• f6ef8b7dba Fixes clownborg sprays not recharging CitadelStationBot 2018-01-13 13:25:24 -06:00
• e8d21ac1f3 Merge pull request #34360 from kevinz000/patch-429 LeoandCitadelStationBot 2018-01-13 17:25:07 -02:00
• bdf5233bcb Fix the Ark's z-level checks CitadelStationBot 2018-01-13 09:01:09 -06:00
• 96679b1c0d Merge pull request #34347 from AutomaticFrenzy/patch/ark-z LeoandCitadelStationBot 2018-01-13 13:00:33 -02:00
• 26a9569208 Fixes goon escape shuttle CitadelStationBot 2018-01-13 08:59:56 -06:00
• 710f69aac9 Merge pull request #34355 from Thunder12345/shuttlefix LeoandCitadelStationBot 2018-01-13 12:58:50 -02:00
• 6181126019 Fix RPD runtimes and offsets of layered connector ports CitadelStationBot 2018-01-13 08:58:45 -06:00
• ba1f61cb9e Merge pull request #34357 from AutomaticFrenzy/patch/rpd-runtime LeoandCitadelStationBot 2018-01-13 12:58:00 -02:00
• 1afe0b1d1e Cleans up a nesting level in pet attackby CitadelStationBot 2018-01-13 08:58:37 -06:00
• 665856c152 Merge pull request #34358 from ShizCalev/nest-pet-collar LeoandCitadelStationBot 2018-01-13 12:58:21 -02:00
• 19fbda548b for var i in 1 to dildos CitadelStationBot 2018-01-13 08:54:23 -06:00
• a87a6dafda for var i in 1 to dildos IamgoofballandCitadelStationBot 2018-01-11 21:15:05 -08:00
• 9164634b5b Fix slot machine design icon CitadelStationBot 2018-01-13 05:59:17 -06:00
• 661ac975f1 Merge pull request #34346 from AutomaticFrenzy/patch/slot-machine-icon LeoandCitadelStationBot 2018-01-13 09:58:42 -02:00
• 4cd3c0c854 Update TGS API to 3.2.0.2 CitadelStationBot 2018-01-13 04:55:10 -06:00
• 9fe08da64a Merge pull request #34276 from Cyberboss/TGSAPI3202 orangesandCitadelStationBot 2018-01-13 23:54:40 +13:00
• 082152ac95 Grammarize the internals screen object CitadelStationBot 2018-01-13 04:36:43 -06:00
• 06120d3174 Grammarize the internals screen object Tad HardestyandCitadelStationBot 2018-01-12 02:19:31 -08:00
• ddb7e4d205 Penguins are immune to cold CitadelStationBot 2018-01-13 04:32:30 -06:00
• 8bb5288c58 zzzzzz ArmhulenandCitadelStationBot 2018-01-11 21:55:30 -08:00
• 1bd09c9878 Remove unnused random event CitadelStationBot 2018-01-13 04:31:21 -06:00
• 4ae8e504df Remove unnused random event LeoandCitadelStationBot 2018-01-12 10:01:58 -02:00
• c4c93b6c4b Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed CitadelStationBot 2018-01-13 04:23:04 -06:00
• 8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly orangesandCitadelStationBot 2018-01-13 23:21:58 +13:00
• 051e387a55 Dreaming Improvements CitadelStationBot 2018-01-13 04:21:50 -06:00