Commit Graph

  • 3a36a24a8b Merge pull request #7038 from Citadel-Station-13/upstream-merge-38303 deathride58 2018-06-09 04:30:27 +00:00
  • 806751f4fb Automatic changelog generation for PR #7039 [ci skip] CitadelStationBot 2018-06-08 23:29:32 -05:00
  • b2d70b2f67 Merge pull request #7039 from Citadel-Station-13/upstream-merge-38279 deathride58 2018-06-09 04:29:30 +00:00
  • 48e4f9f8eb Automatic changelog generation for PR #7040 [ci skip] CitadelStationBot 2018-06-08 23:29:01 -05:00
  • 0f388bc994 Merge pull request #7040 from Citadel-Station-13/upstream-merge-38266 deathride58 2018-06-09 04:28:59 +00:00
  • cc915f0686 Automatic changelog generation for PR #7041 [ci skip] CitadelStationBot 2018-06-08 23:27:46 -05:00
  • a016682716 Merge pull request #7041 from Citadel-Station-13/upstream-merge-38211 deathride58 2018-06-09 04:27:45 +00:00
  • 6994e60101 Automatic changelog generation for PR #7042 [ci skip] CitadelStationBot 2018-06-08 23:27:09 -05:00
  • 91599773e8 Merge pull request #7042 from Citadel-Station-13/upstream-merge-38350 deathride58 2018-06-09 04:27:07 +00:00
  • fd1a93907f Box Fix Cw3040 2018-06-08 20:21:10 -04:00
  • 93b97528c0 Fixing my syntax errors Cw3040 2018-06-08 14:48:27 -04:00
  • ec673f985a Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' Cw3040 2018-06-08 14:33:58 -04:00
  • dee92640a8 Cryosleeper Bug Fix Cw3040 2018-06-08 14:33:40 -04:00
  • ec361e26a5 Merge pull request #7036 from Cw3040/master deathride58 2018-06-08 18:24:13 +00:00
  • 906e863805 Balancing kevinz000 2018-06-05 23:03:36 -07:00
  • da1abb7375 Adds indestructible sandstone wall letterjay 2018-06-07 23:16:17 -05:00
  • 9124dac65f Adds indestructible sandstone wall (#38350) CitrusGender 2018-06-08 00:15:25 -04:00
  • 74466f4f66 Fix meson goggles and lantern wisps conflicting letterjay 2018-06-07 20:33:50 -05:00
  • f962a02ef7 Fix meson goggles and lantern wisps conflicting (#38211) Tad Hardesty 2018-06-07 18:33:22 -07:00
  • 5939698cb1 Adds warning to shuttle purchase menu letterjay 2018-06-07 20:32:38 -05:00
  • 16c05b0d92 adds warning to shuttle purchase menu (#38266) 81Denton 2018-06-08 03:32:03 +02:00
  • d5e3001261 Changes Cw3040 2018-06-07 21:14:21 -04:00
  • 4e36cde979 Fix pAI suicide while in holoform deleting the card letterjay 2018-06-07 20:06:54 -05:00
  • 38a3c8549f Fix pAI suicide while in holoform deleting the card (#38279) Tad Hardesty 2018-06-07 18:06:27 -07:00
  • 954f56912f Adds swimsuits for the summer ball event letterjay 2018-06-07 20:00:36 -05:00
  • cf8436cf6d a slippery slope into h*ck (#38303) Kraseo 2018-06-08 03:00:17 +02:00
  • 2b3f80a6e7 Fixes Lisa's description letterjay 2018-06-07 19:54:18 -05:00
  • 7e89cb37a6 Fixes Lisa's description (#38320) Iamgoofball 2018-06-07 17:53:42 -07:00
  • 45ec368d76 Pubby Changes Cw3040 2018-06-07 20:53:15 -04:00
  • b833a88204 MetaStation Changes Cw3040 2018-06-07 20:44:02 -04:00
  • fa2cbe7fdc BoxStation Changes Cw3040 2018-06-07 20:43:22 -04:00
  • c4e6b32fec Remove mobs from idle NPC pool on Destroy letterjay 2018-06-07 17:07:45 -05:00
  • 458fb9f83d Remove mobs from idle NPC pool on Destroy (#38333) Tad Hardesty 2018-06-07 15:07:05 -07:00
  • 0e08cfad89 Update grass_carpet.dm Trilbyspaceclone 2018-06-07 15:26:13 -04:00
  • 5ef84b6e4b Adds in Oxygen to grass Trilbyspaceclone 2018-06-07 15:06:10 -04:00
  • cc8184b382 Removes a defect concerning a simple tool in the admin toolset letterjay 2018-06-07 08:52:31 -05:00
  • 674621a4ac Merge pull request #38288 from Jalleo/Removes_Admin_detect Jordan Brown 2018-06-07 09:51:38 -04:00
  • 7f9b4cbd3d Moved picture-in-picture objects down to the floor plane letterjay 2018-06-07 08:42:04 -05:00
  • 16d5991dd6 Merge pull request #38308 from Cruix/multicamera_floor_plane Jordan Brown 2018-06-07 09:40:30 -04:00
  • b33cab006c Vehiclecode is now far more responsive when their movespeed delays are changed after they move. letterjay 2018-06-07 08:40:39 -05:00
  • 7c5217746f Merge pull request #38309 from kevinz000/patch-517 Jordan Brown 2018-06-07 09:39:18 -04:00
  • c93213ff25 Update species.dm deathride58 2018-06-07 00:35:26 -04:00
  • 1fbf5af360 Automatic changelog generation for PR #7024 [ci skip] CitadelStationBot 2018-06-06 23:34:48 -05:00
  • 8d97bc79e5 Merge pull request #7024 from Citadel-Station-13/upstream-merge-38300 deathride58 2018-06-07 04:34:46 +00:00
  • a4d1d3d89b Merge pull request #7025 from Citadel-Station-13/upstream-merge-37790 deathride58 2018-06-07 04:34:11 +00:00
  • cb63c82805 Merge pull request #7026 from Citadel-Station-13/upstream-merge-38209 deathride58 2018-06-07 04:33:40 +00:00
  • 3d623fdf7b Merge pull request #7028 from Citadel-Station-13/upstream-merge-38314 deathride58 2018-06-07 04:32:55 +00:00
  • 303d939116 Adds devilwings donor item for kitsun deathride58 2018-06-07 00:27:23 -04:00
  • 86a767df4a Adds missing races to mob spawn list letterjay 2018-06-06 17:49:08 -05:00
  • afadb178d2 Adds missing races to mob spawn list (#38314) 81Denton 2018-06-07 00:48:13 +02:00
  • 2675481198 Fixes infrared emmiters partially. AnturK 2018-06-06 21:24:57 +02:00
  • f10f0f2709 Fixes some holocall stuff letterjay 2018-06-06 14:25:24 -05:00
  • 717e635d28 Fixes some holocall stuff (#38209) AnturK 2018-06-06 21:24:17 +02:00
  • 514374b110 Individual Logs now follow the client around automatically letterjay 2018-06-06 04:10:20 -05:00
  • de68aa9571 Individual Logs now follow the client around automatically (#37790) oranges 2018-06-06 21:09:59 +12:00
  • 1f21f1edcd Fixes Pubby maint boozeomat letterjay 2018-06-06 02:36:34 -05:00
  • e3f9229e08 Fixes Pubby maint boozeomat (#38300) 81Denton 2018-06-06 09:35:33 +02:00
  • 32b91ef798 Automatic changelog generation for PR #7021 [ci skip] CitadelStationBot 2018-06-06 01:14:50 -05:00
  • a298f20fa5 [MIRROR] [s] Fixes syndicate sentience exploit (#7021) CitadelStationBot 2018-06-06 01:14:48 -05:00
  • 286de1b966 Automatic changelog generation for PR #6868 [ci skip] CitadelStationBot 2018-06-06 01:12:57 -05:00
  • fb4c1e8e28 Increases head jobs restricted from antag RNG (#6868) LetterJay 2018-06-06 01:12:55 -05:00
  • 0d6cec9d8c Readds hunger slowdown iksyp 2018-06-05 20:34:50 -07:00
  • 7893cb360e Automatic changelog generation for PR #6960 [ci skip] CitadelStationBot 2018-06-05 18:38:57 -05:00
  • aab6a78305 Merge pull request #6960 from Citadel-Station-13/upstream-merge-38165 deathride58 2018-06-05 23:38:54 +00:00
  • 93488e81da Automatic changelog generation for PR #6971 [ci skip] CitadelStationBot 2018-06-05 18:37:40 -05:00
  • 98fa9db020 Merge pull request #6971 from Citadel-Station-13/upstream-merge-38179 deathride58 2018-06-05 23:37:37 +00:00
  • 129971c6ba Automatic changelog generation for PR #6979 [ci skip] CitadelStationBot 2018-06-05 18:37:22 -05:00
  • bdef4e4e77 Merge pull request #6979 from Citadel-Station-13/upstream-merge-38116 deathride58 2018-06-05 23:37:20 +00:00
  • da008a2d83 Automatic changelog generation for PR #7019 [ci skip] CitadelStationBot 2018-06-05 18:36:39 -05:00
  • cf170aee33 Merge pull request #7019 from Citadel-Station-13/upstream-merge-38193 deathride58 2018-06-05 23:36:37 +00:00
  • ebe0695af3 Automatic changelog generation for PR #7020 [ci skip] CitadelStationBot 2018-06-05 18:36:24 -05:00
  • 629c4a649c Merge pull request #7020 from Citadel-Station-13/upstream-merge-38290 deathride58 2018-06-05 23:36:22 +00:00
  • 9535ef1a1f Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) letterjay 2018-06-05 18:02:36 -05:00
  • 71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290) MrDoomBringer 2018-06-05 19:01:48 -04:00
  • d397b3ab94 Turns /datum.isprocessing into a datum flag letterjay 2018-06-05 18:00:21 -05:00
  • 83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) vuonojenmustaturska 2018-06-06 01:59:46 +03:00
  • b3b9a44689 Merge branch 'master' into upstream-merge-38165 deathride58 2018-06-05 21:53:14 +00:00
  • 255ffb96bb Merge branch 'master' into upstream-merge-38179 deathride58 2018-06-05 21:32:22 +00:00
  • b49458e0ba Merge branch 'master' into upstream-merge-38116 deathride58 2018-06-05 21:30:21 +00:00
  • cff10c62d0 Update cloning.dm deathride58 2018-06-05 17:24:15 -04:00
  • 3489ed23c6 Automatic changelog generation for PR #6983 [ci skip] CitadelStationBot 2018-06-05 16:23:56 -05:00
  • 963ad5dce9 Merge pull request #6983 from Citadel-Station-13/upstream-merge-38238 deathride58 2018-06-05 21:23:53 +00:00
  • 93d43c1d50 Automatic changelog generation for PR #7015 [ci skip] CitadelStationBot 2018-06-05 16:04:18 -05:00
  • 79d304eeb7 Merge pull request #7015 from Citadel-Station-13/upstream-merge-38283 deathride58 2018-06-05 21:04:15 +00:00
  • 2b02092639 Update preferences.dm deathride58 2018-06-05 17:03:55 -04:00
  • b2bc6dc213 Automatic changelog generation for PR #7016 [ci skip] CitadelStationBot 2018-06-05 15:52:06 -05:00
  • d92f976917 Merge pull request #7016 from Citadel-Station-13/upstream-merge-38268 deathride58 2018-06-05 20:52:03 +00:00
  • 71d68a7284 Merge pull request #7017 from Citadel-Station-13/upstream-merge-38284 deathride58 2018-06-05 20:51:42 +00:00
  • c42819368f Blacklist ion trails from chasms letterjay 2018-06-05 13:29:53 -05:00
  • 9fd7bfb347 Blacklist ion trails from chasms (#38284) 81Denton 2018-06-05 20:29:15 +02:00
  • 0885986bba [Ready] Arcade reward: snack rigs letterjay 2018-06-05 13:27:39 -05:00
  • 2fb5bb10b5 Arcade reward: snack rigs (#38268) 81Denton 2018-06-05 20:27:18 +02:00
  • de73153ccb [MIRROR] Fixes uplink refunds (#7014) CitadelStationBot 2018-06-05 13:19:33 -05:00
  • 6a6407881c Automatic changelog generation for PR #7012 [ci skip] CitadelStationBot 2018-06-05 13:18:30 -05:00
  • eb2368be03 [MIRROR] Fix inconsistent energy gun suicide (#7012) CitadelStationBot 2018-06-05 13:18:27 -05:00
  • fbe49fece0 Automatic changelog generation for PR #7013 [ci skip] CitadelStationBot 2018-06-05 13:17:49 -05:00
  • 74aeecca6d [MIRROR] Fix the Lightning Bolt spell (#7013) CitadelStationBot 2018-06-05 13:17:47 -05:00
  • 1b84899d2a Stops swarmers from attacking field gens/turret covers letterjay 2018-06-05 13:17:13 -05:00
  • a93d92569f Stop swarmers from attacking field gens/turret covers (#38283) 81Denton 2018-06-05 20:16:16 +02:00
  • 0b362e017b [MIRROR] Lavaland Clock Cult Ruin (#7011) CitadelStationBot 2018-06-05 13:16:55 -05:00