Commit Graph

  • 8e90a65cfa Add files via upload lolman360 2019-08-11 14:50:56 +10:00
  • dcd682bd59 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-08-10 23:48:47 -05:00
  • 2b2bdb37ba Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements Poojawa 2019-08-10 23:26:20 -05:00
  • 5dcd419d8a Merge pull request #8356 from Thalpy/master BlackMajor 2019-08-11 16:09:23 +12:00
  • df136ab96c lactation is now a preference Cebutris 2019-08-10 23:28:16 -04:00
  • 22b461c78f Merge pull request #1 from lolman360/master lolman360 2019-08-11 12:00:55 +10:00
  • 400c117fd0 yeetus those dmis my man lolman360 2019-08-11 11:56:48 +10:00
  • 5d78cf394b yeet those files up to the hub of git lolman360 2019-08-11 11:56:20 +10:00
  • 0451390778 control click and then drag is easy lolman360 2019-08-11 11:16:19 +10:00
  • ffad3cfe22 so i should really not have access to github but lolman360 2019-08-11 11:14:47 +10:00
  • e4a9f2743b and gitbabby lolman360 2019-08-11 11:14:07 +10:00
  • aa71a39fa8 so basically im monky lolman360 2019-08-11 11:13:38 +10:00
  • 2c1add5276 all my other comimits were to master lolman360 2019-08-11 11:13:02 +10:00
  • da61b66f5c ban me? lolman360 2019-08-11 11:11:30 +10:00
  • 92c7ae8732 yea i use webgit what ya gonna do lolman360 2019-08-11 11:07:17 +10:00
  • f131104a73 Add files via upload lolman360 2019-08-11 10:51:38 +10:00
  • a3cd143131 whaccky github hijinks Poojawa 2019-08-10 19:28:47 -05:00
  • 57835e2f81 head announce datums Poojawa 2019-08-10 19:20:05 -05:00
  • d496e16dde Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements Poojawa 2019-08-10 19:14:41 -05:00
  • 251ac24e02 [NEED TO TEST] {Preview} Fixes Neurotoxin and adjusts it's reaction. Fermi 2019-08-11 00:35:36 +01:00
  • d77360c794 gives tea aspera proper reagents Cebutris 2019-08-10 19:32:12 -04:00
  • 8d7f4a1385 duira lolman360 2019-08-10 21:43:28 +10:00
  • 234d058cc2 Update mecha_control_console.dm Sishen 2019-08-10 07:28:35 -04:00
  • 51011ccf97 Update guardian.dm Sishen 2019-08-10 07:05:53 -04:00
  • 15dbb7ff32 Update guardian.dm Sishen 2019-08-10 07:03:45 -04:00
  • b0a28d1a29 Update mutations.dm Sishen 2019-08-10 02:16:07 -04:00
  • c200c5eeec Automatic changelog generation for PR #9078 [ci skip] CitadelStationBot 2019-08-10 00:22:31 -05:00
  • 40b89f49cc Merge pull request #9078 from kappa-sama/moth1 kevinz000 2019-08-09 22:22:29 -07:00
  • 74b6bc79fd Automatic changelog generation for PR #9064 [ci skip] CitadelStationBot 2019-08-10 00:20:20 -05:00
  • b3b22029a6 Merge pull request #9064 from cebutris/hugloves kevinz000 2019-08-09 22:20:18 -07:00
  • af73ee78b1 Automatic changelog generation for PR #9070 [ci skip] CitadelStationBot 2019-08-10 00:18:42 -05:00
  • 8cdb33c3a2 Merge pull request #9070 from Linzolle/rainbow-knife kevinz000 2019-08-09 22:18:40 -07:00
  • 74008beb8f Merge pull request #9066 from Ghommie/Ghommie-cit181 kevinz000 2019-08-09 22:17:31 -07:00
  • 2aad4f28e2 Automatic changelog generation for PR #9083 [ci skip] CitadelStationBot 2019-08-10 00:16:36 -05:00
  • f516fcf539 Merge pull request #9083 from Trilbyspaceclone/fruit kevinz000 2019-08-09 22:16:34 -07:00
  • 86b0819994 Automatic changelog generation for PR #9084 [ci skip] CitadelStationBot 2019-08-10 00:16:11 -05:00
  • b213b0ed2b Merge pull request #9084 from Ghommie/Ghommie-cit185 kevinz000 2019-08-09 22:16:09 -07:00
  • 4dda79cde2 Automatic changelog generation for PR #9085 [ci skip] CitadelStationBot 2019-08-10 00:15:58 -05:00
  • 14033d9876 Merge pull request #9085 from Ghommie/Ghommie-cit186 kevinz000 2019-08-09 22:15:55 -07:00
  • 5dc2124df0 Update custom_items.dm Fel 2019-08-09 19:00:21 -04:00
  • b1df6c1c07 Automatic changelog generation for PR #9081 [ci skip] CitadelStationBot 2019-08-09 13:20:19 -05:00
  • 0329a80086 Merge pull request #9081 from BurgerLUA/Meteor-Fair-Warning kevinz000 2019-08-09 11:20:16 -07:00
  • 77e0551616 Adds a line in the spawntext for IAA MrJWhit 2019-08-09 13:56:07 -04:00
  • b8907c2f97 fixing what i forgot to do Sishen 2019-08-09 13:47:36 -04:00
  • 02b5100be7 Made scans advanced. Fermi 2019-08-09 13:01:14 +01:00
  • 6e0303fdba Actual fix for #9091 Fermi 2019-08-09 12:48:26 +01:00
  • eb9e6a041d Ghommie's fix. Fermi 2019-08-09 12:17:54 +01:00
  • 34cfd2c1e3 Fix for #9091 Fermi 2019-08-09 12:12:25 +01:00
  • c6fbb966c8 honk Sishen 2019-08-09 03:55:08 -04:00
  • 0693f27010 Update lavaland_surface_ash_walker1.dmm Sishen 2019-08-09 03:43:55 -04:00
  • dc66446064 dab dab Sishen 2019-08-09 03:19:02 -04:00
  • 921e12dd64 Update tgstation.dme Sishen 2019-08-09 01:43:36 -04:00
  • efe72ce973 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 Ghommie 2019-08-09 06:47:27 +02:00
  • 4ba3d851ed IT JUST WORKS Sishen 2019-08-09 00:46:14 -04:00
  • ee57720ee3 underwear colors fix 2: The revenge of the crunch. Ghommie 2019-08-09 05:11:12 +02:00
  • f76bb27127 Fixes some runtimes and removes a holodeck exploit Poojawa 2019-08-08 21:33:42 -05:00
  • eb3ae1d61a Fixes clock cult mass recall. Ghommie 2019-08-09 04:05:06 +02:00
  • 1fc69a13a4 okay fixed Sishen 2019-08-08 22:02:12 -04:00
  • 12c4fc139d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151 Ghommie 2019-08-09 04:00:23 +02:00
  • 98a279a6db likely fixes the examine bug lol Poojawa 2019-08-08 17:45:01 -05:00
  • 3f60d3ca1c Merge pull request #2 from kappa-sama/moth1 kappa-sama 2019-08-08 18:27:51 -04:00
  • a8e4ce1f77 Merge branch 'master' into moth1 kappa-sama 2019-08-08 18:27:34 -04:00
  • 5bd6f88226 Falsehoods TrilbySpaceClone 2019-08-08 18:27:01 -04:00
  • 1853dc185c Merge pull request #1 from Ghommie/Ghommie-cit185 kappa-sama 2019-08-08 18:25:24 -04:00
  • 283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-08-08 16:51:53 -05:00
  • 893c9c9c63 A correction? TrilbySpaceClone 2019-08-08 17:45:58 -04:00
  • a7287ed4d1 Merge branch 'moth1' of https://github.com/kappa-sama/Citadel-Station-13 into Ghommie-cit185 Ghommie 2019-08-08 23:11:58 +02:00
  • ab13b62bdd fruits of labor TrilbySpaceClone 2019-08-08 16:14:04 -04:00
  • a9eeb28fff Uncalibrated teleporters can now turn furries, scalies & co into flypeople too. Ghommie 2019-08-08 21:09:11 +02:00
  • 2dc15b3fc0 Update teleporter.dm kappa-sama 2019-08-08 15:05:48 -04:00
  • 1fb07e286a Removing reviewer comments incase of fullmerge. Fermi 2019-08-08 19:53:07 +01:00
  • ce064522fe Merge pull request #9076 from BurgerLUA/Proper-Fix kevinz000 2019-08-08 11:25:02 -07:00
  • 9d3aa1f3b0 Removing a comment block I missed. Fermi 2019-08-08 18:28:47 +01:00
  • 5764041835 Adds new title music! Fermi 2019-08-08 17:25:40 +01:00
  • 9566caa527 Added BurgerLua 2019-08-08 09:25:04 -07:00
  • cca25aa582 Merge pull request #23 from Citadel-Station-13/master Thalpy 2019-08-08 16:48:43 +01:00
  • 582b355224 Update guardian.dm Sishen 2019-08-08 11:00:23 -04:00
  • 004b79d4cd Vodka is alkaline Fermi 2019-08-08 15:31:07 +01:00
  • c6562164f1 Automatic changelog generation for PR #9071 [ci skip] CitadelStationBot 2019-08-08 04:00:40 -05:00
  • 290dfb8bbd Merge pull request #9071 from YakumoChen/cloningnerf kevinz000 2019-08-08 02:00:37 -07:00
  • 1d663d69bc Automatic changelog generation for PR #9061 [ci skip] CitadelStationBot 2019-08-08 03:59:53 -05:00
  • ad7189a211 Merge pull request #9061 from deathride58/fuckfemurbreakers kevinz000 2019-08-08 01:59:51 -07:00
  • a6991e3527 Automatic changelog generation for PR #9069 [ci skip] CitadelStationBot 2019-08-08 03:58:50 -05:00
  • 8b20413676 Merge pull request #9069 from Ghommie/Ghommie-cit183 kevinz000 2019-08-08 01:58:48 -07:00
  • 1f05123816 ook ook Sishen 2019-08-08 03:04:51 -04:00
  • 73e31aba04 Revert "Update teleporter.dm" kappa-sama 2019-08-08 02:55:27 -04:00
  • 42c37d9de3 Revert "Update teleporter.dm" kappa-sama 2019-08-08 02:55:24 -04:00
  • 85dc61f84d Revert "Update teleporter.dm" kappa-sama 2019-08-08 02:55:14 -04:00
  • c963f5e43e Update teleporter.dm kappa-sama 2019-08-08 02:40:51 -04:00
  • 2b3e53d7d6 Update teleporter.dm kappa-sama 2019-08-08 02:23:59 -04:00
  • 5fcb94d8d6 Update teleporter.dm kappa-sama 2019-08-08 02:12:31 -04:00
  • f38ac0dfbf possibly makes teleporter hate all races equally kappa-sama 2019-08-08 01:49:06 -04:00
  • f59b60e83a QOL OOGA BOOGA Sishen 2019-08-08 01:11:20 -04:00
  • 810251a37c Fixed bug with voting BurgerLua 2019-08-07 20:47:36 -07:00
  • df5366e911 Removes a redunant Remove() from high luminosity eyes. Ghommie 2019-08-08 05:06:53 +02:00
  • f33b9fa480 Merge branch 'master' into Actual-War-Ops BurgerLUA 2019-08-07 19:50:47 -07:00
  • 23e3263fcb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 Ghommie 2019-08-08 04:46:54 +02:00
  • 6eb887bb17 I really hope this works this time. Chaz 2019-08-07 17:01:55 -07:00
  • 2e71074f30 compile kevinz000 2019-08-07 13:22:25 -07:00
  • 803cef72dc s kevinz000 2019-08-07 13:18:48 -07:00