Commit Graph

  • b39bd24aaa Merge branch 'master' into upstream-merge-30218 LetterJay 2017-08-28 09:03:46 -05:00
  • 472e39693f Update allinone.dm LetterJay 2017-08-28 09:02:35 -05:00
  • 27750d91d6 Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214 LetterJay 2017-08-28 09:01:47 -05:00
  • 792c509827 Merge pull request #2526 from Citadel-Station-13/upstream-merge-30200 LetterJay 2017-08-28 09:01:06 -05:00
  • b3c70bf024 Merge pull request #2525 from Citadel-Station-13/upstream-merge-30204 LetterJay 2017-08-28 09:00:46 -05:00
  • 47aa97b847 Merge pull request #2523 from Citadel-Station-13/upstream-merge-30207 LetterJay 2017-08-28 09:00:19 -05:00
  • db56781717 Merge pull request #2522 from Citadel-Station-13/upstream-merge-30222 LetterJay 2017-08-28 08:58:06 -05:00
  • e34367c41b Merge pull request #2521 from Citadel-Station-13/upstream-merge-30225 LetterJay 2017-08-28 08:57:52 -05:00
  • 3a8cf01e65 Merge pull request #2520 from Citadel-Station-13/upstream-merge-30231 LetterJay 2017-08-28 08:57:36 -05:00
  • 4b1887ce12 Merge pull request #2519 from Citadel-Station-13/upstream-merge-30228 LetterJay 2017-08-28 08:57:19 -05:00
  • 03a26e6468 Merge pull request #2518 from Citadel-Station-13/kevinz000-patch-5 LetterJay 2017-08-28 08:56:55 -05:00
  • 02ba44a8eb Merge pull request #2505 from Citadel-Station-13/upstream-merge-30169 LetterJay 2017-08-28 08:56:33 -05:00
  • a17ed054d6 Merge pull request #2503 from Citadel-Station-13/upstream-merge-30172 LetterJay 2017-08-28 08:56:11 -05:00
  • d5927ceeec Automatic changelog generation for PR #2498 [ci skip] CitadelStationBot 2017-08-28 08:54:03 -05:00
  • 29de038837 Merge pull request #2498 from Citadel-Station-13/upstream-merge-30162 LetterJay 2017-08-28 08:54:01 -05:00
  • 3a734f518b Merge pull request #2497 from Citadel-Station-13/upstream-merge-30166 LetterJay 2017-08-28 08:47:35 -05:00
  • 2fe2912fa3 Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173 LetterJay 2017-08-28 08:46:53 -05:00
  • 4075c9cefa Automatic changelog generation for PR #2495 [ci skip] CitadelStationBot 2017-08-28 08:46:21 -05:00
  • c043b8a1d5 Merge pull request #2495 from Citadel-Station-13/upstream-merge-30182 LetterJay 2017-08-28 08:46:19 -05:00
  • 7474aa3edb Merge pull request #2492 from Citadel-Station-13/upstream-merge-30191 LetterJay 2017-08-28 08:45:49 -05:00
  • 5225aa7d65 Merge pull request #2493 from Citadel-Station-13/upstream-merge-30192 LetterJay 2017-08-28 08:45:34 -05:00
  • 1457e388c2 Merge pull request #2494 from Citadel-Station-13/upstream-merge-30183 LetterJay 2017-08-28 08:45:16 -05:00
  • 2a0f617f68 Adds more round id tracking CitadelStationBot 2017-08-28 05:50:05 -05:00
  • a6cc400a4b Fixes allinone tcomms machine CitadelStationBot 2017-08-28 02:20:51 -05:00
  • 12ff0e7406 Removes the suppose-to-be unused shuttle wall path CitadelStationBot 2017-08-28 02:20:45 -05:00
  • bab6b30e02 Splits jungle mob code into separate files CitadelStationBot 2017-08-28 02:20:39 -05:00
  • 2d4bd6f6f0 Fixes survival_pods being a valid_territory for gangs sprays & dominations/blob takeovers/cult summons/ect CitadelStationBot 2017-08-28 02:20:30 -05:00
  • 4a456fd2c7 Fixes APC pixel shift being off CitadelStationBot 2017-08-28 02:20:25 -05:00
  • 0b1c36c938 Changes playtime verb name CitadelStationBot 2017-08-28 02:20:21 -05:00
  • ed1a06a9ed Adds separate log for sql errors with no config check CitadelStationBot 2017-08-28 02:20:16 -05:00
  • 993b452729 Fixes surplus log icons. CitadelStationBot 2017-08-28 02:20:11 -05:00
  • 0a4efdcc8f Switched dirtystation to use typecaches for checks CitadelStationBot 2017-08-28 02:20:06 -05:00
  • bdf2fff8d9 Adds logging cause of microbomb activation in admin logs CitadelStationBot 2017-08-28 02:19:59 -05:00
  • 7d15048221 file2list passes the file thru trim() CitadelStationBot 2017-08-28 02:19:54 -05:00
  • 5ebf1c4b6b Update furrypeople.dm kevinz000 2017-08-27 19:48:29 -07:00
  • 65d4c6f938 Delete access levels.txt (#2507) CitadelStationBot 2017-08-27 08:42:40 -05:00
  • 349bd03b73 Adds periods to larva roars (#2512) CitadelStationBot 2017-08-27 08:42:16 -05:00
  • 94429bdccc Cleaned up environment_smash vars with bitflag defines (#2515) CitadelStationBot 2017-08-27 07:55:07 -05:00
  • 718940042a Automatic changelog generation for PR #2517 [ci skip] CitadelStationBot 2017-08-27 07:54:50 -05:00
  • 985ea0d768 Sets all food prefs to NONE (#2517) ktccd 2017-08-27 14:54:48 +02:00
  • cdfa4148b4 Makes genitals_use_skintone save (#2514) ktccd 2017-08-27 13:22:04 +02:00
  • 68f463452e Revert "Lets humans use MUTCOLORs [Maximum Heresy]" - turns out this is breaking things (#2516) kevinz000 2017-08-27 04:21:29 -07:00
  • 0ef2dfeb10 Automatic changelog generation for PR #2487 [ci skip] CitadelStationBot 2017-08-27 03:36:19 -05:00
  • 4c4bd22578 [MIRROR] Some more tweaks to Geis (#2487) CitadelStationBot 2017-08-27 03:36:17 -05:00
  • 3557e0e9b1 Automatic changelog generation for PR #2513 [ci skip] CitadelStationBot 2017-08-27 02:58:51 -05:00
  • e6114f7840 Makes humans use MUTCOLORS (#2513) ktccd 2017-08-27 09:58:50 +02:00
  • 66f046fe87 Fixes timestop spell (#2506) CitadelStationBot 2017-08-26 21:49:16 -05:00
  • 14ceaa39b4 Fixes component dupe checks not actually checking if there IS a dupe component (#2501) CitadelStationBot 2017-08-26 21:11:03 -05:00
  • 3254fcf535 goddamnit_again (#2511) kevinz000 2017-08-26 18:43:57 -07:00
  • c64aeef239 Revert "goddamnit (#2491)" (#2510) kevinz000 2017-08-26 16:13:23 -07:00
  • 26890c6f81 Pulls the plug on Cerestation (for real this time) CitadelStationBot 2017-08-26 14:08:30 -05:00
  • 94400c4d38 Allows disabling shuttle purchases per map. CitadelStationBot 2017-08-26 11:08:12 -05:00
  • 18904f2f0f Maintains that weird entire-tcomms-setup-in-one-machine thing CitadelStationBot 2017-08-26 11:08:01 -05:00
  • 28bc1d992b Update metastation.json CitadelStationBot 2017-08-26 11:07:56 -05:00
  • cd11c01c42 Adds magillitis, a traitor serum for geneticists & CMOs CitadelStationBot 2017-08-26 11:07:42 -05:00
  • b151209160 Gives plasmamen hallucinations when taking blackpowder CitadelStationBot 2017-08-26 11:07:33 -05:00
  • 7cd8cde132 Add note about regex and schema version to contributing.md CitadelStationBot 2017-08-26 11:07:29 -05:00
  • 3a6a277f08 Traitor, a traitor is a traitor. CitadelStationBot 2017-08-26 11:07:24 -05:00
  • d38580afcd Holoparasite prompts now have a "Never For This Round" option CitadelStationBot 2017-08-26 11:07:20 -05:00
  • e9180afe0a Small devil fixes. CitadelStationBot 2017-08-26 11:07:16 -05:00
  • f21f2c8207 Adds volume control to admin-played sounds CitadelStationBot 2017-08-26 11:07:11 -05:00
  • 8be784e667 Fixes empty adminhelp tickets messages CitadelStationBot 2017-08-26 11:07:06 -05:00
  • d2c89ad25c goddamnit (#2491) kevinz000 2017-08-26 04:50:59 -07:00
  • c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) kevinz000 2017-08-24 21:07:58 -07:00
  • 188193eb61 here we go again (#2456) LetterJay 2017-08-24 21:24:25 -05:00
  • c7ed043fd5 Automatic changelog generation for PR #2471 [ci skip] CitadelStationBot 2017-08-24 20:36:14 -05:00
  • 45285ef491 Fixes a lot of problems in dogborg code (#2471) ktccd 2017-08-25 03:36:13 +02:00
  • 3ef56206c1 Fixes component cleanup (#2485) CitadelStationBot 2017-08-24 20:31:54 -05:00
  • fce68d3b76 Removes text restriction on add/set_details (#2474) CitadelStationBot 2017-08-24 20:31:41 -05:00
  • 3ea2288820 Fixes sounds for toy nuke, red button, and talking action figures (#2475) CitadelStationBot 2017-08-24 20:31:24 -05:00
  • d5dfe45c1e Dummies no longer queue, which humans probably shouldn't do ever (#2477) CitadelStationBot 2017-08-24 20:30:51 -05:00
  • 43cad07181 Transit tube pods no longer constantly suck in air (#2478) CitadelStationBot 2017-08-24 20:30:12 -05:00
  • 7a4df41221 Remove some unused goonchat stuff (#2481) CitadelStationBot 2017-08-24 20:29:50 -05:00
  • 85327b79ad Automatic changelog generation for PR #2461 [ci skip] CitadelStationBot 2017-08-24 20:29:38 -05:00
  • e8b1e104ee [MIRROR] ssgarbage now runs every 2 seconds. (#2461) CitadelStationBot 2017-08-24 20:29:37 -05:00
  • cab1c7fb64 Automatic changelog generation for PR #2483 [ci skip] CitadelStationBot 2017-08-24 20:27:49 -05:00
  • 483d31dee8 reduces communications cooldown (#2483) CitadelStationBot 2017-08-24 20:27:47 -05:00
  • 1bee6c069d Automatic changelog generation for PR #2465 [ci skip] CitadelStationBot 2017-08-24 20:27:31 -05:00
  • 47596fadfc Makes boss tiles immune to the oldest boss, Lord Singuloth (#2465) CitadelStationBot 2017-08-24 20:27:29 -05:00
  • 0ca8580715 Corrects column name CitadelStationBot 2017-08-24 15:45:07 -05:00
  • 342fd1d7fa Alternative To Removing Kudzu Manufacturing (#30080) CitadelStationBot 2017-08-23 15:46:54 -05:00
  • d3504f2e7b Add a brain damage line from a backstory CitadelStationBot 2017-08-23 15:46:50 -05:00
  • 358fa8e95f Automatic changelog generation for PR #2325 [ci skip] CitadelStationBot 2017-08-22 20:20:48 -05:00
  • a6d64204ad [MIRROR] Updates PubbyStation (#2325) CitadelStationBot 2017-08-22 20:20:46 -05:00
  • d151ebf247 [Omega] Corrected space turf under syndie shuttle corners (#2418) CitadelStationBot 2017-08-22 20:13:23 -05:00
  • 35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) kevinz000 2017-08-22 05:01:38 -07:00
  • 6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) kevinz000 2017-08-22 04:04:21 -07:00
  • 15b378ddf4 adminrank hotfix LetterJay 2017-08-22 03:51:21 -05:00
  • 2954e8ad16 Merge pull request #2455 from Citadel-Station-13/kevinz000-patch-4 LetterJay 2017-08-22 02:29:13 -05:00
  • 74508dd34f Merge pull request #2411 from Citadel-Station-13/upstream-merge-29940 LetterJay 2017-08-22 02:28:43 -05:00
  • b01a24c95b my eyes hurt LetterJay 2017-08-22 01:42:20 -05:00
  • d56cc32cf0 Update human.dm kevinz000 2017-08-21 21:43:17 -07:00
  • 4316a5a61b Update human.dm kevinz000 2017-08-21 21:41:59 -07:00
  • 2241f5ecfb Update cult_items.dm LetterJay 2017-08-21 23:32:21 -05:00
  • cef534face Update mutations.dm LetterJay 2017-08-21 23:31:55 -05:00
  • a0cf777040 Merge branch 'master' into upstream-merge-29940 LetterJay 2017-08-21 23:29:24 -05:00
  • 95fee82fcb tgui compile kevinz000 2017-08-21 20:35:16 -07:00
  • b5e7f7f7fe [MIRROR] Adds defines for mouse_opacity (#2381) CitadelStationBot 2017-08-21 22:29:37 -05:00
  • 61e6f2815b Update stomach.dm (#2453) kevinz000 2017-08-21 20:27:21 -07:00
  • e6650e6f35 Refined Test Areas (Station Z) debug output (#2321) CitadelStationBot 2017-08-21 22:25:20 -05:00