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

Commit Graph

  • 8ce807deb6 Merge pull request #2280 kevinz000 2017-08-29 22:27:01 -07:00
  • fcddd32703 Merge pull request #2195 kevinz000 2017-08-29 22:26:58 -07:00
  • f33f543d8a Merge branch 'master' into upstream-merge-30254 kevinz000 2017-08-29 22:12:34 -07:00
  • c9280bd308 sync kevinz000 2017-08-29 22:12:19 -07:00
  • 0925cb108b wew kevinz000 2017-08-29 22:09:42 -07:00
  • a0758720ce Merge branch 'master' into upstream-merge-30251 kevinz000 2017-08-29 22:06:28 -07:00
  • 8530808d72 wew kevinz000 2017-08-29 22:06:14 -07:00
  • 408acdd66d sync kevinz000 2017-08-29 22:05:16 -07:00
  • 175224c5de Merge branch 'master' into upstream-merge-29859 kevinz000 2017-08-29 21:14:45 -07:00
  • b9c58a2914 wew kevinz000 2017-08-29 21:14:33 -07:00
  • 9b71e967d2 Merge branch 'master' into upstream-merge-29964 kevinz000 2017-08-29 21:07:01 -07:00
  • 985b876706 woops kevinz000 2017-08-29 20:47:20 -07:00
  • f9c0c6df3d update master kevinz000 2017-08-29 20:46:38 -07:00
  • 8f4a6133f9 dme kevinz000 2017-08-29 20:45:51 -07:00
  • 41c1f939ab gdi kevinz000 2017-08-29 20:21:41 -07:00
  • 92a2ac0ae3 soft sync kevinz000 2017-08-29 20:20:11 -07:00
  • 61159d6361 Merge branch 'master' into upstream-merge-30256 kevinz000 2017-08-29 20:17:03 -07:00
  • 632fd9771a Merge branch 'master' into upstream-merge-30221 kevinz000 2017-08-29 20:16:47 -07:00
  • eebe84681f sync kevinz000 2017-08-29 20:16:25 -07:00
  • 705427f05d Merge branch 'master' into upstream-merge-30218 kevinz000 2017-08-29 20:15:47 -07:00
  • 2b5d584c67 sync kevinz000 2017-08-29 20:15:33 -07:00
  • 343b508774 Merge branch 'master' into upstream-merge-30175 kevinz000 2017-08-29 20:14:56 -07:00
  • 17f3ce92b6 Merge branch 'master' into upstream-merge-29960 kevinz000 2017-08-29 20:14:22 -07:00
  • bf5d1fc159 sync kevinz000 2017-08-29 20:14:08 -07:00
  • 39e5a65ea9 indent sync with tgstation kevinz000 2017-08-29 20:13:16 -07:00
  • 74b4133c94 sync with upstream shouldn't break too much kevinz000 2017-08-29 20:11:46 -07:00
  • fa9f1ce956 remove cere from configs kevinz000 2017-08-29 20:10:29 -07:00
  • 0d104b2cd4 update to master kevinz000 2017-08-29 20:09:18 -07:00
  • ec2993289e sync kevinz000 2017-08-29 20:07:36 -07:00
  • 4faa0d6104 Merge branch 'master' into upstream-merge-30244 kevinz000 2017-08-29 20:06:07 -07:00
  • 76e05ad88e Merge branch 'master' into upstream-merge-30203 kevinz000 2017-08-29 20:05:42 -07:00
  • 4848a1fbf1 Merge branch 'master' into upstream-merge-30259 kevinz000 2017-08-29 20:05:25 -07:00
  • 9572f4b298 Merge branch 'master' into upstream-merge-30098 kevinz000 2017-08-29 20:04:55 -07:00
  • 2df062f583 Merge branch 'master' into upstream-merge-30186 kevinz000 2017-08-29 20:04:22 -07:00
  • 1dc4e09682 Merge branch 'master' into upstream-merge-30250 kevinz000 2017-08-29 20:04:01 -07:00
  • 34e60fb76f Merge branch 'master' into upstream-merge-30243 kevinz000 2017-08-29 20:03:38 -07:00
  • 1b0bbb8c86 Merge branch 'master' into upstream-merge-30113 kevinz000 2017-08-29 20:02:14 -07:00
  • 3f16272717 line endings ree kevinz000 2017-08-29 19:57:58 -07:00
  • 8d0c29f9da ok kevinz000 2017-08-29 19:56:27 -07:00
  • 0b82132443 Automatic changelog generation for PR #2555 [ci skip] CitadelStationBot 2017-08-29 21:40:35 -05:00
  • 675828575a Merge pull request #2555 from Citadel-Station-13/GuilmonFix LetterJay 2017-08-29 21:40:33 -05:00
  • 0970653382 adds missing var preventing guilmon bodymarkings from being displayed LetterJay 2017-08-29 21:26:50 -05:00
  • b2114a7b81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 LetterJay 2017-08-29 21:19:22 -05:00
  • 3e1031d6b9 Adds a ghost verb to see all available ghost spawners CitadelStationBot 2017-08-29 17:45:50 -05:00
  • 1caba77431 Server tools versioning and fix to displayed testmerges CitadelStationBot 2017-08-29 17:16:17 -05:00
  • 605963d45c AltClick Improvements CitadelStationBot 2017-08-29 17:15:12 -05:00
  • 9c63ab2d39 Shadow Walk/New Shadowling movement spell CitadelStationBot 2017-08-29 17:14:07 -05:00
  • 719717934c Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it CitadelStationBot 2017-08-29 17:10:59 -05:00
  • 4dc8a1adbc Workaround to prevent slippery components from flooding SSgarbage CitadelStationBot 2017-08-29 17:09:53 -05:00
  • 5f3775388c Gives cult blades updated item and inhand sprites CitadelStationBot 2017-08-29 17:08:43 -05:00
  • 38284056df Fix rare AI tracking bug CitadelStationBot 2017-08-29 17:06:37 -05:00
  • 6f013d3d47 Stealth Option for RadioactiveMicro CitadelStationBot 2017-08-29 17:05:32 -05:00
  • 5bdf18b861 Makes playtitlemusic() waitfor = FALSE CitadelStationBot 2017-08-29 17:03:22 -05:00
  • 6882163ef6 Moves comms settings into a new config file CitadelStationBot 2017-08-29 17:01:16 -05:00
  • 7ac45355e1 Merge branch 'master' into upstream-merge-30250 kevinz000 2017-08-29 10:11:28 -07:00
  • e00174cd5c Merge branch 'master' into upstream-merge-30243 kevinz000 2017-08-29 10:11:06 -07:00
  • d8e4f44a39 Merge branch 'master' into upstream-merge-30175 kevinz000 2017-08-29 10:10:23 -07:00
  • f344c5edf2 Merge branch 'master' into upstream-merge-30084 kevinz000 2017-08-29 10:09:13 -07:00
  • f7d9c456d7 kek kevinz000 2017-08-29 10:08:24 -07:00
  • d460267372 Merge branch 'master' into upstream-merge-30061 kevinz000 2017-08-29 10:07:37 -07:00
  • df24243113 pentawew kevinz000 2017-08-29 10:04:39 -07:00
  • f45f5bbf3d quadruple wew kevinz000 2017-08-29 10:02:18 -07:00
  • 5f5065eb46 kek kevinz000 2017-08-29 09:59:57 -07:00
  • 2b6e8a6d51 rej kevinz000 2017-08-29 09:58:26 -07:00
  • ca5462adce triple wew kevinz000 2017-08-29 09:55:02 -07:00
  • 5591afc9ce double wew kevinz000 2017-08-29 09:53:11 -07:00
  • e4ae2c8021 wew kevinz000 2017-08-29 09:44:30 -07:00
  • 911e1fa194 sync kevinz000 2017-08-29 09:43:10 -07:00
  • 301a581e64 sync kevinz000 2017-08-29 09:41:11 -07:00
  • 4661b38353 Update maintenance_loot.dm kevinz000 2017-08-29 09:39:08 -07:00
  • de019304cd wew kevinz000 2017-08-29 09:38:31 -07:00
  • 35501e6819 sync kevinz000 2017-08-29 09:37:29 -07:00
  • 064ade469f sync kevinz000 2017-08-29 09:35:55 -07:00
  • 3c87a1f971 Merge branch 'master' into upstream-merge-29718 kevinz000 2017-08-29 09:34:07 -07:00
  • 88093698f2 sync kevinz000 2017-08-29 09:33:37 -07:00
  • 80221fa874 sync kevinz000 2017-08-29 09:32:40 -07:00
  • 239f76f483 wew kevinz000 2017-08-29 09:32:03 -07:00
  • 61b8c48872 sync kevinz000 2017-08-29 09:29:45 -07:00
  • 498bd61928 sync kevinz000 2017-08-29 09:12:56 -07:00
  • b753909958 Cult ghosts can no longer be potentially deconverted or debrained CitadelStationBot 2017-08-29 10:25:31 -05:00
  • 3a015fc2f0 Merge pull request #2540 kevinz000 2017-08-29 08:08:26 -07:00
  • 3fe08c3cc7 Prevents medbeams from crossing themselves CitadelStationBot 2017-08-29 09:50:47 -05:00
  • b37e890e78 Wet turfs on shuttles will remain wet after shuttle movement CitadelStationBot 2017-08-29 09:50:37 -05:00
  • 0091a81009 Changes sql version to check for schema being ahead CitadelStationBot 2017-08-29 09:50:33 -05:00
  • 54c68decde Fixes clowns blowing shit up not being logged 50% of the time CitadelStationBot 2017-08-29 09:32:06 -05:00
  • 62a358574c sync kevinz000 2017-08-29 02:37:34 -07:00
  • 2ff65a8e39 [MIRROR] Lowers the chance for monkeys to become gorillas (#2476) CitadelStationBot 2017-08-29 02:59:34 -05:00
  • 798c14cc2b Merge pull request #2532 from Citadel-Station-13/upstream-merge-30238 LetterJay 2017-08-29 02:14:30 -05:00
  • 97bee315bf Update living_defense.dm LetterJay 2017-08-29 01:50:46 -05:00
  • 4bfade5704 Merge branch 'master' into upstream-merge-29718 LetterJay 2017-08-29 01:48:22 -05:00
  • a03f4722e8 Merge pull request #2534 from Citadel-Station-13/upstream-merge-30181 LetterJay 2017-08-29 01:47:06 -05:00
  • 292f5d5d35 Update boxes.dm LetterJay 2017-08-29 01:46:21 -05:00
  • d55bac862e Updates out of date documentation CitadelStationBot 2017-08-28 14:52:27 -05:00
  • f191f5c827 Fixes ingredients-box sprite. CitadelStationBot 2017-08-28 14:39:03 -05:00
  • 6c76ae2395 clean up LetterJay 2017-08-28 10:34:31 -05:00
  • f3721ff2f0 Automatic changelog generation for PR #2447 [ci skip] CitadelStationBot 2017-08-28 10:32:43 -05:00
  • 5fcf2e50db Merge pull request #2447 from Citadel-Station-13/upstream-merge-29923 LetterJay 2017-08-28 10:32:41 -05:00
  • 7ea6eeb64e GUHRILLAZ LetterJay 2017-08-28 10:23:11 -05:00
  • defab9c7fc Merge branch 'master' into upstream-merge-29923 LetterJay 2017-08-28 09:19:44 -05:00
  • 739d5c70a7 Update meat.dm LetterJay 2017-08-28 09:17:14 -05:00