shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • e49345c27c Merge pull request #1319 from Citadel-Station-13/upstream-merge-27865 LetterJay 2017-06-02 22:39:45 -05:00
  • c9a1735deb Merge pull request #1318 from Citadel-Station-13/upstream-merge-27871 LetterJay 2017-06-02 22:39:23 -05:00
  • c5e76b4e45 Merge pull request #1317 from Citadel-Station-13/upstream-merge-27864 LetterJay 2017-06-02 22:38:58 -05:00
  • ccf0d133ec Merge pull request #1293 from Citadel-Station-13/upstream-merge-27666 LetterJay 2017-06-02 22:37:40 -05:00
  • 6f54c40f03 Fixes doppler arrays CitadelStationBot 2017-06-02 16:14:48 -05:00
  • 9a05029df6 Cult floors now reduce rune scribing for small runes by 50% CitadelStationBot 2017-06-02 16:12:43 -05:00
  • 48c439aaac Fix cable coil dupe and APC icon oddity CitadelStationBot 2017-06-02 14:11:29 -05:00
  • b676e7b5ae Fixes airlocks not updating icon properly CitadelStationBot 2017-06-02 12:14:17 -05:00
  • 6e563e7a53 Attempts to add items to a storage container beyond its slots limit will obtain a failure message again. CitadelStationBot 2017-06-02 06:42:23 -05:00
  • cb755fc6d0 Adds three unique kinetic accelerator modules to necropolis chests CitadelStationBot 2017-06-01 15:32:16 -05:00
  • 34b81d5f6d Moves tgstation-server CitadelStationBot 2017-06-01 09:16:35 -05:00
  • d53044aa10 Fixes black carpet recipe and sprite CitadelStationBot 2017-06-01 08:38:41 -05:00
  • fc2f45b71b Lowers portable pump max pressure to 1013.25 CitadelStationBot 2017-05-31 23:14:26 -05:00
  • 96eb21fa2a CereStation Security Department Revamp (and other misc fixes/changes) CitadelStationBot 2017-05-31 19:57:52 -05:00
  • ac23b06edd Borg module resets now require cutting instead of pulsing the reset wire CitadelStationBot 2017-05-31 19:56:43 -05:00
  • d36bc75074 Fixes posters CitadelStationBot 2017-05-31 19:29:20 -05:00
  • 538bce59a6 Advanced proccall now supports /proc/PROCNAME CitadelStationBot 2017-05-31 19:24:13 -05:00
  • b78f317f2d Adds repair and lavaland map generator templates for buildmode use CitadelStationBot 2017-05-31 12:57:22 -05:00
  • 946a6b1146 [Meta] Var Cleanup and tweaks CitadelStationBot 2017-05-31 08:57:18 -05:00
  • 4eb5a9bf21 Mapped active shieldgens CitadelStationBot 2017-05-31 08:56:07 -05:00
  • 12719cb824 [Omega] Fixes checkered plating CitadelStationBot 2017-05-31 08:50:30 -05:00
  • 1fd718cf29 Makes VV'ing ID cards easier. CitadelStationBot 2017-05-31 08:50:11 -05:00
  • 8afd024a65 Fixes ghosts using marker beacon CitadelStationBot 2017-05-31 08:48:04 -05:00
  • 603898adbe Fixes faulty query and logic CitadelStationBot 2017-05-31 08:39:39 -05:00
  • ffd2d6fd0a Merge pull request #1206 from Citadel-Station-13/upstream-merge-27721 LetterJay 2017-05-31 02:33:42 -05:00
  • fbedba7c3f Update world.dm LetterJay 2017-05-31 02:10:31 -05:00
  • 4f0ee1cbb8 Update world.dm LetterJay 2017-05-31 01:57:46 -05:00
  • 0159836517 Automatic changelog generation for PR #1214 [ci skip] CitadelStationBot 2017-05-31 01:53:39 -05:00
  • 46bcc34a0e Merge pull request #1214 from Citadel-Station-13/upstream-merge-27677 LetterJay 2017-05-31 01:53:38 -05:00
  • 4654baea3b Merge pull request #1217 from Citadel-Station-13/upstream-merge-27685 LetterJay 2017-05-31 01:48:42 -05:00
  • ad96bb6fcf Merge branch 'master' into upstream-merge-27721 LetterJay 2017-05-31 01:47:16 -05:00
  • 01ab250772 commit LetterJay 2017-05-31 00:02:23 -05:00
  • 04edb3e636 Merge pull request #1205 from Citadel-Station-13/upstream-merge-27454 LetterJay 2017-05-30 23:55:19 -05:00
  • b19115e10f Merge branch 'master' into upstream-merge-27454 LetterJay 2017-05-30 23:48:25 -05:00
  • 872b0e61fd rej cleanup, etc. LetterJay 2017-05-30 23:43:14 -05:00
  • 52881797d0 update area turfs LetterJay 2017-05-30 23:33:19 -05:00
  • 71bf266642 Merge pull request #1312 from Citadel-Station-13/AllMapChangesInOne LetterJay 2017-05-30 23:20:44 -05:00
  • 168a96c268 back in we go LetterJay 2017-05-30 23:10:43 -05:00
  • fbbceadc6e Merge branch 'master' into AllMapChangesInOne LetterJay 2017-05-30 23:08:32 -05:00
  • 43e0e1e76d Delete cerestation.dmm LetterJay 2017-05-30 23:06:16 -05:00
  • dac12e365a just delete the shit for now LetterJay 2017-05-30 23:03:44 -05:00
  • 6717b0d3a2 dsds LetterJay 2017-05-30 23:01:22 -05:00
  • aedbe151c8 FUUUUUUUUUUUUCK LetterJay 2017-05-30 23:00:33 -05:00
  • 0401feb327 i hate maps LetterJay 2017-05-30 22:56:50 -05:00
  • 3baf042360 more commits LetterJay 2017-05-30 22:55:11 -05:00
  • 7d9865955b master maps LetterJay 2017-05-30 22:47:08 -05:00
  • 9b00499d24 It's been a long night LetterJay 2017-05-30 22:41:22 -05:00
  • 9ba058930e Update Space_Station_13_areas.dm LetterJay 2017-05-30 22:18:02 -05:00
  • 0acc4536c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-05-30 22:02:55 -05:00
  • dd1facf96e update LetterJay 2017-05-30 22:02:41 -05:00
  • e9ff797a8b Update cerestation.dmm LetterJay 2017-05-30 21:56:13 -05:00
  • 8f06db65c9 Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534 LetterJay 2017-05-30 21:43:31 -05:00
  • 7e7b65be63 Delete lavaland_surface_ww_vault.dmm LetterJay 2017-05-30 21:34:16 -05:00
  • c10077828e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-05-30 21:12:41 -05:00
  • c62769c196 dead map LetterJay 2017-05-30 21:12:28 -05:00
  • 1763c4b65d Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530 LetterJay 2017-05-30 20:49:42 -05:00
  • a41d17c9b9 die die die LetterJay 2017-05-30 20:45:32 -05:00
  • 79b484261a die LetterJay 2017-05-30 20:44:50 -05:00
  • dc83d85b05 it DOES NOT END LetterJay 2017-05-30 20:40:03 -05:00
  • 13d8f58b9a sadfs LetterJay 2017-05-30 20:38:53 -05:00
  • a60ad3264a commit LetterJay 2017-05-30 20:31:45 -05:00
  • 2f325b1edf kill me LetterJay 2017-05-30 20:30:36 -05:00
  • a497ba644e more maps LetterJay 2017-05-30 20:25:23 -05:00
  • 2f34bb209e yay LetterJay 2017-05-30 20:21:34 -05:00
  • 405df96d2a missed one LetterJay 2017-05-30 20:17:15 -05:00
  • 8948f2d636 FIXING SHIT. LetterJay 2017-05-30 20:16:00 -05:00
  • adb7a9b6ff rej clean up more areas LetterJay 2017-05-30 20:08:53 -05:00
  • 24d6643623 more map area fun LetterJay 2017-05-30 20:04:10 -05:00
  • 0fe4a33b15 Merge pull request #1100 from Citadel-Station-13/upstream-merge-27453 LetterJay 2017-05-30 19:50:35 -05:00
  • 55fa44c7ce it never ends LetterJay 2017-05-30 19:24:20 -05:00
  • 6cfbd556c2 chronological order LetterJay 2017-05-30 19:15:24 -05:00
  • 36aa2e4b15 map LetterJay 2017-05-30 19:08:04 -05:00
  • f6f0523fa9 Merge pull request #1200 from Citadel-Station-13/upstream-merge-27661 LetterJay 2017-05-30 18:46:40 -05:00
  • abd0e85efa Merge pull request #1197 from Citadel-Station-13/upstream-merge-27669 LetterJay 2017-05-30 18:46:24 -05:00
  • 29da073bb9 Merge pull request #1284 from Citadel-Station-13/upstream-merge-27840 LetterJay 2017-05-30 18:40:54 -05:00
  • 402b52229f shit always breaks somehow. LetterJay 2017-05-30 18:37:28 -05:00
  • fce022389a Update job.dm LetterJay 2017-05-30 17:07:04 -05:00
  • 4f9c8a0869 Luxury Bluespace Shelter Capsules, Take 2. CitadelStationBot 2017-05-30 17:05:54 -05:00
  • 81e4f39733 Merge branch 'master' into upstream-merge-27669 LetterJay 2017-05-30 17:02:11 -05:00
  • fdd831ed6b mining LetterJay 2017-05-30 16:53:04 -05:00
  • 976086e490 Merge branch 'master' into upstream-merge-27534 LetterJay 2017-05-30 16:45:59 -05:00
  • 5073d8e6f2 rej LetterJay 2017-05-30 16:43:09 -05:00
  • c3a243106f wew LetterJay 2017-05-30 16:42:56 -05:00
  • 41065c4e73 waitfor LetterJay 2017-05-30 16:21:24 -05:00
  • 6b7dffddb2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27661 LetterJay 2017-05-30 16:05:53 -05:00
  • 03f6eeb3b7 Automatic changelog generation for PR #1174 [ci skip] CitadelStationBot 2017-05-30 16:04:42 -05:00
  • c81dc599e3 Merge pull request #1174 from Citadel-Station-13/upstream-merge-27414 LetterJay 2017-05-30 16:04:41 -05:00
  • bc5ecc91b5 rej clean LetterJay 2017-05-30 15:55:00 -05:00
  • a821d90a37 commit LetterJay 2017-05-30 15:54:42 -05:00
  • dda7ae1658 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27840 LetterJay 2017-05-30 15:54:03 -05:00
  • df34173509 Merge pull request #1301 from Citadel-Station-13/upstream-merge-27831 LetterJay 2017-05-30 15:50:56 -05:00
  • 5201e60356 Merge pull request #1303 from Citadel-Station-13/upstream-merge-27820 LetterJay 2017-05-30 15:50:40 -05:00
  • 9474de0028 Merge pull request #1304 from Citadel-Station-13/upstream-merge-27754 LetterJay 2017-05-30 15:50:21 -05:00
  • ebaa245f0b Merge pull request #1305 from Citadel-Station-13/upstream-merge-27839 LetterJay 2017-05-30 15:50:07 -05:00
  • cbe12313d2 Merge pull request #1306 from Citadel-Station-13/upstream-merge-27844 LetterJay 2017-05-30 15:49:40 -05:00
  • b33d26c67f Merge pull request #1307 from Citadel-Station-13/upstream-merge-27846 LetterJay 2017-05-30 15:48:44 -05:00
  • f259908266 Merge pull request #1196 from Citadel-Station-13/upstream-merge-27675 LetterJay 2017-05-30 15:48:23 -05:00
  • 377d3ffbf9 Merge pull request #1184 from Citadel-Station-13/upstream-merge-27631 LetterJay 2017-05-30 15:47:00 -05:00
  • 33af767101 Merge pull request #1169 from Citadel-Station-13/upstream-merge-27596 LetterJay 2017-05-30 15:46:34 -05:00
  • a38973ece8 commit LetterJay 2017-05-30 15:44:41 -05:00