Commit Graph

  • 35cc57695d Merge pull request #9 from Citadel-Station-13/master YakumoChen 2019-10-19 22:34:19 -04:00
  • 2a45cd19fb boot holster boot holster Hatterhat 2019-10-19 20:24:00 -05:00
  • 49afd5261c Change SEVA suit & Exo-suit's descriptions r4d6 2019-10-19 20:56:35 -04:00
  • f72d058eb5 makes borg flashes actually take eye protection into account deathride58 2019-10-19 17:57:05 -04:00
  • eb1e064c49 oh yeah surgeon Linzolle 2019-10-19 10:48:30 -05:00
  • 3955489a60 Merge branch 'master' of https://github.com/kappa-sama/Citadel-Station-13 kappa-sama 2019-10-19 11:34:51 -04:00
  • 68dfb6939f master kappa-sama 2019-10-19 11:34:01 -04:00
  • fe71e2984c Fixing sniper rifles scope datum action oddities. Ghommie 2019-10-19 16:40:01 +02:00
  • e991328087 progress Ghommie 2019-10-19 15:02:56 +02:00
  • 39788c8216 fix abductors Linzolle 2019-10-18 23:45:13 -05:00
  • 9b7c7b6e0f RPD works again JTGSZ 2019-10-18 23:55:40 -04:00
  • fc9e7487b0 Reduces stamloss of weapons by 20% MrJWhit 2019-10-18 22:46:48 -04:00
  • c0ae39fce1 remove unnecessary things Linzolle 2019-10-18 12:43:05 -05:00
  • 9cb1f2b9d9 Little stunbaton nerf (split off from #9500) Ghommie 2019-10-18 18:37:15 +02:00
  • 2ca246d2eb fine-o Ghommie 2019-10-18 18:33:02 +02:00
  • 17191c5e22 mimes. Ghommie 2019-10-18 18:23:27 +02:00
  • 9981eb916a clowns. Ghommie 2019-10-18 18:16:11 +02:00
  • 69f27e19fe Touching up job outfits equip procs, little PDA fix. Ghommie 2019-10-18 18:02:24 +02:00
  • c7e1449a3c re-adds blood crate Poojawa 2019-10-18 06:02:23 -05:00
  • ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods Poojawa 2019-10-18 06:01:52 -05:00
  • d39897b9ad Update phantomthief.dm BlackMajor 2019-10-18 23:34:31 +13:00
  • a57911b88a null lists type mismatch Ghommie 2019-10-18 11:19:24 +02:00
  • b96e8461a6 update Ghommie 2019-10-18 11:13:16 +02:00
  • 281f4e29dc Fixes some peculiarities with hands layer overlapping stuff Ghommie 2019-10-18 10:23:43 +02:00
  • 1707d6e6d2 er? TrilbySpaceClone 2019-10-18 01:22:19 -04:00
  • 18c9283d4a Merge branch 'master' into A_Tailer's_art TrilbySpaceClone 2019-10-18 00:21:42 -04:00
  • f4b2c6f1eb missing wings icons Linzolle 2019-10-17 23:03:50 -05:00
  • 5ddd0484a8 colourable wings Linzolle 2019-10-17 22:11:47 -05:00
  • 9fd95537bc Automatic changelog generation for PR #9515 [ci skip] CitadelStationBot 2019-10-17 19:29:20 -05:00
  • a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241 kevinz000 2019-10-17 17:29:18 -07:00
  • 59cc07637e Automatic changelog generation for PR #9523 [ci skip] CitadelStationBot 2019-10-17 19:28:59 -05:00
  • e9f4757446 Merge pull request #9523 from Linzolle/surgeryfixesohboy kevinz000 2019-10-17 17:28:57 -07:00
  • 380e5a2be7 Merge remote-tracking branch 'deco-wings/master' into wingcolors Linzolle 2019-10-17 19:27:34 -05:00
  • b9572c0fc8 somebody FORGOT Linzolle 2019-10-17 18:00:08 -05:00
  • 3b1e66ad05 more consistent naming Linzolle 2019-10-17 17:23:47 -05:00
  • 88814415dc tend wounds Linzolle 2019-10-17 16:59:33 -05:00
  • 80072840bf Automatic changelog generation for PR #9505 [ci skip] CitadelStationBot 2019-10-17 15:23:36 -05:00
  • 1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL kevinz000 2019-10-17 13:23:33 -07:00
  • 2d12f014fd Automatic changelog generation for PR #9414 [ci skip] CitadelStationBot 2019-10-17 15:19:00 -05:00
  • 6103ffbafd Merge pull request #9414 from Poojawa/metabolize-lazychem kevinz000 2019-10-17 13:18:58 -07:00
  • 1c811c3f88 Automatic changelog generation for PR #9343 [ci skip] CitadelStationBot 2019-10-17 15:13:53 -05:00
  • 1cc4ccee0d Merge pull request #9343 from Linzolle/dissection kevinz000 2019-10-17 13:13:51 -07:00
  • 3e1120cd97 Merge pull request #9509 from Ghommie/Ghommie-cit239 kevinz000 2019-10-17 13:11:05 -07:00
  • 9ab26fa3cb Automatic changelog generation for PR #9211 [ci skip] CitadelStationBot 2019-10-17 15:09:58 -05:00
  • d2497a8ba1 Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance kevinz000 2019-10-17 13:09:55 -07:00
  • bf3abe50e1 Automatic changelog generation for PR #9351 [ci skip] CitadelStationBot 2019-10-17 15:07:42 -05:00
  • 1ff69c23fd Merge pull request #9351 from YakumoChen/holeymelon kevinz000 2019-10-17 13:07:40 -07:00
  • 805fe2a91a Merge pull request #9496 from Ghommie/Ghommie-cit236 kevinz000 2019-10-17 13:06:17 -07:00
  • fb232302d3 Automatic changelog generation for PR #9510 [ci skip] CitadelStationBot 2019-10-17 15:05:17 -05:00
  • 033cd3cc53 Merge pull request #9510 from Ghommie/Ghommie-cit240 kevinz000 2019-10-17 13:05:15 -07:00
  • d14d538848 Automatic changelog generation for PR #9516 [ci skip] CitadelStationBot 2019-10-17 15:04:17 -05:00
  • d9cb2792e5 Merge pull request #9516 from Ghommie/Ghommie-cit242 kevinz000 2019-10-17 13:04:15 -07:00
  • f8e5b5565a Automatic changelog generation for PR #9482 [ci skip] CitadelStationBot 2019-10-17 15:01:40 -05:00
  • 8be030a931 Merge pull request #9482 from Thalpy/Wiki kevinz000 2019-10-17 13:01:37 -07:00
  • 65841a9485 Merge pull request #9507 from Ghommie/Ghommie-cit238 kevinz000 2019-10-17 12:59:44 -07:00
  • 8e3f11a1d2 Automatic changelog generation for PR #9498 [ci skip] CitadelStationBot 2019-10-17 14:58:30 -05:00
  • eef68f43cf Merge pull request #9498 from JTGSZ/october-dwarves kevinz000 2019-10-17 12:58:28 -07:00
  • 707cbacc9b Automatic changelog generation for PR #9483 [ci skip] CitadelStationBot 2019-10-17 14:55:45 -05:00
  • 9c21659afc Merge pull request #9483 from ZeroNetAlpha/toylathe-fix kevinz000 2019-10-17 12:55:43 -07:00
  • 7c4e2c6860 Update medbot.dm kevinz000 2019-10-17 12:49:49 -07:00
  • ecff4f9d47 Automatic changelog generation for PR #9514 [ci skip] CitadelStationBot 2019-10-17 14:49:10 -05:00
  • 5e049bc64a Merge pull request #9514 from Linzolle/kevin-has-a-foot-fetish kevinz000 2019-10-17 12:49:08 -07:00
  • 8f4b3c5d52 Automatic changelog generation for PR #9504 [ci skip] CitadelStationBot 2019-10-17 14:48:04 -05:00
  • a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements kevinz000 2019-10-17 12:48:01 -07:00
  • 09f481c319 Increases bomb resistance in cult robes MrJWhit 2019-10-17 12:28:11 -04:00
  • c97252eaa6 Give felinids decoratives wings r4d6 2019-10-17 12:11:03 -04:00
  • 7fbe2abb2c Give Lizardpeoples decorative wings r4d6 2019-10-17 12:09:27 -04:00
  • 3f20175220 Give slimepersons decoratives wings r4d6 2019-10-17 12:08:49 -04:00
  • 558a92c519 Give humans decorative wings r4d6 2019-10-17 12:08:09 -04:00
  • 6441c412de Merge pull request #1 from Citadel-Station-13/master r4d6 2019-10-17 11:47:55 -04:00
  • 67af19a7f0 Merge branch 'master' into FERMICHEMCurTweaks Thalpy 2019-10-17 16:20:38 +01:00
  • 697818e6f7 Merge branch 'master' into access-clarifications Poojawa 2019-10-17 06:13:47 -05:00
  • 66c8c17bbd Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-10-17 05:45:06 -05:00
  • 4fdddc7b4d clears a merge conflict Poojawa 2019-10-17 05:37:44 -05:00
  • 49ee9af897 metadata because people are throwing a fit about it Poojawa 2019-10-17 01:30:47 -05:00
  • 113f62a705 right Trilbyspaceclone 2019-10-17 01:38:29 -04:00
  • f73516a17f made it into config. Ghommie 2019-10-17 04:44:30 +02:00
  • c0034e93a1 readds chose goose Trilbyspaceclone 2019-10-16 22:31:34 -04:00
  • c91421984c Merge branch 'master' into Cargo_rebalance Trilbyspaceclone 2019-10-16 22:30:12 -04:00
  • cffa3f8cea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 Ghommie 2019-10-17 03:09:59 +02:00
  • 03c68e091f Neat. Ghommie 2019-10-17 02:52:02 +02:00
  • f2cd85e550 Ports "You can now click on objects and mobs below flaps and signs" Ghommie 2019-10-17 02:45:13 +02:00
  • 764904c507 Merge branch 'master' of https://github.com/EmeraldSundisk/Citadel-Station-13 EmeraldSundisk 2019-10-16 17:32:50 -07:00
  • 4e0c4fb1fd Update tgstation.dme EmeraldSundisk 2019-10-16 17:32:46 -07:00
  • 3b915fba1e Merge pull request #7 from Citadel-Station-13/master EmeraldSundisk 2019-10-16 17:28:14 -07:00
  • d658f23637 Automatic changelog generation for PR #9517 [ci skip] CitadelStationBot 2019-10-16 18:57:06 -05:00
  • ff56970c73 Merge pull request #9517 from kappa-sama/patch-1 kevinz000 2019-10-16 16:57:04 -07:00
  • cbf02e76a4 fixes cringe kappa-sama 2019-10-16 19:47:14 -04:00
  • b27438773f Update halloween.dm kappa-sama 2019-10-16 19:46:43 -04:00
  • 10bcfe3803 merge cringe kappa-sama 2019-10-16 19:37:59 -04:00
  • 475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 Ghommie 2019-10-17 00:50:30 +02:00
  • 57794421e3 Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc." Ghommie 2019-10-16 23:57:31 +02:00
  • f3a9cac11e Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer. Ghommie 2019-10-16 23:39:21 +02:00
  • 1690596047 you asked for this kevin Linzolle 2019-10-16 15:53:11 -05:00
  • c2cec9df43 Automatic changelog generation for PR #9477 [ci skip] CitadelStationBot 2019-10-16 14:44:37 -05:00
  • 994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes kevinz000 2019-10-16 12:44:34 -07:00
  • f1b2eb93d7 Moonshiner doesn't exist here JTGSZ 2019-10-16 13:19:39 -04:00
  • 4ee608e0c7 Fixes blood transfusion, QOL to IV drippers Poojawa 2019-10-16 09:15:04 -05:00
  • 5b5ff67201 Update medbot.dm kevinz000 2019-10-16 03:51:57 -07:00
  • 14e0087fbd blood sorta works again, needs better fixing tho Poojawa 2019-10-16 04:38:31 -05:00