Commit Graph

  • 322d8aa480 Merge pull request #5457 from Citadel-Station-13/upstream-merge-35565 deathride58 2018-02-13 15:02:20 +00:00
  • f2b2bfbf98 Removes the empty moth language file CitadelStationBot 2018-02-13 08:55:12 -06:00
  • 6d980b488d Merge pull request #35625 from praisenarsie/patch-31 Leo 2018-02-13 12:53:59 -02:00
  • 91f5b571e9 Fixes invalid throwat args CitadelStationBot 2018-02-13 07:14:47 -06:00
  • 833a700cbb Fixes invalid throwat args (#35565) ShizCalev 2018-02-13 08:13:48 -05:00
  • d7a7bea995 Merge pull request #5439 from Citadel-Station-13/upstream-merge-35512 LetterJay 2018-02-13 06:28:42 -06:00
  • de4869542c Merge pull request #5443 from Citadel-Station-13/upstream-merge-35551 LetterJay 2018-02-13 06:28:33 -06:00
  • 306e51f9bf Automatic changelog generation for PR #5456 [ci skip] CitadelStationBot 2018-02-13 06:28:17 -06:00
  • 66a2e037e7 Merge pull request #5456 from Citadel-Station-13/upstream-merge-35560 LetterJay 2018-02-13 06:28:15 -06:00
  • 7cf942250c Merge pull request #5455 from Citadel-Station-13/upstream-merge-35572 LetterJay 2018-02-13 06:28:05 -06:00
  • 8a957d64bf Merge pull request #5454 from Citadel-Station-13/upstream-merge-35576 LetterJay 2018-02-13 06:27:55 -06:00
  • 5b6c0d433f Automatic changelog generation for PR #5453 [ci skip] CitadelStationBot 2018-02-13 06:27:47 -06:00
  • 4495bfa7b9 Merge pull request #5453 from Citadel-Station-13/upstream-merge-35354 LetterJay 2018-02-13 06:27:44 -06:00
  • 6039a77d5e Adds hooray emoji CitadelStationBot 2018-02-13 05:40:32 -06:00
  • 789bf29661 Adds tada emoji (#35560) Dax Dupont 2018-02-13 12:39:47 +01:00
  • 700cbe7fb1 Fixes skateboard runtime CitadelStationBot 2018-02-12 23:43:32 -06:00
  • c45c1c17df Fixes scooter runtime ShizCalev 2018-02-11 21:25:35 -05:00
  • 4d12e598ac Fixes blood contracts being unusable if the popup is cancelled CitadelStationBot 2018-02-12 23:42:20 -06:00
  • e3e65a5237 Fixes blood contracts being unusable if the popup is cancelled YPO 2018-02-11 19:29:43 -07:00
  • a11b073139 this shuttle got the axe for being too fun, comrade deathride58 2018-02-12 23:13:19 -05:00
  • 440e39ed68 limits the hallucinations a little Cebutris 2018-02-12 22:15:53 -05:00
  • 1f02bfe662 Tritium now produces water vapor when combusting. CitadelStationBot 2018-02-12 21:11:22 -06:00
  • 0c9bb1a249 Tritium now produces water vapor when combusting. (#35354) Buggy123 2018-02-12 22:11:04 -05:00
  • d54a92ef46 adds the crazy catslut stuff to the loadout Cebutris 2018-02-12 22:04:44 -05:00
  • d0fa073a5d adds in a hallucinogenic collar and a dirty sweater Cebutris 2018-02-12 21:57:24 -05:00
  • 3077f794cc Merge pull request #5450 from Citadel-Station-13/upstream-merge-35598 deathride58 2018-02-13 02:53:39 +00:00
  • 2952446d8b COMPILE! deathride58 2018-02-12 21:39:00 -05:00
  • f129de2bc2 work!!! deathride58 2018-02-12 21:28:30 -05:00
  • 0a384243f6 work! compile! actually function! deathride58 2018-02-12 21:22:09 -05:00
  • c5b5a0491e DME deathride58 2018-02-12 21:10:36 -05:00
  • 72ff7be9bd code folder. 221 files changed wew deathride58 2018-02-12 21:03:40 -05:00
  • bb2761edb0 [s] fixes announcement system exploit CitadelStationBot 2018-02-12 19:33:28 -06:00
  • aa4b92faad Merge pull request #35598 from ShizCalev/announcement-exploit-fix oranges 2018-02-13 14:32:58 +13:00
  • e3ad2643b2 maps first deathride58 2018-02-12 20:30:05 -05:00
  • dcbea24eee Automatic changelog generation for PR #5447 [ci skip] CitadelStationBot 2018-02-12 17:29:09 -06:00
  • 06b7f239c4 Merge pull request #5447 from Citadel-Station-13/upstream-merge-35433 deathride58 2018-02-12 23:29:06 +00:00
  • 8b1a1e99ee Merge pull request #5449 from Citadel-Station-13/upstream-merge-35557 deathride58 2018-02-12 23:24:45 +00:00
  • ceb1113f31 Fixes PDA virus runtime CitadelStationBot 2018-02-12 16:32:07 -06:00
  • a60410b347 Merge pull request #35557 from ShizCalev/pda-virus-fix vuonojenmustaturska 2018-02-13 00:31:55 +02:00
  • 2a772a242e Merge pull request #5448 from Citadel-Station-13/upstream-merge-35603 deathride58 2018-02-12 22:31:40 +00:00
  • 800c43de48 blacklists 512.1408 for basically being a wallhack (again) CitadelStationBot 2018-02-12 16:23:44 -06:00
  • 59f7343c5e Merge pull request #35603 from MrStonedOne/patch-480 Jordan Brown 2018-02-12 17:23:40 -05:00
  • 80baf4f9a4 Merge pull request #5444 from Citadel-Station-13/upstream-merge-35550 deathride58 2018-02-12 21:21:39 +00:00
  • 03c3f59e68 Automatic changelog generation for PR #5442 [ci skip] CitadelStationBot 2018-02-12 15:21:13 -06:00
  • 8a073796fe Merge pull request #5442 from Citadel-Station-13/upstream-merge-35517 deathride58 2018-02-12 21:21:11 +00:00
  • 76e07e4050 Cult Update? Cult Update! CitadelStationBot 2018-02-12 15:18:21 -06:00
  • 1825c944b6 Cult Update? Cult Update! (#35433) Robustin 2018-02-12 16:17:58 -05:00
  • 7b19f69935 Automatic changelog generation for PR #5445 [ci skip] CitadelStationBot 2018-02-12 14:04:33 -06:00
  • dc01163eda Merge pull request #5445 from Citadel-Station-13/upstream-merge-35528 deathride58 2018-02-12 20:04:30 +00:00
  • 4aac3f34cc Fix SCP-294 appearance CitadelStationBot 2018-02-12 12:50:12 -06:00
  • 37a1f6245d Fix SCP-294 appearance (#35528) MoreRobustThanYou 2018-02-12 13:49:51 -05:00
  • cfba3b96d7 Disables max errors on travis compile CitadelStationBot 2018-02-12 12:49:01 -06:00
  • 16de4e4c90 Disables max errors on travis compile (#35550) Jordan Brown 2018-02-12 13:48:01 -05:00
  • 8f23870e79 Tests give 3 GBP CitadelStationBot 2018-02-12 12:47:48 -06:00
  • b6ca568ac1 Tests give 3 GBP (#35551) Jordan Brown 2018-02-12 13:47:42 -05:00
  • f5eb7f7101 Update cell_charger.dm deathride58 2018-02-12 13:42:51 -05:00
  • a47a660b35 Whoops I missed something cebutris 2018-02-12 13:29:51 -05:00
  • a0feb17597 Cell chargers are now buildable and (upgradable!) machines. Dax Dupont 2018-02-12 18:15:18 +01:00
  • 079127dd59 Adds in prayer beads! Cebutris 2018-02-12 11:17:38 -05:00
  • b6d5173420 Automatic changelog generation for PR #5438 [ci skip] CitadelStationBot 2018-02-12 10:05:00 -06:00
  • 6f117401de Merge pull request #5438 from Citadel-Station-13/upstream-merge-35524 LetterJay 2018-02-12 10:04:56 -06:00
  • 2171016baa Merge pull request #5436 from Citadel-Station-13/upstream-merge-35549 LetterJay 2018-02-12 10:04:31 -06:00
  • ef8ce89fe2 Merge pull request #5435 from Citadel-Station-13/upstream-merge-35558 LetterJay 2018-02-12 10:04:12 -06:00
  • 302c187018 Automatic changelog generation for PR #5434 [ci skip] CitadelStationBot 2018-02-12 10:03:19 -06:00
  • 5a9b7a5173 Merge pull request #5434 from Citadel-Station-13/upstream-merge-35541 LetterJay 2018-02-12 10:03:16 -06:00
  • c88c4f2d27 Automatic changelog generation for PR #5433 [ci skip] CitadelStationBot 2018-02-12 10:03:08 -06:00
  • e4c49c3ce4 Merge pull request #5433 from Citadel-Station-13/upstream-merge-35566 LetterJay 2018-02-12 10:03:05 -06:00
  • 15572d1d5f Merge pull request #5430 from Citadel-Station-13/upstream-merge-35514 LetterJay 2018-02-12 10:01:42 -06:00
  • 800089ec25 Split up Revert/Removal CitadelStationBot 2018-02-12 09:22:07 -06:00
  • 8c28ac1a1a Split up Revert/Removal Jordan Brown 2018-02-10 12:15:14 -05:00
  • b09288e006 Fatshaming the AI, moving him two tiles upward when mass_recall() happens CitadelStationBot 2018-02-12 09:20:53 -06:00
  • c40925f529 Fatshaming the AI, moving him two tiles upward when mass_recall() happens (#35524) Dax Dupont 2018-02-12 16:19:59 +01:00
  • c2e02e3b8a Removes old golem items CitadelStationBot 2018-02-12 09:09:14 -06:00
  • 3d5e49f06d Merge pull request #35549 from KorPhaeron/golem vuonojenmustaturska 2018-02-12 17:08:18 +02:00
  • 902a77dd0d fulton pack not allowed on supply shuttle CitadelStationBot 2018-02-12 09:07:02 -06:00
  • 0d40303254 Merge pull request #35558 from praisenarsie/patch-28 vuonojenmustaturska 2018-02-12 17:06:36 +02:00
  • 173c6fa686 Fixes lye/plastic/charcoal conflicts CitadelStationBot 2018-02-12 09:02:42 -06:00
  • 379ff0546a Merge pull request #35541 from 81Denton/chem-conflicts vuonojenmustaturska 2018-02-12 17:02:29 +02:00
  • 29273f88d3 Urinal cakes can now be picked up again CitadelStationBot 2018-02-12 09:01:28 -06:00
  • 0af6af731a Urinal cakes can now be picked up again (#35566) MoreRobustThanYou 2018-02-12 10:01:11 -05:00
  • 4d7e9caa52 Goofed on the HoP's arrival announcement channel Chayse Ramsay 2018-02-12 03:03:35 +00:00
  • 84b637b405 Requested changes done Chayse Ramsay 2018-02-12 02:35:17 +00:00
  • a1116f6dc8 QM is now a Head of Staff, everyone rejoice Chayse Ramsay 2018-02-12 01:52:33 +00:00
  • 512d696a83 Automatic changelog generation for PR #5427 [ci skip] CitadelStationBot 2018-02-11 17:35:31 -06:00
  • 17ed07d3b2 Merge pull request #5427 from Citadel-Station-13/upstream-merge-35417 deathride58 2018-02-11 23:35:29 +00:00
  • 2c02dbf53d Automatic changelog generation for PR #5408 [ci skip] CitadelStationBot 2018-02-11 17:34:48 -06:00
  • 081f7d3cbe Merge pull request #5408 from Michiyamenotehifunana/magrifle-fix deathride58 2018-02-11 23:34:45 +00:00
  • 75249cab07 Merge pull request #5431 from Citadel-Station-13/upstream-merge-35518 deathride58 2018-02-11 23:34:13 +00:00
  • e69a597fb2 Update lavaland_ruin_code.dm deathride58 2018-02-11 18:31:57 -05:00
  • cfc52b01de Merge pull request #5429 from Citadel-Station-13/upstream-merge-35519 deathride58 2018-02-11 23:31:06 +00:00
  • 38479da184 Automatic changelog generation for PR #5428 [ci skip] CitadelStationBot 2018-02-11 17:30:34 -06:00
  • 9b4ab9a45e Merge pull request #5428 from Citadel-Station-13/upstream-merge-35515 deathride58 2018-02-11 23:30:32 +00:00
  • 1d758999ae Merge pull request #5426 from Citadel-Station-13/upstream-merge-35555 deathride58 2018-02-11 23:30:21 +00:00
  • 161d1a16a7 Actually fixes broken accesses CitadelStationBot 2018-02-11 15:48:40 -06:00
  • ebd82bfe50 Merge pull request #35518 from ShizCalev/ACCESS-FIXES-MK2 Jordan Brown 2018-02-11 16:47:48 -05:00
  • 8aacd2c804 Update job_exp.dm deathride58 2018-02-11 16:44:29 -05:00
  • e2b4e3c567 Fixes wrong ID for syndicate ghost roles Jordan Brown 2018-02-11 16:34:17 -05:00
  • 0b56129932 Highlander antag datum CitadelStationBot 2018-02-11 15:33:02 -06:00
  • 4615696173 Highlander antag datum (#35519) AnturK 2018-02-11 22:32:06 +01:00
  • 98fcd0c54c Makes urinal cakes more realistic CitadelStationBot 2018-02-11 15:29:47 -06:00