Commit Graph

  • b452de12ff Made PanD.E.M.I.C beaker stuff more like ChemMaster Putnam 2019-10-07 01:23:17 -07:00
  • b2e71817d3 Automatic changelog generation for PR #9377 [ci skip] CitadelStationBot 2019-10-06 23:37:52 -05:00
  • dd46509597 Merge pull request #9377 from Thalpy/Fixes_melting_grenades kevinz000 2019-10-06 21:37:50 -07:00
  • 8228e52f43 Ports "Makes the illegal tech node harder to unlock" Ghommie 2019-10-07 06:19:48 +02:00
  • 5232728ee7 Ports "Adds three new .38 ammo types", also lazily adding .357 AP Ghommie 2019-10-07 05:25:47 +02:00
  • 31a6979c3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 Ghommie 2019-10-06 21:54:15 +02:00
  • 7dfd6005d9 I hate nerfing things :( Ghommie 2019-10-06 19:24:31 +02:00
  • a1a3bbe99f Skeleton tweaks (featuring "makes halloween skeletons not the overpowered pirate ones") Ghommie 2019-10-06 19:16:13 +02:00
  • a9e30720ec key, ckey, key, ckey Ghommie 2019-10-06 18:40:24 +02:00
  • ea031d6d40 Slowly getting there Fermi 2019-10-06 11:09:54 +01:00
  • ee5155bdbb fixes oddities Poojawa 2019-10-06 04:27:46 -05:00
  • 0b00ffb4d0 Boosts NPC runtime priority Poojawa 2019-10-06 00:00:27 -05:00
  • f01f00710f Porting some spraycan fixes. Ghommie 2019-10-06 05:30:16 +02:00
  • e009a4cc3d Revert "pooj fixed this anyway" Linzolle 2019-10-05 22:15:48 -05:00
  • d023d58b2c Changes Fermi 2019-10-06 02:10:46 +01:00
  • 63647b58ba Merge branch 'Spookytime' of https://github.com/Thalpy/Citadel-Station-13 into Spookytime Fermi 2019-10-06 00:37:01 +01:00
  • aff7f808ec oops Fermi 2019-10-06 00:36:57 +01:00
  • 3f21c0af5b Text Thalpy 2019-10-06 00:32:42 +01:00
  • 27c2c89766 Merge branch 'master' into Reagents_bitflats Thalpy 2019-10-05 23:43:19 +01:00
  • 5f5c719326 Merge branch 'master' into FERMICHEMCurTweaks Thalpy 2019-10-05 23:40:26 +01:00
  • cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 Ghommie 2019-10-05 22:03:37 +02:00
  • caa61fa0b4 hide your ass Linzolle 2019-10-05 12:24:10 -05:00
  • 108a4acb99 delet Ghommie 2019-10-05 18:43:48 +02:00
  • 32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 Ghommie 2019-10-05 18:22:43 +02:00
  • 1ec0685e62 I couldn't tell you how this happened Linzolle 2019-10-05 10:59:02 -05:00
  • 0b2c743f72 readds Trilbyspaceclone 2019-10-05 11:53:14 -04:00
  • f43bd91072 Merge branch 'master' into A_Tailer's_art Trilbyspaceclone 2019-10-05 11:50:12 -04:00
  • 4fc9385e44 oops Linzolle 2019-10-05 10:40:31 -05:00
  • 6ce8db8d7b pooj fixed this anyway Linzolle 2019-10-05 10:38:17 -05:00
  • 0de2a0daa8 Automatic changelog generation for PR #9382 [ci skip] CitadelStationBot 2019-10-05 10:27:02 -05:00
  • 4fd31bce32 Merge pull request #9382 from jakeramsay007/Cyborg-chair-unbuckling kevinz000 2019-10-05 08:27:00 -07:00
  • 447d560efc Automatic changelog generation for PR #9405 [ci skip] CitadelStationBot 2019-10-05 10:26:42 -05:00
  • 356755d710 Merge pull request #9405 from Thalpy/SPPEEEEDDDDDMERGE kevinz000 2019-10-05 08:26:40 -07:00
  • 6465c3e019 Automatic changelog generation for PR #9401 [ci skip] CitadelStationBot 2019-10-05 10:23:24 -05:00
  • 22f9c9f711 Merge pull request #9401 from Poojawa/patch-2 kevinz000 2019-10-05 08:23:22 -07:00
  • b674d695f8 Automatic changelog generation for PR #9388 [ci skip] CitadelStationBot 2019-10-05 10:22:49 -05:00
  • a923ea984a Merge pull request #9388 from Sishen1542/dynamicadminfix kevinz000 2019-10-05 08:22:47 -07:00
  • 443e8105b5 Merge pull request #9400 from Poojawa/patch-1 kevinz000 2019-10-05 08:22:15 -07:00
  • 236cfe79e2 Automatic changelog generation for PR #9407 [ci skip] CitadelStationBot 2019-10-05 10:22:04 -05:00
  • b691da0bca Merge pull request #9407 from Poojawa/cryo-qol kevinz000 2019-10-05 08:22:01 -07:00
  • e31c441b3d rogue tabbing Ghommie 2019-10-05 07:52:52 +02:00
  • 367789fda4 yes Ghommie 2019-10-05 07:16:17 +02:00
  • 3d22f4ec60 Porting a load of disease/symptoms code updates. Ghommie 2019-10-05 07:14:25 +02:00
  • b0a6624d73 Update Hallucination.dm kevinz000 2019-10-04 22:12:35 -07:00
  • 52fb4b03ac we are only keeping track of the number of singu beacons, var more efficient. Ghommie 2019-10-05 05:29:57 +02:00
  • 35a6991300 lone rogue parenthesis Ghommie 2019-10-05 05:14:38 +02:00
  • d706944e20 The niche singularity beacon now also moderately buffs meteor waves. Ghommie 2019-10-05 04:37:01 +02:00
  • 34bef911b2 macro arguments Ghommie 2019-10-05 03:49:06 +02:00
  • b6cc81d097 flooring. Ghommie 2019-10-05 03:13:51 +02:00
  • e4705ae5c0 Actually... let's do some scaling. Ghommie 2019-10-05 02:57:50 +02:00
  • 2b8fe43ef1 Removes the minimum player cap for the war ops. Ghommie 2019-10-05 02:31:02 +02:00
  • 4edfbd1dfa clarifying grammar Poojawa 2019-10-04 17:23:41 -05:00
  • 0c574fb62a Update medicine_reagents.dm Poojawa 2019-10-04 16:53:32 -05:00
  • 26c7a0ddb7 Promotes more chemical variety Poojawa 2019-10-04 16:45:25 -05:00
  • 9f88a72142 Makes Medsprays align with patches Poojawa 2019-10-04 16:06:07 -05:00
  • 9d2d84f53d Update table_frames.dm Poojawa 2019-10-04 15:49:25 -05:00
  • 1c2f2617d8 Ports "Makes supermatter melt walls if it finds itself in one" Ghommie 2019-10-04 22:44:40 +02:00
  • 35d33b4f3b mob_occupant Poojawa 2019-10-04 10:05:08 -05:00
  • cda97faaa5 UI and proper deletion stuff Poojawa 2019-10-04 09:52:42 -05:00
  • 209b195822 this probably doesn't fix the shitty console, but Poojawa 2019-10-04 07:31:31 -05:00
  • 0716b48a99 unmodularize it Poojawa 2019-10-04 06:56:57 -05:00
  • 7dada70447 Automatic changelog generation for PR #9385 [ci skip] CitadelStationBot 2019-10-04 01:15:32 -05:00
  • 828fe6e555 Merge pull request #9385 from Sishen1542/hypereut kevinz000 2019-10-03 23:15:29 -07:00
  • 266d7adfa6 Update adminhelp.dm kevinz000 2019-10-03 22:11:46 -07:00
  • e52652f8c8 Differing carpet reactions Poojawa 2019-10-03 23:19:52 -05:00
  • 9c4a808e7e Adds Cryo QoL with hotkeys Poojawa 2019-10-03 23:14:46 -05:00
  • 7f74a98372 .9 Fermi 2019-10-04 04:55:36 +01:00
  • 62737884f0 lye was 13 oops Fermi 2019-10-04 04:55:16 +01:00
  • 6d9aa8de70 More carpet options and ways to get them Poojawa 2019-10-03 22:54:10 -05:00
  • 2abd15c7e7 Incase someone speedmerges Fermi 2019-10-04 04:48:34 +01:00
  • 7d579e6a0f Removed cell charge on bite. GrayRachnid 2019-10-03 23:33:38 -04:00
  • 211e7a2c60 removes charge from small jaws. Reduces big jaws charge to 250. Adds a thingy so they don't run out. removes misleading comments. GrayRachnid 2019-10-03 23:05:38 -04:00
  • 79e85e2cfa Fixes some runtimes Fermi 2019-10-04 03:53:02 +01:00
  • d1c381cad3 lye down Fermi 2019-10-04 03:27:30 +01:00
  • 10f5fc3b47 Buffer fix Fermi 2019-10-04 03:22:53 +01:00
  • 257336ae0d Holderrrr Fermi 2019-10-04 02:24:02 +01:00
  • 9d0aeeee53 Strange. Fermi 2019-10-04 01:50:40 +01:00
  • 6fa4b3bb2e Compiles Fermi 2019-10-04 01:28:14 +01:00
  • d91a35c2b6 Allows reactions at lower temps for Neuro to reduce confusion. Fermi 2019-10-04 01:19:56 +01:00
  • 2058cbd09f Merge pull request #9390 from Ghommie/Ghommie_cit212 deathride58 2019-10-03 20:16:05 -04:00
  • 8801781435 Automatic changelog generation for PR #9394 [ci skip] CitadelStationBot 2019-10-03 19:15:24 -05:00
  • 89875bfe98 Merge pull request #9394 from EmeraldSundisk/deltafeex deathride58 2019-10-03 20:15:22 -04:00
  • 27b26978be Quartermaster is a head of staff Poojawa 2019-10-03 19:13:56 -05:00
  • b678ecc5a3 Automatic changelog generation for PR #9393 [ci skip] CitadelStationBot 2019-10-03 19:13:01 -05:00
  • 6e9a2553af Merge pull request #9393 from jakeramsay007/Even-More-Bugfixes deathride58 2019-10-03 20:12:59 -04:00
  • 35392d5dd0 Merge pull request #9396 from Citadel-Station-13/iconfixdonator deathride58 2019-10-03 20:12:17 -04:00
  • 81b4a994e0 Updates Config with Citadel specific links & info Poojawa 2019-10-03 18:19:24 -05:00
  • 76d194d9d8 Uh? Fermi 2019-10-04 00:15:12 +01:00
  • b589565398 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-10-03 15:05:26 -05:00
  • a8e16ce27e APC UI autoupdates properly Poojawa 2019-10-03 14:00:17 -05:00
  • d63540164d Travis to 512.1488 for ?. operator compiler fix Poojawa 2019-10-03 13:52:05 -05:00
  • 6bd0b85e54 I'd rather add a redundant get_held_index_of_item(I) than allow it to render privates over and over again. Ghommie 2019-10-03 19:32:11 +02:00
  • 59e6ed7014 inventory.dm is a mess too. Ghommie 2019-10-03 19:09:47 +02:00
  • a65b4d0b1c hopefully a performance improvement to stop genitalia from having to update everytime. Ghommie 2019-10-03 19:08:11 +02:00
  • ccf49f8d21 Merge pull request #9398 from BlackMajor/Yeet kevinz000 2019-10-03 05:19:46 -07:00
  • 47037c1d57 Instakill-man-bad Arturlang 2019-10-03 10:54:56 +03:00
  • 7c77f2d2e3 testing... Ghommie 2019-10-03 08:57:35 +02:00
  • 02f0e4dd84 Ghosts stop stealing my paper work BlackMajor 2019-10-03 19:16:00 +13:00
  • 373afcf09e Merge pull request #12 from Citadel-Station-13/master BlackMajor 2019-10-03 19:05:17 +13:00
  • 70cbd8c1ca fixes bad icon path Jay 2019-10-02 22:11:42 -05:00