Commit Graph

  • ec560c8371 Ports "More robust dorfs." Ghommie 2019-07-31 22:14:39 +02:00
  • 438c3253d0 Taur snowflake code makes me sick. Ghommie 2019-07-31 22:01:05 +02:00
  • 7c9c51b777 Ports "Adds techpriest robes and adds them to the RoboDrobe" Ghommie 2019-07-31 21:54:55 +02:00
  • 6dd92ce122 . Ghommie 2019-07-31 21:26:59 +02:00
  • d9a09d7211 Undoes a few things. Ghommie 2019-07-31 21:23:20 +02:00
  • 1639a7002a Adds in a stereotypical vegetarian MRE. Tweaks the rest. Ghommie 2019-07-31 21:02:12 +02:00
  • 937c809b0b Update action.dm Trilbyspaceclone 2019-07-31 12:57:10 -04:00
  • ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" Ghommie 2019-07-31 18:56:00 +02:00
  • c68fb90955 Update snacks_cake.dm Trilbyspaceclone 2019-07-31 12:03:56 -04:00
  • ef6be90435 Update recipes_frozen.dm Trilbyspaceclone 2019-07-31 11:42:20 -04:00
  • 3dca4dd379 Update snacks_frozen.dm Trilbyspaceclone 2019-07-31 11:35:19 -04:00
  • d6885d41a9 Update quirks.dm kevinz000 2019-07-31 07:54:14 -07:00
  • 397c62bf7a undergarment fixes. Ghommie 2019-07-31 16:19:25 +02:00
  • bbb380e043 Update medical.dm Trilbyspaceclone 2019-07-31 09:03:27 -04:00
  • a06de7c3b7 mistake. Ghommie 2019-07-31 13:26:47 +02:00
  • b000aa4673 Fixes the dark sabre donator item. Ghommie 2019-07-31 13:06:51 +02:00
  • 1db0ceff1f Added BurgerLua 2019-07-31 03:33:33 -07:00
  • 89f2ed4064 Added BurgerLua 2019-07-31 02:55:48 -07:00
  • db198ba217 fix leg sweep Linzolle 2019-07-31 01:17:12 -05:00
  • 06271dfcff aching special case. Ghommie 2019-07-31 03:12:09 +02:00
  • 16afae1e14 boolean Ghommie 2019-07-31 03:06:20 +02:00
  • 991e4e8d41 Fixes and standarizes sword sheaths/scabbards overlays. Ghommie 2019-07-31 02:43:40 +02:00
  • a9330b784a Reward those who try. Fermi 2019-07-30 23:16:05 +01:00
  • 085251f5f7 update_icon Chayse Ramsay 2019-07-30 04:35:54 +01:00
  • d2c1973399 resolved NVG merge conflicts EgoSumStultus 2019-07-29 16:25:25 -07:00
  • c36f9e2596 Fixing merge conflicts. Fermi 2019-07-29 23:04:10 +01:00
  • fbbc4d8589 Merge branch 'pr/21' Fermi 2019-07-29 22:57:40 +01:00
  • 54f3934f55 step to pixel TrilbySpaceClone 2019-07-29 12:50:13 -04:00
  • d610d9e4eb green man told me to TrilbySpaceClone 2019-07-29 12:16:58 -04:00
  • 94fa4aa6d5 Merge branch 'master' into Rapid-Resprite-Service Michiyamenotehifunana 2019-07-29 21:15:46 +08:00
  • 3d597ea508 Automatic changelog generation for PR #8921 [ci skip] CitadelStationBot 2019-07-29 07:46:09 -05:00
  • 823b14e1e4 Merge pull request #8921 from Trilbyspaceclone/Runtimestation_update kevinz000 2019-07-29 05:46:07 -07:00
  • fadb81042c Automatic changelog generation for PR #8945 [ci skip] CitadelStationBot 2019-07-29 07:05:25 -05:00
  • c1c30c0f93 Merge pull request #8945 from Ghommie/Ghommie-cit155 kevinz000 2019-07-29 05:05:23 -07:00
  • 261b0d3c25 Automatic changelog generation for PR #8956 [ci skip] CitadelStationBot 2019-07-29 07:02:36 -05:00
  • 7ab0b28c2c Merge pull request #8956 from CameronWoof/backpack-icons kevinz000 2019-07-29 05:02:34 -07:00
  • 57b6294310 Update uplink_items.dm Trilbyspaceclone 2019-07-29 07:54:17 -04:00
  • 969b928642 Update special.dm Trilbyspaceclone 2019-07-29 07:53:41 -04:00
  • f9dfe5ae97 Update special.dm Trilbyspaceclone 2019-07-29 07:53:11 -04:00
  • a83aa9da7b Automatic changelog generation for PR #8950 [ci skip] CitadelStationBot 2019-07-29 06:50:52 -05:00
  • e6fc288076 Merge pull request #8950 from Trilbyspaceclone/patch-195 kevinz000 2019-07-29 04:50:49 -07:00
  • e55563d058 Merge pull request #8990 from EgoSumStultus/his-grace-mindless-mob-fix kevinz000 2019-07-29 04:47:44 -07:00
  • 598faea742 Automatic changelog generation for PR #8991 [ci skip] CitadelStationBot 2019-07-29 06:47:03 -05:00
  • 0cda6cf8cf Merge pull request #8991 from Trilbyspaceclone/patch-200 kevinz000 2019-07-29 04:47:01 -07:00
  • 17c3f13556 Automatic changelog generation for PR #8985 [ci skip] CitadelStationBot 2019-07-29 06:46:32 -05:00
  • 9d038ffbf7 Merge pull request #8985 from Linzolle/trenchcloak kevinz000 2019-07-29 04:46:30 -07:00
  • fa0069711e Automatic changelog generation for PR #8980 [ci skip] CitadelStationBot 2019-07-29 06:44:10 -05:00
  • 25eba5829d Merge pull request #8980 from Ghommie/Ghommie-cit159 kevinz000 2019-07-29 04:44:08 -07:00
  • cf8ea680e1 Automatic changelog generation for PR #8964 [ci skip] CitadelStationBot 2019-07-29 06:42:22 -05:00
  • 2252b81798 Merge pull request #8964 from Trilbyspaceclone/patch-197 kevinz000 2019-07-29 04:42:20 -07:00
  • 18b58d117c Automatic changelog generation for PR #8959 [ci skip] CitadelStationBot 2019-07-29 06:41:57 -05:00
  • a0cf508d99 Merge pull request #8959 from Trilbyspaceclone/patch-196 kevinz000 2019-07-29 04:41:55 -07:00
  • 3713533c18 Merge pull request #8983 from Ghommie/Ghommie-cit161 kevinz000 2019-07-29 04:41:23 -07:00
  • 13427f592a Automatic changelog generation for PR #8966 [ci skip] CitadelStationBot 2019-07-29 06:41:09 -05:00
  • a95fff589c Merge pull request #8966 from Poojawa/RLD-fix kevinz000 2019-07-29 04:41:07 -07:00
  • 683e071654 Automatic changelog generation for PR #8965 [ci skip] CitadelStationBot 2019-07-29 06:40:04 -05:00
  • 624d74f500 Merge pull request #8965 from Trilbyspaceclone/patch-198 kevinz000 2019-07-29 04:40:01 -07:00
  • 8a2f05565e Automatic changelog generation for PR #8974 [ci skip] CitadelStationBot 2019-07-29 06:39:41 -05:00
  • c1092c0f48 Merge pull request #8974 from EgoSumStultus/blood-gun-sprite-fix kevinz000 2019-07-29 04:39:39 -07:00
  • 70ec76ebaa Automatic changelog generation for PR #8971 [ci skip] CitadelStationBot 2019-07-29 06:39:14 -05:00
  • 26c195dec8 Merge pull request #8971 from Linzolle/toxiclover kevinz000 2019-07-29 04:39:12 -07:00
  • 6ef4f4056b Automatic changelog generation for PR #8978 [ci skip] CitadelStationBot 2019-07-29 06:38:45 -05:00
  • 8477a524ae Merge pull request #8978 from YakumoChen/cardbored kevinz000 2019-07-29 04:38:42 -07:00
  • b2a707f971 Automatic changelog generation for PR #8976 [ci skip] CitadelStationBot 2019-07-29 06:38:17 -05:00
  • 11628431b4 Merge pull request #8976 from Ghommie/Ghommie-cit157 kevinz000 2019-07-29 04:38:14 -07:00
  • 59cebd5011 Automatic changelog generation for PR #8982 [ci skip] CitadelStationBot 2019-07-29 06:37:39 -05:00
  • 2c3e46bbb9 Merge pull request #8982 from Ghommie/Ghommie-cit160 kevinz000 2019-07-29 04:37:36 -07:00
  • 4018493f47 Automatic changelog generation for PR #8984 [ci skip] CitadelStationBot 2019-07-29 06:37:23 -05:00
  • 156d525897 Merge pull request #8984 from Ghommie/Ghommie-cit162 kevinz000 2019-07-29 04:37:21 -07:00
  • 69067b34e3 Automatic changelog generation for PR #8979 [ci skip] CitadelStationBot 2019-07-29 06:33:23 -05:00
  • 32e8bfbea1 Merge pull request #8979 from Ghommie/Ghommie-cit158 kevinz000 2019-07-29 04:33:21 -07:00
  • a3269419f9 Automatic changelog generation for PR #8795 [ci skip] CitadelStationBot 2019-07-29 06:32:54 -05:00
  • 7b7f4f8042 Merge pull request #8795 from Sishen1542/emp-rebalance kevinz000 2019-07-29 04:32:51 -07:00
  • 7ca32cd97f port 2 TrilbySpaceClone 2019-07-29 07:28:38 -04:00
  • 606639ce23 part 1 fixing shit TrilbySpaceClone 2019-07-29 05:52:49 -04:00
  • 3c181af4b0 modular_citadel bad Linzolle 2019-07-29 01:17:45 -05:00
  • 1263918bd3 REMOVE SHIELF EgoSumStultus 2019-07-28 21:51:40 -07:00
  • cdb45a2ae0 Added BurgerLua 2019-07-28 21:37:49 -07:00
  • 2eda8f2666 Fixes "inactive" high luminosity eyes turning back on as soon as you move around. Ghommie 2019-07-29 06:13:36 +02:00
  • db3b714489 . Ghommie 2019-07-29 04:52:53 +02:00
  • 51a715e779 . Ghommie 2019-07-29 04:50:47 +02:00
  • 4ef1413342 dupe icons instead of snowflake vars. Ghommie 2019-07-29 04:50:12 +02:00
  • 2b224400e3 Adds in worn overlays for different types of cuffs. Ghommie 2019-07-29 04:31:27 +02:00
  • 5e5f2fea54 Heck Fermi 2019-07-29 00:05:26 +01:00
  • d472177a4c A casual cough. Fermi 2019-07-28 23:59:33 +01:00
  • 4c01b7ad57 Maybe Oxy so people don't kill themselves. Fermi 2019-07-28 23:56:30 +01:00
  • b6e2122d8d Fixes, but good. Fermi 2019-07-28 23:55:25 +01:00
  • 87b412a8c4 Recompiling gui stuff. Fermi 2019-07-28 23:38:10 +01:00
  • d080446a77 Merge branch 'pr/20' Fermi 2019-07-28 23:28:19 +01:00
  • 31709938c6 Pushing a buncha stuff so I can fix things. Fermi 2019-07-28 23:23:45 +01:00
  • 0b87c1b21f Merge pull request #8993 from deathride58/fuckmemories BlackMajor 2019-07-29 09:51:07 +12:00
  • 7b681f4129 Fixes jogging on wet tiles actually slipping you if you have less than 20 stamloss. Ghommie 2019-07-28 19:35:53 +02:00
  • a373899ae0 [s] fixes major server crash exploit vector involving notes deathride58 2019-07-28 13:08:02 -04:00
  • 6f33856ae7 Makes staminaloss also apply the oxyloss fullscreen overlay. Ghommie 2019-07-28 18:51:19 +02:00
  • 5055cd73b9 Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains. Chayse Ramsay 2019-07-28 17:31:59 +01:00
  • ca2b4a8267 Update mutations.dm Trilbyspaceclone 2019-07-28 08:11:06 -04:00
  • a2b35d71fa port-part1 Trilbyspaceclone 2019-07-28 08:07:44 -04:00
  • 223aa33b07 mind check EgoSumStultus 2019-07-28 04:43:06 -07:00
  • bf137a60a7 Update mob.dm kevinz000 2019-07-28 03:26:17 -07:00
  • e79bf3ab07 Merge pull request #8969 from Sishen1542/hypofix kevinz000 2019-07-27 21:54:36 -07:00