Commit Graph

  • 4ca72c7733 re-add sugarcane to megaseed vendors kappa-sama 2019-08-16 14:38:25 -04:00
  • 219551daa4 re-add sugarcane to vendors kappa-sama 2019-08-16 14:36:56 -04:00
  • 69bb779a76 Merge pull request #3 from Citadel-Station-13/master kappa-sama 2019-08-16 14:32:42 -04:00
  • b7ae88b6e3 Made it sound a bit nicer Arturlang 2019-08-16 19:40:22 +03:00
  • 542915faa6 Update ert.dm Sishen 2019-08-16 10:53:24 -04:00
  • 26de2b8111 greybois Sishen 2019-08-16 10:49:26 -04:00
  • 03ec103e3d Update strained_muscles.dm Sishen 2019-08-16 10:02:52 -04:00
  • 2ca6464242 Update healing.dm Arturlang 2019-08-16 15:32:08 +03:00
  • 8bd54bcc54 I'm just waiting for a better idea before dumping this hot garbage again Poojawa 2019-08-16 06:24:42 -05:00
  • c3fb13c140 meh. Poojawa 2019-08-16 05:10:55 -05:00
  • d71f37167f I'm about to go fucking APE Poojawa 2019-08-16 04:58:16 -05:00
  • cd36b9ab12 a kevinz000 2019-08-15 15:11:57 -07:00
  • fb2971e3e6 Merge remote-tracking branch 'origin/master' into donator_grouping kevinz000 2019-08-15 14:40:44 -07:00
  • a95bf60e31 a kevinz000 2019-08-15 14:38:45 -07:00
  • 4c5eba6acb t kevinz000 2019-08-15 14:35:00 -07:00
  • cc86a84274 stuff kevinz000 2019-08-15 14:30:48 -07:00
  • 264cbf8108 reverts the add_blood back to add_blood_DNA Poojawa 2019-08-15 12:49:10 -05:00
  • 0290a46ddc Impliments Ghom review, reverts blood list back to component Poojawa 2019-08-15 12:32:44 -05:00
  • 6fab91046d Update misc.dm Sishen 2019-08-15 13:04:28 -04:00
  • 2073921f4b Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-08-15 08:39:41 -05:00
  • 017a3111ec Yeah this is a much, much better way of doing it. Poojawa 2019-08-15 08:37:10 -05:00
  • 3de3f511cf Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes Poojawa 2019-08-15 08:24:55 -05:00
  • b671384015 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements Poojawa 2019-08-15 08:23:48 -05:00
  • d16ee247a0 Update maintenance_loot.dm Raptorizer 2019-08-15 07:24:09 -05:00
  • a6d10885ec Revert "Update maintenance_loot.dm" Raptorizer 2019-08-15 07:11:57 -05:00
  • 087bca85e8 Update maintenance_loot.dm Raptorizer 2019-08-15 07:08:27 -05:00
  • 1cd6d826ee Remasters Toricrates Michiyamenotehifunana 2019-08-15 18:36:33 +08:00
  • 04c302b08e Service Tweaks Winter Flare 2019-08-15 06:28:46 -04:00
  • 0125a20252 Automatic changelog generation for PR #9126 [ci skip] CitadelStationBot 2019-08-15 03:12:15 -05:00
  • 2cdfa9cf2f Merge pull request #9126 from Sishen1542/viro-cures kevinz000 2019-08-15 01:12:12 -07:00
  • e0dbfbd88c bhjin said i don't NEED muzzle sprites so fuck it lolman360 2019-08-15 09:47:55 +10:00
  • ad91152c83 Update misc.dm Sishen 2019-08-14 17:08:33 -04:00
  • f6baaf8c58 honk honk Sishen 2019-08-14 17:06:58 -04:00
  • 3281f23eb6 made changes as per bhijns request Sishen 2019-08-14 16:30:54 -04:00
  • 7879d1ce13 Merge pull request #9103 from Citadel-Station-13/atmosberet deathride58 2019-08-14 15:44:24 -04:00
  • e84bad1e55 Automatic changelog generation for PR #9052 [ci skip] CitadelStationBot 2019-08-14 14:43:53 -05:00
  • 5f6a110f73 Merge pull request #9052 from Citadel-Station-13/kevinz000-patch-71 deathride58 2019-08-14 15:43:51 -04:00
  • bcf3c1a172 Automatic changelog generation for PR #9100 [ci skip] CitadelStationBot 2019-08-14 14:40:56 -05:00
  • 2406254faa Merge pull request #9100 from cebutris/got-milk deathride58 2019-08-14 15:40:53 -04:00
  • b6478b0254 Automatic changelog generation for PR #9098 [ci skip] CitadelStationBot 2019-08-14 14:31:49 -05:00
  • 089a613683 Merge pull request #9098 from cebutris/tea-fix deathride58 2019-08-14 15:31:46 -04:00
  • 2302e24255 Merge pull request #9116 from Citadel-Station-13/kevinz000-patch-73 deathride58 2019-08-14 15:10:49 -04:00
  • 9010b9003a Merge pull request #8930 from Citadel-Station-13/kevinz000-patch-54 deathride58 2019-08-14 15:01:33 -04:00
  • 5a4d0a73ce Merge pull request #9038 from Citadel-Station-13/kevinz000-patch-67 deathride58 2019-08-14 15:00:36 -04:00
  • 3610d14869 Automatic changelog generation for PR #9115 [ci skip] CitadelStationBot 2019-08-14 13:59:44 -05:00
  • 93721c5224 Merge pull request #9115 from Thalpy/wah deathride58 2019-08-14 14:59:42 -04:00
  • b23b574baf Automatic changelog generation for PR #9113 [ci skip] CitadelStationBot 2019-08-14 13:59:16 -05:00
  • 315828845d Merge pull request #9113 from Thalpy/RoundingErrors deathride58 2019-08-14 14:59:13 -04:00
  • 97c3b2eda7 Prevents runtime spam from Hugs of the North Star Chayse Ramsay 2019-08-14 18:29:35 +01:00
  • 141a93236c Service QoL Winter Flare 2019-08-14 04:01:18 -04:00
  • 0056e3eb61 Update other_reagents.dm Trilbyspaceclone 2019-08-13 11:49:00 -04:00
  • 3224e6ca4a ..() Trilbyspaceclone 2019-08-13 11:46:52 -04:00
  • 382487fdc2 viruseseses-cures Sishen 2019-08-13 05:32:37 -04:00
  • 08bba425e4 run in a straight line to win gamemode lol Sishen 2019-08-12 19:42:58 -04:00
  • 13b3552e64 i'm dumb Linzolle 2019-08-12 14:37:48 -05:00
  • a27f3996ce Revert "Makes the balls message only work if you have arousal" MrJWhit 2019-08-12 15:02:34 -04:00
  • e55e933a85 Makes the balls message only work if you have arousal MrJWhit 2019-08-12 14:56:27 -04:00
  • 2095a14256 add mining shuttle console to techweb Linzolle 2019-08-12 13:49:26 -05:00
  • 411e0cc2cc Update on_move.dm kevinz000 2019-08-12 00:17:31 -07:00
  • 5a9b2bcad7 Added COORD Fermi 2019-08-12 05:10:46 +01:00
  • ae1191a469 Changes an oversight (and a unintended wah!) Fermi 2019-08-12 05:10:05 +01:00
  • 75440a48c5 30 might be too much Fermi 2019-08-12 01:36:46 +01:00
  • 10ca106f06 [TO TEST] Adds nuance to hatmium and SDGF explosions. Fermi 2019-08-12 01:36:21 +01:00
  • 0f4469e59f Re-enables fermiexplosions in grenades. Fermi 2019-08-12 01:03:35 +01:00
  • 51a6ae96a0 R.data Fermi 2019-08-12 00:37:57 +01:00
  • c0bbb099f8 Fixes disappearing chems. Fermi 2019-08-12 00:36:45 +01:00
  • 32d70bbb6a >_< Trilbyspaceclone 2019-08-11 19:10:34 -04:00
  • d30df526f7 Update berries.dm Trilbyspaceclone 2019-08-11 19:05:36 -04:00
  • e30f72067e Merge branch 'master' into NeuroFix Fermi 2019-08-12 00:00:28 +01:00
  • ffa574b1be Update machine_vending.dm Sishen 2019-08-11 13:17:55 -04:00
  • cf44c96be9 Automatic changelog generation for PR #8992 [ci skip] CitadelStationBot 2019-08-11 12:15:51 -05:00
  • a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals kevinz000 2019-08-11 10:15:49 -07:00
  • ed71bf4104 Automatic changelog generation for PR #9010 [ci skip] CitadelStationBot 2019-08-11 12:13:04 -05:00
  • d3b3836d33 Merge pull request #9010 from BurgerLUA/Actual-War-Ops kevinz000 2019-08-11 10:13:02 -07:00
  • 5f74d55bde Automatic changelog generation for PR #8927 [ci skip] CitadelStationBot 2019-08-11 12:12:22 -05:00
  • 123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151 kevinz000 2019-08-11 10:12:20 -07:00
  • f81ad400b4 Automatic changelog generation for PR #9054 [ci skip] CitadelStationBot 2019-08-11 12:11:14 -05:00
  • b75c82b4ee Merge pull request #9054 from Sishen1542/stando kevinz000 2019-08-11 10:11:11 -07:00
  • f1bc6e42c8 Update machine_vending.dm Sishen 2019-08-11 13:10:14 -04:00
  • 0dcd3a2688 Automatic changelog generation for PR #9062 [ci skip] CitadelStationBot 2019-08-11 12:08:47 -05:00
  • 69884d1abe Merge pull request #9062 from Trilbyspaceclone/patch-207 kevinz000 2019-08-11 10:08:45 -07:00
  • 96842ed1c3 Merge pull request #9075 from Ghommie/Ghommie-cit184 kevinz000 2019-08-11 10:05:58 -07:00
  • ffd4edffe6 Automatic changelog generation for PR #9079 [ci skip] CitadelStationBot 2019-08-11 12:01:12 -05:00
  • cba8d3478a Merge pull request #9079 from Sishen1542/lingblade kevinz000 2019-08-11 10:01:10 -07:00
  • 3b5600b81d Merge pull request #9092 from Sishen1542/emp-beacons kevinz000 2019-08-11 10:00:36 -07:00
  • aa4e20c6b3 Automatic changelog generation for PR #9101 [ci skip] CitadelStationBot 2019-08-11 11:59:32 -05:00
  • a576e71a01 Merge pull request #9101 from Sishen1542/stealthy-surgery kevinz000 2019-08-11 09:59:29 -07:00
  • 821463f59c Nya TrilbySpaceClone 2019-08-11 11:47:56 -04:00
  • b2eda962d1 Merge pull request #9093 from MrJWhit/Change-IAA-Text kevinz000 2019-08-11 08:34:21 -07:00
  • 675c042958 Update __donator.dm deathride58 2019-08-11 08:38:13 -04:00
  • 5dddb11773 Fixes handcuffs being impossible to actually resist out of deathride58 2019-08-11 08:37:00 -04:00
  • 3e2f35b96c nyoom Sishen 2019-08-11 04:04:01 -04:00
  • f17aea268c Donator item Jay 2019-08-11 01:07:20 -05:00
  • 23d4b9827d fix, yadda yadda Sishen 2019-08-11 01:19:37 -04:00
  • ccb2d91c90 Update hats.dmi lolman360 2019-08-11 15:17:46 +10:00
  • 06bd8b8f20 Create hats.dmi lolman360 2019-08-11 15:14:49 +10:00
  • b8a90fb742 Delete hats.dmi lolman360 2019-08-11 15:12:11 +10:00
  • 02ea161b2a hmm today i will undocument changes lolman360 2019-08-11 14:59:48 +10:00
  • b283a0979c yay lolman360 2019-08-11 14:56:42 +10:00
  • e2e7133eba ew things are called different things lolman360 2019-08-11 14:54:17 +10:00