Commit Graph

  • 1a47fedade More intuitive, way less weird edge cases. Ghommie 2019-07-21 10:26:16 +02:00
  • 3440757fd0 Glass. Ghommie 2019-07-21 10:01:00 +02:00
  • fc78d02242 Fixing towels and improving them. Ghommie 2019-07-21 09:58:54 +02:00
  • 8f8b935a4f Update weapon_designs.dm kevinz000 2019-07-20 23:33:55 -07:00
  • 2a711a84d0 Further tweaks on dark mode. Ghommie 2019-07-21 08:22:39 +02:00
  • aa40f56306 darkmode/lightmode fixes and tweaks. Ghommie 2019-07-21 07:49:52 +02:00
  • f315696937 fix n stuff TrilbySpaceClone 2019-07-20 22:19:03 -04:00
  • 15ab1a26a4 Merge branch 'master' into master Thalpy 2019-07-21 01:50:41 +01:00
  • 60beff3420 Added BurgerLua 2019-07-20 17:42:00 -07:00
  • 4f2406ee3a Made it a critterbox instead. Fermi 2019-07-20 20:55:46 +01:00
  • c2b3df34c1 Cargobox. Fermi 2019-07-20 20:46:50 +01:00
  • 309bc1c899 Requested change. Fermi 2019-07-20 20:34:44 +01:00
  • 85f87b6679 Update code/game/objects/items/melee/energy.dm Ghom 2019-07-20 21:26:18 +02:00
  • 39dea966ae Automatic changelog generation for PR #8920 [ci skip] CitadelStationBot 2019-07-20 14:06:57 -05:00
  • c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149 kevinz000 2019-07-20 12:06:54 -07:00
  • 66ddaf3ae8 Merge pull request #8903 from Trilbyspaceclone/patch-192 kevinz000 2019-07-20 11:59:30 -07:00
  • f32eac94d3 Automatic changelog generation for PR #8829 [ci skip] CitadelStationBot 2019-07-20 13:59:07 -05:00
  • ab3c5acb0e Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT kevinz000 2019-07-20 11:59:05 -07:00
  • 60f8dc9bc8 Automatic changelog generation for PR #8830 [ci skip] CitadelStationBot 2019-07-20 13:57:16 -05:00
  • 08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114 kevinz000 2019-07-20 11:57:13 -07:00
  • 9f00a26eb4 Automatic changelog generation for PR #8917 [ci skip] CitadelStationBot 2019-07-20 13:54:50 -05:00
  • 3176cf958f Merge pull request #8917 from deathride58/fuckwarpwhistles kevinz000 2019-07-20 11:54:48 -07:00
  • a39dbf2e85 Automatic changelog generation for PR #8898 [ci skip] CitadelStationBot 2019-07-20 13:52:47 -05:00
  • f649920b49 Merge pull request #8898 from WhiteHusky/batch-check-injuries kevinz000 2019-07-20 11:52:45 -07:00
  • 8c93e48a01 Merge pull request #8896 from Bapldap/patch-1 kevinz000 2019-07-20 11:51:54 -07:00
  • 559a238d37 Automatic changelog generation for PR #8922 [ci skip] CitadelStationBot 2019-07-20 13:50:23 -05:00
  • 3fada5c624 Merge pull request #8922 from BurgerLUA/Voting-Transparency kevinz000 2019-07-20 11:50:21 -07:00
  • 724af961fd Automatic changelog generation for PR #8906 [ci skip] CitadelStationBot 2019-07-20 13:50:00 -05:00
  • fc7a305c46 Merge pull request #8906 from Ghommie/Ghommie-cit141 kevinz000 2019-07-20 11:49:58 -07:00
  • 22ddaafad4 Automatic changelog generation for PR #8925 [ci skip] CitadelStationBot 2019-07-20 13:49:41 -05:00
  • 08d9732fb8 Merge pull request #8925 from BurgerLUA/Autolathe-Fix kevinz000 2019-07-20 11:49:39 -07:00
  • 0a8954c2d6 Update packs.dm TrilbySpaceClone 2019-07-19 23:53:12 -04:00
  • d981b756e3 Update packs.dm TrilbySpaceClone 2019-07-19 23:49:53 -04:00
  • 94f5573e3a Update nanites.dm kevinz000 2019-07-19 17:45:44 -07:00
  • e5648fd471 Made bat part of previous bat type. Fermi 2019-07-19 22:57:22 +01:00
  • 75d6768ba7 Changed how the box works so it's not a storage. Fermi 2019-07-19 22:12:05 +01:00
  • 7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" Ghommie 2019-07-19 22:02:22 +02:00
  • 8fa90fb6a2 dream maker Ghommie 2019-07-19 21:59:57 +02:00
  • 7e99dd205a Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites. Ghommie 2019-07-19 21:54:48 +02:00
  • 12f2b767ab removes stamina-free spammability. Ghommie 2019-07-19 21:23:07 +02:00
  • b87442e633 Tones down some items attack stamina costs. kills hypereutactic blades copypasta. Ghommie 2019-07-19 20:09:16 +02:00
  • 4ab5060596 Adds secbats (tested) Fermi 2019-07-19 17:07:02 +01:00
  • 16802b2d13 Merge pull request #19 from Citadel-Station-13/master Thalpy 2019-07-19 16:21:43 +01:00
  • 7a0afda173 Cat patially, MK partially. Fermi 2019-07-19 16:19:42 +01:00
  • b2379198aa Makes the autolathe shock wire actually shock you lmao BurgerLua 2019-07-19 02:01:16 -07:00
  • d73fabffff . Fermi 2019-07-19 05:18:56 +01:00
  • fbf542134a Cidadel makes me want to hurt myself. Fermi 2019-07-19 05:18:35 +01:00
  • a5fcb918aa Astrogen tweaks and cat fixes. Fermi 2019-07-19 04:11:26 +01:00
  • a28d6b2b5a Update cit_emotes.dm kevinz000 2019-07-18 13:22:44 -07:00
  • 9d183beb9c Added BurgerLua 2019-07-17 18:15:55 -07:00
  • b578cc4db1 more uptodate TrilbySpaceClone 2019-07-17 20:59:06 -04:00
  • 44063e523d missing flag. Ghommie 2019-07-18 02:14:00 +02:00
  • fd1eecc996 Update click.dm kevinz000 2019-07-17 15:26:15 -07:00
  • 4e6554076c item flags, not clothing flags. Ghommie 2019-07-18 00:16:14 +02:00
  • 28ac38d800 Merge pull request #8910 from Ghommie/Ghommie-cit144 kevinz000 2019-07-17 15:08:36 -07:00
  • 7b39c0935c Merge pull request #8415 from Citadel-Station-13/sprint_stamina deathride58 2019-07-17 18:07:57 -04:00
  • 29f961ea07 Automatic changelog generation for PR #8915 [ci skip] CitadelStationBot 2019-07-17 17:07:40 -05:00
  • 884299e152 Merge pull request #8915 from Ghommie/Ghommie-cit148 kevinz000 2019-07-17 15:07:38 -07:00
  • 2970ee54a9 fix ur code catman deathride58 2019-07-17 18:05:34 -04:00
  • 589cdae0e1 Towels Ghommie 2019-07-18 00:03:49 +02:00
  • edbcabdce4 Merge pull request #8836 from Citadel-Station-13/kevinz000-patch-55 deathride58 2019-07-17 17:55:27 -04:00
  • adaac8322c Merge pull request #8589 from Citadel-Station-13/kevinz000-patch-47 deathride58 2019-07-17 17:53:39 -04:00
  • 77360259ae Merge pull request #8855 from Citadel-Station-13/kevinz000-patch-15 deathride58 2019-07-17 17:53:02 -04:00
  • dfc69b8deb Merge pull request #8871 from Citadel-Station-13/kevinz000-patch-58 deathride58 2019-07-17 17:52:05 -04:00
  • 7e12cfc9ff Merge pull request #8868 from Citadel-Station-13/kevinz000-patch-57 deathride58 2019-07-17 17:51:15 -04:00
  • 80b1383362 Merge pull request #8865 from Citadel-Station-13/kevinz000-patch-53 deathride58 2019-07-17 17:50:46 -04:00
  • 51665f0d5f Merge pull request #8863 from Citadel-Station-13/kevinz000-patch-51 deathride58 2019-07-17 17:49:08 -04:00
  • d7cbbfc8a4 Merge pull request #8866 from Citadel-Station-13/kevinz000-patch-54 deathride58 2019-07-17 17:48:38 -04:00
  • 8f41a29697 Merge pull request #8867 from Citadel-Station-13/kevinz000-patch-56 deathride58 2019-07-17 17:47:36 -04:00
  • 9ebdad68b7 Merge pull request #8892 from Citadel-Station-13/kevinz000-patch-61 deathride58 2019-07-17 17:47:09 -04:00
  • c36f25144b Merge pull request #8890 from Citadel-Station-13/kevinz000-patch-59 deathride58 2019-07-17 17:46:41 -04:00
  • f667ee7845 Automatic changelog generation for PR #8881 [ci skip] CitadelStationBot 2019-07-17 16:44:56 -05:00
  • 70d7ebbb45 Merge pull request #8881 from Ghommie/Ghommie-cit134 kevinz000 2019-07-17 14:44:54 -07:00
  • 03ef2c5257 Merge branch 'master' into NO-MORE-FETISH-CONTENT BurgerLUA 2019-07-17 14:17:33 -07:00
  • ea5837bfb1 double the sanity check, double the stability deathride58 2019-07-17 16:54:02 -04:00
  • 42aae8f45f fixing warp whistles in literally two fucking lines deathride58 2019-07-17 16:49:46 -04:00
  • bc158f4fd8 Update code/modules/food_and_drinks/drinks/drinks/bottle.dm Trilbyspaceclone 2019-07-17 16:39:14 -04:00
  • 9384af188e Gives cult conversions an alert popup and a couple extra seconds. Ghommie 2019-07-17 17:50:54 +02:00
  • 05d839029a Late night coding that was yesterday's. Ghommie 2019-07-17 16:03:05 +02:00
  • b818b1eedd Updating spraycans and crayons code. Ghommie 2019-07-17 15:45:48 +02:00
  • b134d23ea3 Merge pull request #8882 from Trilbyspaceclone/slaggy kevinz000 2019-07-17 00:50:21 -07:00
  • ba63926905 Sitting on the job TrilbySpaceClone 2019-07-16 22:42:57 -04:00
  • 69725a902b Tweak Fermi 2019-07-17 01:10:36 +01:00
  • 8bd64598c5 umh mh... Ghommie 2019-07-17 01:32:33 +02:00
  • 927baaa333 Fk mdlr ctdl Ghommie 2019-07-17 01:05:09 +02:00
  • 408c9aec51 Nothing the power of copypasta won't stop. Ghommie 2019-07-17 01:01:33 +02:00
  • ee32e1680f Ports "Replaces radio channel names and keys with defines" Ghommie 2019-07-17 00:52:41 +02:00
  • c7db3ad8f9 Porting a couple atmos performance improvements. Ghommie 2019-07-16 23:51:38 +02:00
  • 676186ee36 Ports "Removes some getflaticon calls from things that don't draw browser interfaces" Ghommie 2019-07-16 23:15:52 +02:00
  • b6f10c96a7 Modularity was a mistake. Ghommie 2019-07-16 21:05:12 +02:00
  • 9f6a3f428c last bit. Ghommie 2019-07-16 16:15:31 +02:00
  • 0d1988b6be More fixes. Ghommie 2019-07-16 16:10:16 +02:00
  • 75a8cbcc39 Makes Zelus flasks a subtype of bottle. Ghommie 2019-07-16 15:39:30 +02:00
  • acaf628d89 Sweaters now cover groin too. Ghommie 2019-07-16 10:23:02 +02:00
  • 3512d5eaec MK only pacifies on withdrawal now. Fermi 2019-07-16 06:00:40 +01:00
  • 4c971ea012 from afar Trilbyspaceclone 2019-07-15 22:12:20 -04:00
  • f343ea24db Ugh fine Fermi 2019-07-16 02:06:17 +01:00
  • 9995876a59 Update ert.dm kevinz000 2019-07-15 17:00:31 -07:00
  • bdf4f11ab8 Update ert.dm kevinz000 2019-07-15 16:56:51 -07:00
  • f16328c6e7 Update ert.dm kevinz000 2019-07-15 16:55:40 -07:00