Commit Graph

Select branches

Hide Pull Requests

gh-pages

master

tgs-dmapi-update

tweaks-and-fixes

up-to-date

Mono Color

• 3a8c2b3be0 fixes map conflicts deathride58 2017-12-10 18:17:25 -05:00
• 85578cae0d Merge pull request #4316 from deathride58/iconoverridefix LetterJayandGitHub 2017-12-10 17:15:13 -06:00
• 4b8c3f808e fixes map conflicts deathride58 2017-12-10 18:12:33 -05:00
• e46e6dcd1a Delete juicer.dm deathride58andGitHub 2017-12-10 18:06:19 -05:00
• e578bce878 Automatic changelog generation for PR #4259 [ci skip] CitadelStationBot 2017-12-10 17:04:36 -06:00
• 0475ef46f7 Merge pull request #4259 from Citadel-Station-13/upstream-merge-33150 deathride58andGitHub 2017-12-10 23:04:34 +00:00
• 1eb0e42bb1 Update uplink_devices.dm deathride58andGitHub 2017-12-10 18:04:11 -05:00
• 6a8cffc3d5 Update implantuplink.dm deathride58andGitHub 2017-12-10 18:03:04 -05:00
• 68d7347c02 Update white_ship.dm deathride58andGitHub 2017-12-10 17:55:46 -05:00
• 9d50222ef6 fixes merge conflicts deathride58 2017-12-10 17:54:20 -05:00
• bfa573f4bd Update alarmlock.dm deathride58andGitHub 2017-12-10 17:46:50 -05:00
• 01c9cf6479 Update preferences.dm deathride58andGitHub 2017-12-10 17:45:21 -05:00
• 97588f6f69 Automatic changelog generation for PR #4250 [ci skip] CitadelStationBot 2017-12-10 16:44:01 -06:00
• 216b0931d1 Merge pull request #4250 from Citadel-Station-13/upstream-merge-32935 deathride58andGitHub 2017-12-10 22:43:58 +00:00
• 6fd18b363c Automatic changelog generation for PR #4305 [ci skip] CitadelStationBot 2017-12-10 16:39:05 -06:00
• 94d0293703 Merge pull request #4305 from Citadel-Station-13/upstream-merge-33413 deathride58andGitHub 2017-12-10 22:39:02 +00:00
• 2a481e69df Merge pull request #4307 from Citadel-Station-13/upstream-merge-33400 deathride58andGitHub 2017-12-10 22:36:09 +00:00
• 1680b380a9 Automatic changelog generation for PR #4246 [ci skip] CitadelStationBot 2017-12-10 16:35:49 -06:00
• ee00ffc8db Merge pull request #4246 from Citadel-Station-13/upstream-merge-31727 deathride58andGitHub 2017-12-10 22:35:47 +00:00
• fd3b0c72de Update say.dm deathride58andGitHub 2017-12-10 17:01:50 -05:00
• a38ccf078b Update borer.dm deathride58andGitHub 2017-12-10 16:59:46 -05:00
• 7179547be4 Merge branch 'master' into upstream-merge-31727 deathride58andGitHub 2017-12-10 21:51:51 +00:00
• b66e664f11 Merge pull request #4309 from Citadel-Station-13/upstream-merge-33415 deathride58andGitHub 2017-12-10 21:45:01 +00:00
• fa42a336f3 Merge pull request #4310 from Citadel-Station-13/upstream-merge-33320 deathride58andGitHub 2017-12-10 21:44:34 +00:00
• 81de010d71 Automatic changelog generation for PR #4306 [ci skip] CitadelStationBot 2017-12-10 15:44:01 -06:00
• 1a8dd315f9 Merge pull request #4306 from Citadel-Station-13/upstream-merge-33391 deathride58andGitHub 2017-12-10 21:43:59 +00:00
• 215a8f47ed Merge pull request #4304 from Citadel-Station-13/upstream-merge-33423 deathride58andGitHub 2017-12-10 21:43:26 +00:00
• 4dde93c027 Automatic changelog generation for PR #4308 [ci skip] CitadelStationBot 2017-12-10 15:43:00 -06:00
• 4b0137d62e Merge pull request #4308 from Citadel-Station-13/upstream-merge-33418 deathride58andGitHub 2017-12-10 21:42:58 +00:00
• e63179fb7e Automatic changelog generation for PR #4312 [ci skip] CitadelStationBot 2017-12-10 15:42:22 -06:00
• 57b6c893ff Merge pull request #4312 from Citadel-Station-13/upstream-merge-33279 deathride58andGitHub 2017-12-10 21:42:19 +00:00
• 0a005d8b5c Automatic changelog generation for PR #4314 [ci skip] CitadelStationBot 2017-12-10 15:41:35 -06:00
• 93d780997f Merge pull request #4314 from Citadel-Station-13/upstream-merge-33414 deathride58andGitHub 2017-12-10 21:41:33 +00:00
• 85ccdac4d7 fixes icon_override only applying to uniforms deathride58 2017-12-10 16:37:28 -05:00
• d6b0683846 Airlock Construction Update uraniummeltdownandCitadelStationBot 2017-12-11 02:23:43 +05:00
• ffba092936 [READY]Fixes beam rifles and flightsuits CitadelStationBot 2017-12-10 15:19:18 -06:00
• 30143ee601 Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE orangesandCitadelStationBot 2017-12-11 10:18:45 +13:00
• 746e57bd86 Allowed shuttle docking ports to be hidden from some shuttle docking computers CruixandCitadelStationBot 2017-12-10 14:22:48 -06:00
• d82698d106 Merge pull request #4302 from Citadel-Station-13/upstream-merge-33280 LetterJayandGitHub 2017-12-10 14:20:40 -06:00
• 336b02e2ba Merge pull request #4301 from Citadel-Station-13/upstream-merge-33396 LetterJayandGitHub 2017-12-10 14:20:32 -06:00
• d1074cc29b Merge pull request #4300 from Citadel-Station-13/upstream-merge-33392 LetterJayandGitHub 2017-12-10 14:20:23 -06:00
• de13c6c799 Merge pull request #4293 from Citadel-Station-13/upstream-merge-33395 LetterJayandGitHub 2017-12-10 14:20:02 -06:00
• 2c2b120c3b Automatic changelog generation for PR #4287 [ci skip] CitadelStationBot 2017-12-10 14:19:53 -06:00
• 563517ab4a Merge pull request #4287 from Citadel-Station-13/upstream-merge-33378 LetterJayandGitHub 2017-12-10 14:19:51 -06:00
• aaeb9331f5 tgui recompile LetterJay 2017-12-10 14:19:39 -06:00
• 88958cedfe Standardizes false report weighting CitadelStationBot 2017-12-10 14:15:50 -06:00
• 4dbac00348 Merge pull request #33279 from Robustin/Reported orangesandCitadelStationBot 2017-12-11 09:15:30 +13:00
• d88bff9fa9 Restores the uplink modules, removes LoadComponents orangesandCitadelStationBot 2017-12-11 09:14:24 +13:00
• 188137de7f Fix runtimes using Tweak Component Ratings on non-machines CitadelStationBot 2017-12-10 14:08:21 -06:00
• 38da8cb545 Merge pull request #33320 from AutomaticFrenzy/patch/component-ratings orangesandCitadelStationBot 2017-12-11 09:08:21 +13:00
• db9d23ce21 Improves the way chem machines handle qdel, fixes some runtimes CitadelStationBot 2017-12-10 13:25:21 -06:00
• fd6a386779 Improves the way chem machines handle qdel, fixes some runtimes (#33415) ACCountandCitadelStationBot 2017-12-10 22:24:42 +03:00
• 31c2ffaa72 Fixes booze-o-mats not having booze CitadelStationBot 2017-12-10 13:20:06 -06:00
• 52da86e214 Fixes booze-o-mats not having booze (#33418) AnonmareandCitadelStationBot 2017-12-10 19:19:57 +00:00
• 981bc6558b Fix catch all blackbox vv guard CitadelStationBot 2017-12-10 13:03:40 -06:00
• 309a936c5f Fix catch all blackbox vv guard (#33400) Jordan BrownandCitadelStationBot 2017-12-10 14:02:53 -05:00
• 32f94272e6 Fixes butchered cats not dropping their ears and tails CitadelStationBot 2017-12-10 13:03:30 -06:00
• d5472ab6e4 ha (#33391) jughuandCitadelStationBot 2017-12-10 20:03:38 +01:00
• 96120dccfa Fix MULEbot ID numbers showing nowhere but the alt-click menu CitadelStationBot 2017-12-10 12:55:12 -06:00
• 41b0dbe36f Fix MULEbot id numbers showing nowhere but the alt-click menu (#33413) Tad HardestyandCitadelStationBot 2017-12-10 10:54:47 -08:00
• d78143bddc Undelaying roundend will now reboot the server normally. CitadelStationBot 2017-12-10 12:54:02 -06:00
• 030812035f Undelaying will now reboot the server normally. (#33423) AnturKandCitadelStationBot 2017-12-10 19:54:20 +01:00
• 6384f1427c Add caltrop component for spikey floor objects CitadelStationBot 2017-12-10 10:32:03 -06:00
• 9d59e36289 Add caltrop component for spikey floor objects (#33280) coiaxandCitadelStationBot 2017-12-10 16:31:56 +00:00
• ba9ef07062 Fixes tooltip offsets CitadelStationBot 2017-12-10 10:26:44 -06:00
• 96a2a7700d Merge pull request #33396 from AnturK/tooltip-fix Jordan BrownandCitadelStationBot 2017-12-10 11:26:40 -05:00
• 8a26d3cfaf [s]Ghost altclick fix for pet carriers CitadelStationBot 2017-12-10 02:53:02 -06:00
• c59209a34f Merge pull request #33392 from vuonojenmustaturska/patch-1 orangesandCitadelStationBot 2017-12-10 21:53:19 +13:00
• e18457f92e Merge pull request #4284 from Citadel-Station-13/upstream-merge-33356 deathride58andGitHub 2017-12-10 03:12:19 +00:00
• 59ed54b571 Automatic changelog generation for PR #4283 [ci skip] CitadelStationBot 2017-12-09 21:11:57 -06:00
• a17e7ae3cf Merge pull request #4283 from Citadel-Station-13/upstream-merge-33358 deathride58andGitHub 2017-12-10 03:11:54 +00:00
• 80ae897f5e Merge pull request #4285 from Citadel-Station-13/upstream-merge-33373 deathride58andGitHub 2017-12-10 03:09:50 +00:00
• 5a7a4e3daa Automatic changelog generation for PR #4289 [ci skip] CitadelStationBot 2017-12-09 21:09:31 -06:00
• 6ef12d993b Merge pull request #4289 from Citadel-Station-13/upstream-merge-33263 deathride58andGitHub 2017-12-10 03:09:28 +00:00
• 64fc055c75 Automatic changelog generation for PR #4290 [ci skip] CitadelStationBot 2017-12-09 21:08:59 -06:00
• 1906ead618 Merge pull request #4290 from Citadel-Station-13/upstream-merge-33241 deathride58andGitHub 2017-12-10 03:08:57 +00:00
• fe4864f8ed Merge pull request #4291 from Citadel-Station-13/upstream-merge-33365 deathride58andGitHub 2017-12-10 03:08:19 +00:00
• 65ab675b29 Automatic changelog generation for PR #4292 [ci skip] CitadelStationBot 2017-12-09 21:07:57 -06:00
• 0c7bc2f3fe Merge pull request #4292 from Citadel-Station-13/upstream-merge-33376 deathride58andGitHub 2017-12-10 03:07:54 +00:00
• f83da95eb0 Merge pull request #4294 from Citadel-Station-13/upstream-merge-33390 deathride58andGitHub 2017-12-10 03:07:27 +00:00
• 9387b4a9c8 Merge pull request #4295 from Citadel-Station-13/upstream-merge-33386 deathride58andGitHub 2017-12-10 03:06:57 +00:00
• 15b51f6c6c Merge pull request #4297 from Citadel-Station-13/upstream-merge-33384 deathride58andGitHub 2017-12-10 03:06:31 +00:00
• 79bbf1085b Merge pull request #4298 from Citadel-Station-13/upstream-merge-33389 deathride58andGitHub 2017-12-10 03:06:18 +00:00
• e0a78afcf3 Automatic changelog generation for PR #4296 [ci skip] CitadelStationBot 2017-12-09 21:06:06 -06:00
• 7d3739dddb Merge pull request #4296 from Citadel-Station-13/upstream-merge-33397 deathride58andGitHub 2017-12-10 03:06:03 +00:00
• 648d16ec1a Merge pull request #4299 from Citadel-Station-13/upstream-merge-33371 deathride58andGitHub 2017-12-10 03:05:36 +00:00
• fefdde0a36 Automatic changelog generation for PR #4286 [ci skip] CitadelStationBot 2017-12-09 21:05:24 -06:00
• d7cd7b806e Merge pull request #4286 from Citadel-Station-13/upstream-merge-33095 deathride58andGitHub 2017-12-10 03:05:21 +00:00
• 0d42a65029 Step backwards version of hex2num CitadelStationBot 2017-12-09 15:54:14 -06:00
• ae48e14876 Merge pull request #33371 from ninjanomnom/walk-backwards-into-hell Jordan BrownandCitadelStationBot 2017-12-09 16:05:22 -05:00
• de9b130f0a Fixes spelling error CitadelStationBot 2017-12-09 15:54:07 -06:00
• 0c93857bc5 Merge pull request #33389 from LuigiBoi/patch-1 Jordan BrownandCitadelStationBot 2017-12-09 16:05:47 -05:00
• a71c61a97e Allows for qdel in shuttleMove procs CitadelStationBot 2017-12-09 15:53:57 -06:00
• b6653dd94c Merge pull request #33384 from ninjanomnom/deletes-in-my-shutle-subsystem Jordan BrownandCitadelStationBot 2017-12-09 16:07:55 -05:00
• 0df98071ff Fixes emergency lights having infinite power, and replaces their magic number with a define CitadelStationBot 2017-12-09 15:53:49 -06:00
• 2029473a48 Merge pull request #33397 from Xhuis/em_light_fix Jordan BrownandCitadelStationBot 2017-12-09 16:08:05 -05:00
• 0d8af43f8d Remove meaningless "Type too long" message from VV CitadelStationBot 2017-12-09 15:53:42 -06:00
• 906ed84674 Merge pull request #33386 from AutomaticFrenzy/patch/type-too-long Jordan BrownandCitadelStationBot 2017-12-09 16:10:42 -05:00
• db4fdd22c7 cleans up atmos defines CitadelStationBot 2017-12-09 15:53:34 -06:00
• 7a90baa1f8 Merge pull request #33390 from duncathan/atmos-defines Jordan BrownandCitadelStationBot 2017-12-09 16:11:57 -05:00