Commit Graph

  • 3cf056ed93 Also fixing jacqueen... wrong tools.dmi Ghommie 2019-11-03 15:26:16 +01:00
  • abd2ed4c63 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit312 Ghommie 2019-11-03 15:19:09 +01:00
  • 7bd905e6b2 Mistakes were made. Ghommie 2019-11-03 15:13:18 +01:00
  • 65f9ad49bb Update medbot.dm kevinz000 2019-11-03 05:39:11 -08:00
  • 4e8c8ad335 Automatic changelog generation for PR #9687 [ci skip] CitadelStationBot 2019-11-03 07:24:56 -06:00
  • 2cdbf04272 Merge pull request #9687 from Ghommie/Ghommie-cit305 kevinz000 2019-11-03 06:24:53 -07:00
  • a750721fd2 Merge pull request #9653 from Poojawa/job-ordering kevinz000 2019-11-03 06:24:08 -07:00
  • bf562de84e Bump lodash from 4.17.11 to 4.17.15 in /tgui dependabot[bot] 2019-11-03 13:23:40 +00:00
  • 774696b518 Bump mixin-deep from 1.3.1 to 1.3.2 in /tgui dependabot[bot] 2019-11-03 13:22:50 +00:00
  • e09412b64e Bump lodash.merge from 4.6.1 to 4.6.2 in /tgui dependabot[bot] 2019-11-03 13:22:37 +00:00
  • 193e54c6a8 Automatic changelog generation for PR #9654 [ci skip] CitadelStationBot 2019-11-03 07:21:26 -06:00
  • 3365522bdf Merge pull request #9654 from Putnam3145/dynamic-config-2 kevinz000 2019-11-03 06:21:24 -07:00
  • a7e13ff359 Merge pull request #9655 from Citadel-Station-13/dependabot/pip/tools/mapmerge2/pillow-6.2.0 kevinz000 2019-11-03 06:21:10 -07:00
  • 75914dd085 Automatic changelog generation for PR #9658 [ci skip] CitadelStationBot 2019-11-03 07:20:32 -06:00
  • 6462d0c8c8 Merge pull request #9658 from Ghommie/Ghommie-cit291 kevinz000 2019-11-03 06:20:30 -07:00
  • a2c1881990 Automatic changelog generation for PR #9659 [ci skip] CitadelStationBot 2019-11-03 07:20:08 -06:00
  • 5e9c1901b4 Merge pull request #9659 from Ghommie/Ghommie-cit292 kevinz000 2019-11-03 06:20:06 -07:00
  • 0fa57f6102 Merge pull request #9660 from Ghommie/Ghommie-cit293 kevinz000 2019-11-03 06:19:56 -07:00
  • 5bfcc663f5 Merge pull request #9662 from Ghommie/Ghommie-cit294 kevinz000 2019-11-03 06:19:40 -07:00
  • 0615189629 Merge pull request #9665 from Ghommie/Ghommie-cit295 kevinz000 2019-11-03 06:18:47 -07:00
  • e8c7afb69c Automatic changelog generation for PR #9668 [ci skip] CitadelStationBot 2019-11-03 07:18:03 -06:00
  • bd29bd1e36 Merge pull request #9668 from Putnam3145/starlight kevinz000 2019-11-03 06:18:01 -07:00
  • c484a209a7 Merge pull request #9669 from Ghommie/Ghommie-cit297 kevinz000 2019-11-03 06:17:21 -07:00
  • 6127593446 Merge pull request #9670 from Ghommie/Ghommie-cit298 kevinz000 2019-11-03 06:17:02 -07:00
  • 906c58d339 Merge pull request #9672 from Ghommie/Ghommie-cit299 kevinz000 2019-11-03 06:15:42 -07:00
  • 6873f0b0cb Automatic changelog generation for PR #9674 [ci skip] CitadelStationBot 2019-11-03 07:15:19 -06:00
  • a9cf83476f Merge pull request #9674 from Ghommie/Ghommie-300 kevinz000 2019-11-03 06:15:17 -07:00
  • 5d2678a2b6 Automatic changelog generation for PR #9675 [ci skip] CitadelStationBot 2019-11-03 07:14:57 -06:00
  • 333532034b Merge pull request #9675 from PersianXerxes/fixReebeRodExploits kevinz000 2019-11-03 06:14:55 -07:00
  • 828501d0f5 Merge pull request #9678 from Ghommie/Ghommie-cit301 kevinz000 2019-11-03 06:14:33 -07:00
  • 23b6881453 Automatic changelog generation for PR #9679 [ci skip] CitadelStationBot 2019-11-03 07:14:15 -06:00
  • 3a2ce8c5ce Merge pull request #9679 from Ghommie/Ghommie-cit302 kevinz000 2019-11-03 06:14:13 -07:00
  • b12d7842d6 Automatic changelog generation for PR #9686 [ci skip] CitadelStationBot 2019-11-03 07:11:23 -06:00
  • dcee360ac5 Merge pull request #9686 from Ghommie/Ghommie-cit304 kevinz000 2019-11-03 06:11:20 -07:00
  • 02935c062d Fixing more issues. Ghommie 2019-11-03 05:37:10 +01:00
  • d8e0771dcd Better Health Analyzer formatting Poojawa 2019-11-02 23:14:39 -05:00
  • ae4cfbf92d clock welder overlay fix. Ghommie 2019-11-03 04:56:56 +01:00
  • 1bee298fc9 the .dmeeeeeeeeeeee Ghommie 2019-11-03 04:43:24 +01:00
  • 7e4aef46d9 Unmodularize and update pAI/Intellicards very slighty. Ghommie 2019-11-03 04:23:31 +01:00
  • 3e95a66513 Update energy_gun.dm kappa-sama 2019-11-02 23:04:06 -04:00
  • 439c7add4f Merge branch 'master' of https://github.com/kappa-sama/Citadel-Station-13 kappa-sama 2019-11-02 22:46:50 -04:00
  • e21cd59487 no kappa-sama 2019-11-02 22:42:01 -04:00
  • 20bafdd855 Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing. Ghommie 2019-11-03 03:23:59 +01:00
  • 592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. Ghommie 2019-11-03 01:55:59 +01:00
  • 401f21d746 Fixing broken fixes. Testing. Ghommie 2019-11-03 01:19:45 +01:00
  • 2653a2965d How about we only check the living? Ghommie 2019-11-02 20:46:33 +01:00
  • 100a87d57b Unmodularize configuration, _globalvars and subsystems. Ghommie 2019-11-02 20:42:01 +01:00
  • 0cce37cedb How many times I have encountered theis sort of issues in the past and how much of a meme it was... Ghommie 2019-11-02 20:18:40 +01:00
  • e02849fab7 double deletion dip sauce, now with 30% more cpu waste. Ghommie 2019-11-02 19:54:20 +01:00
  • 065fbdf0cb Fixing gibspawner runtimes, how gruesome... Ghommie 2019-11-02 19:37:35 +01:00
  • f4587b4260 This is very unprofessional. Yet I'm no google architect. Ghommie 2019-11-02 16:47:25 +01:00
  • 50fc1004ba Actually holopads, so they won't end up in maintenance... Ghommie 2019-11-02 16:46:02 +01:00
  • 3193e3ce20 fix. Ghommie 2019-11-02 16:12:37 +01:00
  • a949f84557 missing bits. Ghommie 2019-11-02 16:00:48 +01:00
  • 1bf10c0435 Improving Jacqueen's teleportation area selection. Ghommie 2019-11-02 15:50:54 +01:00
  • 91625b6e60 item/doMove() calling dropped() callign qdel(src) because of DROPDEL. Ghommie 2019-11-02 14:15:31 +01:00
  • 874cdfefb8 fixing storage implant transplant. Ghommie 2019-11-02 14:03:14 +01:00
  • ad0e8ec4be Yea, all good now. Ghommie 2019-11-02 13:41:20 +01:00
  • 83b47d8411 RLD NERF AND BUGFIX BEFORE NEW ROUND AHH SPEEEEED KathrinBailey 2019-11-02 05:41:23 +00:00
  • 9506a78429 whoops replaced this var with a simpler check Putnam 2019-11-01 18:46:31 -07:00
  • 986c4e11c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit245 Ghommie 2019-11-02 02:32:23 +01:00
  • edfdcce52f INITIALIZED_1 4 life Ghommie 2019-11-01 20:54:22 +01:00
  • e08da877a5 whops. Ghommie 2019-11-01 18:56:55 +01:00
  • a204fddc4b Fixing some issues with dullahans. Ghommie 2019-11-01 18:47:39 +01:00
  • 537ac0f6ca Merge branch 'master' into assu Anonymous 2019-11-01 19:05:53 +03:00
  • eb5f014382 Travis is mean. Winter Flare 2019-11-01 05:24:20 -04:00
  • 4f9f8f98bf Update wizard.dm kevinz000 2019-10-31 22:58:24 -07:00
  • 7a9f48302d Reworked a bit of bounty stuff. Winter Flare 2019-11-01 01:38:27 -04:00
  • 47b2c92397 Merge remote-tracking branch 'upstream/master' KathrinBailey 2019-11-01 04:53:28 +00:00
  • 5a603d2b6e aaahhh KathrinBailey 2019-11-01 04:52:46 +00:00
  • 564e9c5c3c Everything should be okay now, map merger should have done it right I think? KathrinBailey 2019-11-01 03:34:09 +00:00
  • 37bfb31ee0 Merge branch 'master' into Superbases-goodbye Fermi 2019-11-01 00:55:55 +00:00
  • 988a5a13bf Fixes merge conf Fermi 2019-11-01 00:51:09 +00:00
  • 587e6b9262 Update aooc.dm kevinz000 2019-10-31 17:30:29 -07:00
  • ab92421e20 Automatic changelog generation for PR #9677 [ci skip] CitadelStationBot 2019-10-31 19:27:41 -05:00
  • c2aa28d775 Merge pull request #9677 from Putnam3145/clone-no-delay kevinz000 2019-10-31 17:27:39 -07:00
  • 1f53f5ee72 Automatic changelog generation for PR #8948 [ci skip] CitadelStationBot 2019-10-31 19:27:06 -05:00
  • d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156 kevinz000 2019-10-31 17:27:03 -07:00
  • 642b27a10f Ghommie Thalpy 2019-11-01 00:26:22 +00:00
  • 64b8122548 made it go back to previous locked state instead Putnam 2019-10-31 16:46:04 -07:00
  • d81d1c6b2d actually make it lock instead Putnam 2019-10-31 16:39:54 -07:00
  • 848c9dce00 Revert "makes cloning have no 2-second delay" Putnam 2019-10-31 16:39:02 -07:00
  • 6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 Ghommie 2019-10-31 23:17:39 +01:00
  • b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co Ghommie 2019-10-31 22:40:11 +01:00
  • 9f97f768da Respriting the ore redemption and miner vending machines. Ghommie 2019-10-31 18:59:00 +01:00
  • 57dd768950 makes cloning have no 2-second delay Putnam 2019-10-30 23:11:50 -07:00
  • 2e2c85eb95 Automatic changelog generation for PR #9667 [ci skip] CitadelStationBot 2019-10-30 22:22:29 -05:00
  • a89f490220 Merge pull request #9667 from kappa-sama/patch-3 kevinz000 2019-10-30 20:22:24 -07:00
  • 1e911cd5b2 Patches an exploit that allows the crew to shoot the Ark from the Reebe dressing room. Persi 2019-10-30 21:16:49 -04:00
  • 17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 Ghommie 2019-10-31 01:43:44 +01:00
  • 56b65130fb Modernizing ratvarian computer sprites. Ghommie 2019-10-31 01:17:21 +01:00
  • 8c21fac476 513 compatibility Ghommie 2019-10-30 22:24:00 +01:00
  • 05dc64fd0a Obligatory changes for 513 kevinz forgot about. Ghommie 2019-10-30 21:47:33 +01:00
  • f6feeb93ea Mapping in arcade dirs. Ghommie 2019-10-30 16:47:44 +01:00
  • b17346a44e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220 Ghommie 2019-10-30 14:46:42 +01:00
  • b3ef41a10f Fixing living being unable to pull anything. Ghommie 2019-10-30 14:02:17 +01:00
  • 5930389cb6 Merge branch 'master' into assu Anonymous 2019-10-30 15:18:39 +03:00
  • b86c5059d5 [s] modkit uninstall() calling forceMove() calling loc.Exited() calling modkit.uninstall() calling f... Ghommie 2019-10-30 13:17:12 +01:00
  • bb197c2251 allows heal viruses not to hurt slimes Putnam 2019-10-30 01:34:03 -07:00
  • 2c36aaabee weird icon stuff Linzolle 2019-10-30 00:24:21 -05:00