Commit Graph

  • 770e9eca4e Update game.dm kevinz000 2020-01-23 19:15:02 -07:00
  • 9761d68f4b more merge conflict fixes Seris02 2020-01-24 10:14:31 +08:00
  • 99d6d589ac Update hilbertshotel.dm kevinz000 2020-01-23 19:07:39 -07:00
  • 65871ca1d3 Update hilbertshotel.dm kevinz000 2020-01-23 19:07:17 -07:00
  • 5ce80078ab Update hilbertshotel.dm kevinz000 2020-01-23 19:03:26 -07:00
  • 721fd108f9 A few more, ported, runtime fixes. Ghommie 2020-01-24 03:02:07 +01:00
  • 4888e1522a Merge pull request #10685 from Ghommie/Ghommie-cit522 kevinz000 2020-01-23 18:51:08 -07:00
  • 9ee70c7931 Travis is just faster at compiling, I can work on other things meanwhile Ghommie 2020-01-24 02:34:32 +01:00
  • 7d5725e450 a dot Ghommie 2020-01-24 02:31:46 +01:00
  • 78934c52fe A handful of runtime fixes. Ghommie 2020-01-24 02:26:06 +01:00
  • ba2c149d4d Improvements. Ghommie 2020-01-24 02:22:32 +01:00
  • 6b62aef86c Missing ! Ghommie 2020-01-24 02:19:52 +01:00
  • 524f665f4a fix for hypospray jank. Ghommie 2020-01-24 02:17:41 +01:00
  • e7bf1738cd ok putnom kevinz000 2020-01-23 18:00:33 -07:00
  • 05150e821e A few consistencies for those "shoes" that don't actually cover feet. Ghommie 2020-01-24 01:25:23 +01:00
  • 5cbe2226e1 Merge remote-tracking branch 'citadel/master' into hijack kevinz000 2020-01-23 17:15:49 -07:00
  • 8e5f221bb9 Ports "Makes falsewall hide pipes and wires" Ghommie 2020-01-24 00:57:27 +01:00
  • c8bf148216 snowflake-friendly towels. Ghommie 2020-01-24 00:06:07 +01:00
  • 3211ed6d10 Better position. Ghommie 2020-01-23 23:19:39 +01:00
  • 56d31b0c8c neuter/plural gender fixes. Ghommie 2020-01-23 22:50:30 +01:00
  • 7035705f8b and again ShadeAware 2020-01-23 16:40:54 -05:00
  • f547c8692b Changes all references of "Makeshift" to "Crafted" because im not willing to change the switchblade's fucking SEXY SPRITE ShadeAware 2020-01-23 16:40:30 -05:00
  • 93310b8d4f can_random_spawn = FALSE for icon-less plushes Ghom 2020-01-23 19:42:21 +01:00
  • 9466b0f4ca Merge branch 'master' into glassware Trilbyspaceclone 2020-01-23 13:31:04 -05:00
  • 14a33ee7dc Merge pull request #10651 from r4d6/Soft-rad-suit Ghom 2020-01-23 19:23:09 +01:00
  • 52d5074051 Stops the patriotic cape from being considered a bed sheet. Ghommie 2020-01-23 18:19:31 +01:00
  • 292aaa58dc Fixes dead malf AI doomsday, a few ported updates. Ghommie 2020-01-23 17:36:23 +01:00
  • 14b7711590 i will end whoever ported virgo hairs and thought it was fine to do it like that Kraseo 2020-01-23 17:29:21 +01:00
  • 5f1511b51e Automatic changelog generation for PR #10598 [ci skip] CitadelStationBot 2020-01-23 09:38:42 -06:00
  • 21867f60dd Merge pull request #10598 from Putnam3145/metabolic-synth-tweak Ghom 2020-01-23 16:38:39 +01:00
  • 51812ae0ec Proud? No. Ghom 2020-01-23 16:33:11 +01:00
  • 9951f518e3 Automatic changelog generation for PR #10610 [ci skip] CitadelStationBot 2020-01-23 08:44:03 -06:00
  • 86a3a5dd4d Merge pull request #10610 from Owai-Seek/bountytweaks Ghom 2020-01-23 15:44:00 +01:00
  • f3b9b20e57 Merge pull request #10672 from BlackMajor/master Ghom 2020-01-23 15:30:29 +01:00
  • c512ce0c7e Minor touchups to Qipaos Unknown 2020-01-23 06:43:11 -07:00
  • bd8ce9a7b6 Culturally Appropriate Lunar Clothes Unknown 2020-01-23 06:35:50 -07:00
  • fd04469ff0 H ShadeAware 2020-01-23 08:01:28 -05:00
  • 77e7dff11b Webedit PR man bad BlackMajor 2020-01-24 01:41:40 +13:00
  • 3d85499919 Requested Changes + Nerf Winter Flare 2020-01-23 07:20:22 -05:00
  • 5fb2e60ebf Merge branch 'master' into master BlackMajor 2020-01-24 00:50:46 +13:00
  • f6546e82f2 Automatic changelog generation for PR #10620 [ci skip] CitadelStationBot 2020-01-23 05:48:09 -06:00
  • 83591f8883 Merge pull request #10620 from Hatterhat/patch-1 kevinz000 2020-01-23 04:48:06 -07:00
  • 9a23325e9e Automatic changelog generation for PR #10602 [ci skip] CitadelStationBot 2020-01-23 05:47:49 -06:00
  • 4304a7dd42 Merge pull request #10602 from Ghommie/Ghommie-cit509 kevinz000 2020-01-23 04:47:46 -07:00
  • 707d14987b Automatic changelog generation for PR #10603 [ci skip] CitadelStationBot 2020-01-23 05:47:20 -06:00
  • aa19c2a17b Merge pull request #10603 from Ghommie/Ghommie-cit510 kevinz000 2020-01-23 04:47:18 -07:00
  • 1b7265d8c1 Merge pull request #10605 from r4d6/Layer kevinz000 2020-01-23 04:46:52 -07:00
  • 7733d3f98a Update robot_modules.dm BlackMajor 2020-01-24 00:42:41 +13:00
  • cafbdcf581 Automatic changelog generation for PR #10636 [ci skip] CitadelStationBot 2020-01-23 05:35:15 -06:00
  • 88f625edfc Merge pull request #10636 from Ghommie/Ghommie-cit512 kevinz000 2020-01-23 04:35:13 -07:00
  • 196466bca6 Automatic changelog generation for PR #10641 [ci skip] CitadelStationBot 2020-01-23 05:34:27 -06:00
  • a01d7260d8 Merge pull request #10641 from jakeramsay007/Calibers-101 kevinz000 2020-01-23 04:34:24 -07:00
  • bfcd45662f Automatic changelog generation for PR #10643 [ci skip] CitadelStationBot 2020-01-23 05:33:33 -06:00
  • 483266ea07 Merge pull request #10643 from Trilbyspaceclone/patch-270 kevinz000 2020-01-23 04:33:30 -07:00
  • 901d3e7a15 Mulebot button fix port Artur 2020-01-23 09:53:09 +02:00
  • 0091da8307 Linter fixes Artur 2020-01-22 10:15:38 +02:00
  • 19fcd89282 Shit Artur 2020-01-21 22:20:02 +01:00
  • 4454eba40b fixed Seris02 2020-01-23 16:12:12 +08:00
  • 5499638c5e yes Seris02 2020-01-23 15:41:49 +08:00
  • 934c8fe533 updates + thingamajig Seris02 2020-01-23 15:25:45 +08:00
  • 86ea13afeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into patch-270 TrilbySpaceClone 2020-01-22 23:00:54 -05:00
  • 762064edc0 Uhh... Ghommie 2020-01-23 04:43:24 +01:00
  • 5a8c22fef2 eh.., Ghommie 2020-01-23 04:30:52 +01:00
  • 8e44f21de9 Mh... Ghommie 2020-01-23 04:27:08 +01:00
  • 0bfe3ab87e no longer can you wave at unseen things, nor bystanders will be informed of what you are waving at if they can't see it themselves. Ghommie 2020-01-23 04:18:23 +01:00
  • 5a4c28ba96 Automatic changelog generation for PR #10410 [ci skip] CitadelStationBot 2020-01-22 20:06:54 -06:00
  • bf62563507 Merge pull request #10410 from CameronWoof/free-the-lizard Ghom 2020-01-23 03:06:52 +01:00
  • ea04242a09 Automatic changelog generation for PR #10645 [ci skip] CitadelStationBot 2020-01-22 19:53:38 -06:00
  • 047059617c Merge pull request #10645 from r4d6/Modular-Lavaland Ghom 2020-01-23 02:53:34 +01:00
  • 3ce27d6c36 Merge pull request #10638 from Hatterhat/patch-3 Ghom 2020-01-23 02:51:17 +01:00
  • 20604fd5b3 Automatic changelog generation for PR #10450 [ci skip] CitadelStationBot 2020-01-22 19:44:20 -06:00
  • 04811c9c22 Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8 Ghom 2020-01-23 02:44:17 +01:00
  • 78875eb80d Automatic changelog generation for PR #10622 [ci skip] CitadelStationBot 2020-01-22 19:41:21 -06:00
  • 4435bd4d56 Merge pull request #10622 from Owai-Seek/mojodojo Ghom 2020-01-23 02:41:18 +01:00
  • bcf579a44d Automatic changelog generation for PR #10606 [ci skip] CitadelStationBot 2020-01-22 19:40:56 -06:00
  • fcbc5149c4 Merge pull request #10606 from r4d6/patch-2 Ghom 2020-01-23 02:40:54 +01:00
  • b0da18e404 Fixes chainsaw force being set to 0 on unwield. Ghommie 2020-01-23 02:13:55 +01:00
  • 70c9a9a25f logic kevinz000 2020-01-22 16:36:44 -07:00
  • cd0fc537b6 lgoic kevinz000 2020-01-22 16:03:56 -07:00
  • 0b1a0e7286 Update weaponry.dm ShadeAware 2020-01-22 17:54:27 -05:00
  • 1c4f37b5bf MAKING THE CODE LESS SHIT THANS TO ARTUR AND SUN WUKONG ShadeAware 2020-01-22 17:50:57 -05:00
  • c8cfd4e150 cursed kappa-sama 2020-01-22 16:52:28 -05:00
  • 255f2ce449 Testmerge Conflict fix? Artur 2020-01-22 20:17:42 +01:00
  • c78944c5bc Update r4d6 2020-01-22 13:47:57 -05:00
  • 869e31b27b Removing useless code r4d6 2020-01-22 13:17:47 -05:00
  • 96c0a86b5f Make the Radiation Hardsuit a Voidsuit instead r4d6 2020-01-22 13:17:29 -05:00
  • 0a545da35d Webedit galore Arturlang 2020-01-22 18:12:26 +01:00
  • 0d8a0e4963 Hah..... Arturlang 2020-01-22 18:12:04 +01:00
  • e025c8a743 Oh right its a typo Arturlang 2020-01-22 18:11:37 +01:00
  • aeb3a2f971 Update backpack.dm Arturlang 2020-01-22 18:07:43 +01:00
  • 53d80b2ef8 Initial Commit Arturlang 2020-01-22 17:55:09 +01:00
  • ebb6ac1d7b more words Trilbyspaceclone 2020-01-22 11:33:39 -05:00
  • c4475b1dda variables kevinz000 2020-01-22 05:39:16 -07:00
  • a28ebcc041 variables kevinz000 2020-01-22 05:38:53 -07:00
  • ccb5d32ab2 varnames kevinz000 2020-01-22 05:38:09 -07:00
  • ff98fe7bf5 update kevinz000 2020-01-22 05:35:21 -07:00
  • a8628cee33 udpates kevinz000 2020-01-22 05:32:57 -07:00
  • 9ef3879e53 fix kevinz000 2020-01-22 05:17:59 -07:00
  • 5b6f95cb1e shuttle hijack kevinz000 2020-01-22 05:16:33 -07:00
  • 3dcd2a75cf Update configuration.dm kevinz000 2020-01-22 02:27:51 -07:00