Commit Graph

  • 1060bb05b4 Space hermit ruin BlackMajor 2019-06-17 17:41:46 +12:00
  • f416c1ac7d sprite fixes. Ghommie 2019-06-17 05:38:24 +02:00
  • 519ad202df fixes. Ghommie 2019-06-17 05:19:30 +02:00
  • 1323ace579 Peanuts, peanut butter, and sandwiches. Ghommie 2019-06-17 05:17:24 +02:00
  • 9c50b9cb11 typo kevinz000 2019-06-16 19:58:07 -07:00
  • 3527664c40 Merge branch 'master' into sprint_stamina kevinz000 2019-06-16 19:55:56 -07:00
  • 6c54c21d9c Merge pull request #8653 from Citadel-Station-13/commjacket kevinz000 2019-06-16 19:54:24 -07:00
  • c6f3bd1fd1 Merge pull request #8575 from Citadel-Station-13/kevinz000-patch-41 deathride58 2019-06-16 22:53:10 -04:00
  • b487b0103b Merge pull request #8574 from Citadel-Station-13/durasteel_toolboxes deathride58 2019-06-16 22:52:47 -04:00
  • 7b329ae824 Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline deathride58 2019-06-16 22:51:03 -04:00
  • d0bc89353c Merge pull request #8597 from Citadel-Station-13/kevinz000-patch-48 deathride58 2019-06-16 22:50:15 -04:00
  • 5ad5279138 Automatic changelog generation for PR #8648 [ci skip] CitadelStationBot 2019-06-16 21:47:12 -05:00
  • 28ca8dee46 Merge pull request #8648 from Trilbyspaceclone/patch-178 kevinz000 2019-06-16 19:47:09 -07:00
  • d08eeeee4c Automatic changelog generation for PR #8584 [ci skip] CitadelStationBot 2019-06-16 21:43:12 -05:00
  • 78c969a9cb Merge pull request #8584 from Trilbyspaceclone/patch-172 kevinz000 2019-06-16 19:43:10 -07:00
  • 107e4c40cf Automatic changelog generation for PR #8505 [ci skip] CitadelStationBot 2019-06-16 21:42:17 -05:00
  • 302b235911 Merge pull request #8505 from BurgerLUA/RCDMEMES kevinz000 2019-06-16 19:42:15 -07:00
  • 42b5ec3159 Automatic changelog generation for PR #8497 [ci skip] CitadelStationBot 2019-06-16 21:41:59 -05:00
  • 27d7dc430f Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors kevinz000 2019-06-16 19:41:57 -07:00
  • 1ec01d3a7f Automatic changelog generation for PR #8561 [ci skip] CitadelStationBot 2019-06-16 21:40:52 -05:00
  • 7b71d20d8e Merge pull request #8561 from Ghommie/Ghommie-cit38 kevinz000 2019-06-16 19:40:49 -07:00
  • c5a205e06c Automatic changelog generation for PR #8570 [ci skip] CitadelStationBot 2019-06-16 21:40:03 -05:00
  • 27333276de Merge pull request #8570 from Trilbyspaceclone/patch-170 kevinz000 2019-06-16 19:40:01 -07:00
  • 9d014d3bbe Automatic changelog generation for PR #8578 [ci skip] CitadelStationBot 2019-06-16 21:38:25 -05:00
  • 1739ee1685 Merge pull request #8578 from Ghommie/Ghommie-cit41 kevinz000 2019-06-16 19:38:23 -07:00
  • e186b6515d Automatic changelog generation for PR #8652 [ci skip] CitadelStationBot 2019-06-16 21:35:58 -05:00
  • b6aef75eed Merge pull request #8652 from Ghommie/Ghommie-cit53 kevinz000 2019-06-16 19:35:55 -07:00
  • aa2723631e Automatic changelog generation for PR #8643 [ci skip] CitadelStationBot 2019-06-16 21:35:31 -05:00
  • 430bc7f43f Merge pull request #8643 from Ghommie/Ghommie-cit48 kevinz000 2019-06-16 19:35:28 -07:00
  • 65ac93a144 Automatic changelog generation for PR #8416 [ci skip] CitadelStationBot 2019-06-16 21:35:08 -05:00
  • 1a6450a2e2 Merge pull request #8416 from Trilbyspaceclone/patch-135 kevinz000 2019-06-16 19:35:05 -07:00
  • 9b226953af Merge pull request #8617 from Poojawa/ds9-mystery kevinz000 2019-06-16 19:33:02 -07:00
  • df436e93c4 Automatic changelog generation for PR #8579 [ci skip] CitadelStationBot 2019-06-16 21:32:40 -05:00
  • 6c560c566f Merge pull request #8579 from Trilbyspaceclone/patch-171 kevinz000 2019-06-16 19:32:38 -07:00
  • 6b40be0b7b Automatic changelog generation for PR #8614 [ci skip] CitadelStationBot 2019-06-16 21:31:11 -05:00
  • 67a00c9141 Merge pull request #8614 from Ghommie/Ghommie-cit44 kevinz000 2019-06-16 19:31:08 -07:00
  • d9119d43f0 Merge pull request #8627 from BlackMajor/MeMapGood kevinz000 2019-06-16 19:29:23 -07:00
  • 12c3fb32df Automatic changelog generation for PR #8618 [ci skip] CitadelStationBot 2019-06-16 21:29:06 -05:00
  • 9e85eb5757 Merge pull request #8618 from Trilbyspaceclone/Magless kevinz000 2019-06-16 19:29:04 -07:00
  • 92e0d7c20b Update custom_items.dm LetterJay 2019-06-16 20:54:27 -05:00
  • 6b903893b2 Update __donator.dm LetterJay 2019-06-16 20:54:02 -05:00
  • f19a3541a3 cleans up runtimes Poojawa 2019-06-16 19:30:14 -05:00
  • 55fbbd8a3f Merge branch 'master' into Unmodular Trilbyspaceclone 2019-06-16 20:02:56 -04:00
  • b45c870ae4 Immodular TrilbySpaseClone 2019-06-16 19:58:49 -04:00
  • 762a3e3c02 Ports revised job backend from TG Poojawa 2019-06-16 18:45:26 -05:00
  • f1e1eac13a Delete DELETEME.txt.txt LetterJay 2019-06-16 18:18:48 -05:00
  • 8d07ab33be DELETEME.txt.txt Jay 2019-06-16 18:17:21 -05:00
  • 6f2b316b30 Oh yea, ghost seizure fix. Ghommie 2019-06-17 00:40:51 +02:00
  • b2d82bd1f1 Applying upstream fixes. Ghommie 2019-06-17 00:27:07 +02:00
  • b782226900 ports "Componentizes orbiting" Ghommie 2019-06-17 00:19:57 +02:00
  • fb70b97d5b Tweaks hypnoquirk as the discord seems to really want it. Thalpy 2019-06-16 20:24:36 +01:00
  • 98fc55e9f8 Merge branch 'master' into Wheelchairs Thalpy 2019-06-16 17:33:57 +01:00
  • 5716ea7a4b Update shields.dm Trilbyspaceclone 2019-06-16 10:22:07 -04:00
  • 4614235f75 Comments. Fermi 2019-06-16 13:34:38 +01:00
  • c2b9c0321d Catfix Fermi 2019-06-16 13:33:41 +01:00
  • 2df7e208b5 Spellchecking. Fermi 2019-06-16 12:34:37 +01:00
  • 3caadb2009 pH calc redo, too confusing. Fermi 2019-06-16 12:22:13 +01:00
  • a055f12394 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 Ghommie 2019-06-16 12:41:06 +02:00
  • 89dd3d4e87 Merge pull request #8657 from BlackMajor/Dunga kevinz000 2019-06-16 03:11:26 -07:00
  • 979455d86a HAHA WHOOPS BlackMajor 2019-06-16 22:10:00 +12:00
  • 4da303e64c Update RCD.dm kevinz000 2019-06-16 02:26:53 -07:00
  • 8fb3022624 Classic me. Fermi 2019-06-16 10:25:43 +01:00
  • 5142faa353 local xmas tree almost ruins PR. Ghommie 2019-06-16 11:07:16 +02:00
  • ba3a2c00bb ports in the Hilbert's Hotel. Ghommie 2019-06-16 10:50:59 +02:00
  • 4a88cce82e Automatic changelog generation for PR #8565 [ci skip] CitadelStationBot 2019-06-16 03:19:53 -05:00
  • 6149a44408 Merge pull request #8565 from SkullyRoberts/NudityPermit kevinz000 2019-06-16 01:19:51 -07:00
  • b0264414b2 Merge pull request #8576 from Sishen1542/whipcrack kevinz000 2019-06-16 01:18:37 -07:00
  • d91700dcfe Automatic changelog generation for PR #8591 [ci skip] CitadelStationBot 2019-06-16 03:16:15 -05:00
  • 1408a453de Merge pull request #8591 from Ghommie/Ghommie-cit43 kevinz000 2019-06-16 01:16:12 -07:00
  • 743ac969e6 Automatic changelog generation for PR #8479 [ci skip] CitadelStationBot 2019-06-16 03:13:10 -05:00
  • 1c46bcef7e Merge pull request #8479 from Ghommie/Ghommie-cit21 kevinz000 2019-06-16 01:13:08 -07:00
  • 0dc9d92b8b Merge pull request #8596 from Poojawa/ball-fixes kevinz000 2019-06-16 01:12:08 -07:00
  • 9c0cc52771 Merge pull request #8600 from Sishen1542/plushsalt kevinz000 2019-06-16 01:11:37 -07:00
  • 52db8135bc Automatic changelog generation for PR #8605 [ci skip] CitadelStationBot 2019-06-16 03:11:13 -05:00
  • 12ecaf63ee Merge pull request #8605 from Trilbyspaceclone/patch-174 kevinz000 2019-06-16 01:11:11 -07:00
  • fe62b961a2 Automatic changelog generation for PR #8640 [ci skip] CitadelStationBot 2019-06-16 03:10:49 -05:00
  • 5d8286f91c Merge pull request #8640 from Trilbyspaceclone/more_cooking1 kevinz000 2019-06-16 01:10:47 -07:00
  • 8e10286fd6 Merge pull request #8484 from BlackMajor/Dunga kevinz000 2019-06-16 01:10:25 -07:00
  • 0294cba855 Merge pull request #8213 from Citadel-Station-13/kevinz000-patch-33 BlackMajor 2019-06-16 20:09:15 +12:00
  • 9af1ce97f8 Automatic changelog generation for PR #8623 [ci skip] CitadelStationBot 2019-06-16 03:08:50 -05:00
  • c6bdb74c6a Merge pull request #8623 from Arturlang/RD_ROD_SUPLEX kevinz000 2019-06-16 01:08:48 -07:00
  • 3f39e5a8bc Merge pull request #8598 from Poojawa/patch-1 kevinz000 2019-06-16 01:08:17 -07:00
  • 6598688dd7 Merge pull request #8604 from Sishen1542/Scrubswasagoodshow kevinz000 2019-06-16 01:06:39 -07:00
  • 7ed360e54f Automatic changelog generation for PR #8645 [ci skip] CitadelStationBot 2019-06-16 03:04:11 -05:00
  • fa9c74cfa3 Merge pull request #8645 from Ghommie/Ghommie-cit49 kevinz000 2019-06-16 01:04:09 -07:00
  • e8f0656615 Automatic changelog generation for PR #8639 [ci skip] CitadelStationBot 2019-06-16 03:03:36 -05:00
  • 4135bcfa77 Merge pull request #8639 from Useroth/ninja-shit kevinz000 2019-06-16 01:03:34 -07:00
  • d3555d6782 Merge pull request #8243 from Trilbyspaceclone/meteor kevinz000 2019-06-16 01:01:43 -07:00
  • 5c99bbbd45 Undoing first step into scaling damage for fullmerge reasons BlackMajor 2019-06-16 20:00:31 +12:00
  • fcd093f566 commjacket Jay 2019-06-16 02:11:00 -05:00
  • b5e3da68bd Ports "areas_in_z after start population fix" Ghommie 2019-06-16 08:45:37 +02:00
  • 656e0941df Planet station will never happen, Bhjin. CitadelStationBot 2019-06-11 13:13:03 -05:00
  • c0d3ddceeb Update uplink_kits.dm Trilbyspaceclone 2019-06-15 22:59:24 -04:00
  • 88a8db87c2 Merge pull request #8612 from BlackMajor/Ooga deathride58 2019-06-15 21:29:55 -04:00
  • 05066f241b Improving keborgs' movement, not removing. Ghommie 2019-06-15 20:33:38 +02:00
  • be36a8bb33 Cleanup Fermi 2019-06-15 18:04:06 +01:00
  • 79d176336c A few minor fixes. Fermi 2019-06-15 11:36:38 +01:00
  • 3d78905394 Catto fix Fermi 2019-06-15 10:29:49 +01:00
  • 9219a2c813 Adding more ruins BlackMajor 2019-06-15 21:17:34 +12:00
  • 4528384976 Fuck it lets add way more spiciest PR BlackMajor 2019-06-15 19:03:04 +12:00