Commit Graph

9021 Commits

Author SHA1 Message Date
kevinz000 3f16272717 line endings ree 2017-08-29 19:57:58 -07:00
kevinz000 8d0c29f9da ok 2017-08-29 19:56:27 -07:00
LetterJay 0970653382 adds missing var preventing guilmon bodymarkings from being displayed 2017-08-29 21:26:50 -05:00
LetterJay b2114a7b81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-08-29 21:19:22 -05:00
CitadelStationBot 3e1031d6b9 Adds a ghost verb to see all available ghost spawners 2017-08-29 17:45:50 -05:00
CitadelStationBot 1caba77431 Server tools versioning and fix to displayed testmerges 2017-08-29 17:16:17 -05:00
CitadelStationBot 605963d45c AltClick Improvements 2017-08-29 17:15:12 -05:00
CitadelStationBot 9c63ab2d39 Shadow Walk/New Shadowling movement spell 2017-08-29 17:14:07 -05:00
CitadelStationBot 719717934c Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it 2017-08-29 17:10:59 -05:00
CitadelStationBot 4dc8a1adbc Workaround to prevent slippery components from flooding SSgarbage 2017-08-29 17:09:53 -05:00
CitadelStationBot 5f3775388c Gives cult blades updated item and inhand sprites 2017-08-29 17:08:43 -05:00
CitadelStationBot 38284056df Fix rare AI tracking bug 2017-08-29 17:06:37 -05:00
CitadelStationBot 6f013d3d47 Stealth Option for RadioactiveMicro 2017-08-29 17:05:32 -05:00
CitadelStationBot 5bdf18b861 Makes playtitlemusic() waitfor = FALSE 2017-08-29 17:03:22 -05:00
CitadelStationBot 6882163ef6 Moves comms settings into a new config file 2017-08-29 17:01:16 -05:00
kevinz000 7ac45355e1 Merge branch 'master' into upstream-merge-30250 2017-08-29 10:11:28 -07:00
kevinz000 d8e4f44a39 Merge branch 'master' into upstream-merge-30175 2017-08-29 10:10:23 -07:00
kevinz000 f344c5edf2 Merge branch 'master' into upstream-merge-30084 2017-08-29 10:09:13 -07:00
kevinz000 df24243113 pentawew 2017-08-29 10:04:39 -07:00
kevinz000 f45f5bbf3d quadruple wew 2017-08-29 10:02:18 -07:00
kevinz000 5f5065eb46 kek 2017-08-29 09:59:57 -07:00
kevinz000 ca5462adce triple wew 2017-08-29 09:55:02 -07:00
kevinz000 5591afc9ce double wew 2017-08-29 09:53:11 -07:00
kevinz000 e4ae2c8021 wew 2017-08-29 09:44:30 -07:00
kevinz000 911e1fa194 sync 2017-08-29 09:43:10 -07:00
kevinz000 301a581e64 sync 2017-08-29 09:41:11 -07:00
kevinz000 064ade469f sync 2017-08-29 09:35:55 -07:00
kevinz000 3c87a1f971 Merge branch 'master' into upstream-merge-29718 2017-08-29 09:34:07 -07:00
kevinz000 88093698f2 sync 2017-08-29 09:33:37 -07:00
kevinz000 80221fa874 sync 2017-08-29 09:32:40 -07:00
kevinz000 61b8c48872 sync 2017-08-29 09:29:45 -07:00
kevinz000 498bd61928 sync 2017-08-29 09:12:56 -07:00
CitadelStationBot b753909958 Cult ghosts can no longer be potentially deconverted or debrained 2017-08-29 10:25:31 -05:00
CitadelStationBot 3fe08c3cc7 Prevents medbeams from crossing themselves 2017-08-29 09:50:47 -05:00
CitadelStationBot 0091a81009 Changes sql version to check for schema being ahead 2017-08-29 09:50:33 -05:00
CitadelStationBot 54c68decde Fixes clowns blowing shit up not being logged 50% of the time 2017-08-29 09:32:06 -05:00
kevinz000 62a358574c sync 2017-08-29 02:37:34 -07:00
CitadelStationBot 2ff65a8e39 [MIRROR] Lowers the chance for monkeys to become gorillas (#2476)
* Lowers the chance for monkeys to become gorillas

* Delete life.dm.rej

* Update life.dm
2017-08-29 00:59:34 -07:00
LetterJay 798c14cc2b Merge pull request #2532 from Citadel-Station-13/upstream-merge-30238
[MIRROR] Fixes ingredients-box sprite.
2017-08-29 02:14:30 -05:00
LetterJay 97bee315bf Update living_defense.dm 2017-08-29 01:50:46 -05:00
LetterJay 4bfade5704 Merge branch 'master' into upstream-merge-29718 2017-08-29 01:48:22 -05:00
LetterJay 292f5d5d35 Update boxes.dm 2017-08-29 01:46:21 -05:00
CitadelStationBot d55bac862e Updates out of date documentation 2017-08-28 14:52:27 -05:00
CitadelStationBot f191f5c827 Fixes ingredients-box sprite. 2017-08-28 14:39:03 -05:00
LetterJay 6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
LetterJay 7ea6eeb64e GUHRILLAZ 2017-08-28 10:23:11 -05:00
LetterJay defab9c7fc Merge branch 'master' into upstream-merge-29923 2017-08-28 09:19:44 -05:00
LetterJay 739d5c70a7 Update meat.dm 2017-08-28 09:17:14 -05:00
LetterJay b39bd24aaa Merge branch 'master' into upstream-merge-30218 2017-08-28 09:03:46 -05:00
LetterJay 472e39693f Update allinone.dm 2017-08-28 09:02:35 -05:00