Commit Graph

  • 78575bd47d Automatic changelog generation for PR #10197 [ci skip] CitadelStationBot 2019-12-15 17:24:20 -06:00
  • 7aa454dbbb Merge pull request #10197 from Ghommie/Ghommie-cit465 Putnam3145 2019-12-15 15:24:17 -08:00
  • 22aba489e3 Fixes ranged syndicate mobs stormtrooper training: The port. Ghommie 2019-12-16 00:21:28 +01:00
  • 008c4ef822 according to all known laws of aviation Unknown 2019-12-15 16:18:42 -07:00
  • 9bfba1d1d9 Merge branch 'master' into xantholne-christmas01 Unknown 2019-12-15 16:14:37 -07:00
  • 0a4a2acbab fixing double-flavour ice creams. Ghommie 2019-12-16 00:00:58 +01:00
  • 138f2d05f0 Made intrigue not care about valid. Putnam 2019-12-15 14:49:43 -08:00
  • 3d0d1de94c Added bloodsucker weights. Putnam 2019-12-15 14:49:32 -08:00
  • 3b526fdb9b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers Putnam 2019-12-15 14:41:47 -08:00
  • 423b2e7e90 Automatic changelog generation for PR #10011 [ci skip] CitadelStationBot 2019-12-15 16:41:39 -06:00
  • c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers Putnam3145 2019-12-15 14:41:36 -08:00
  • f8a05b5ae1 perhaps kappa-sama 2019-12-15 17:31:49 -05:00
  • 7118210911 GOTTA KEEP THIS AROUND UNTIL OFFSTATION ANTAGS ARE STOPPED FROM BEING QUIRK'D. WIZARDS GOTTA CHANT THEIR MAGICK SOMEHOW. Ghommie 2019-12-15 23:07:18 +01:00
  • 58f4f58cd2 Slaughter demons shouldnt bleed Artur 2019-12-16 00:05:51 +02:00
  • 6593b2a5a7 Fixes some quirks not being properly removed when deleted. Ghommie 2019-12-15 23:02:41 +01:00
  • d3d1f8328f compiles now. Ghommie 2019-12-15 22:16:02 +01:00
  • f943bcb3b5 make cowabunga description less, uh, bad Putnam 2019-12-15 12:17:07 -08:00
  • 6f9be0c863 saves the world loginsandylogout 2019-12-15 14:11:44 -06:00
  • 7ee71f9702 Automatic changelog generation for PR #10144 [ci skip] CitadelStationBot 2019-12-15 14:08:48 -06:00
  • b7d082a204 Merge pull request #10144 from Linzolle/sabre-noise Putnam3145 2019-12-15 12:08:46 -08:00
  • 80f47872d7 My head splodes. Ghommie 2019-12-15 20:31:36 +01:00
  • 499c2a30e7 corrections for .4 metaballic rate Trilbyspaceclone 2019-12-15 13:59:54 -05:00
  • 8c27c176ca move this.. kevinz000 2019-12-15 09:12:58 -07:00
  • c6732bb516 typo lol BlackMajor 2019-12-16 01:28:34 +13:00
  • 4b177c4956 Adjusted NF balance BlackMajor 2019-12-16 01:20:14 +13:00
  • 0f40db60ce honk loginsandylogout 2019-12-15 03:38:00 -06:00
  • 9a2311b72b grammar Trilbyspaceclone 2019-12-15 02:42:17 -05:00
  • b41eb4426e there's Trilbyspaceclone 2019-12-15 02:38:38 -05:00
  • db767d8ddf bad idea kevinz000 2019-12-15 00:37:34 -07:00
  • a4ffef5b1f Typos kevinz000 2019-12-15 00:36:20 -07:00
  • 600017f4e1 experimental filter kevinz000 2019-12-15 00:34:12 -07:00
  • 297c909b76 resting stuff kevinz000 2019-12-15 00:29:18 -07:00
  • 586dcb6f81 welp i got lazy kevinz000 2019-12-15 00:15:32 -07:00
  • 4970675467 s kevinz000 2019-12-15 00:06:11 -07:00
  • c5cac186fc bad notes bgone TrilbySpaceClone 2019-12-15 01:50:57 -05:00
  • 32cbe8588e fogot the beest one TrilbySpaceClone 2019-12-15 01:15:55 -05:00
  • 5febc54fb8 whats all the buzz around this new drink? TrilbySpaceClone 2019-12-15 01:13:15 -05:00
  • 8e97b0e331 Automatic changelog generation for PR #10166 [ci skip] CitadelStationBot 2019-12-14 22:37:59 -06:00
  • 2e9503f6d7 Merge pull request #10166 from Ghommie/Ghommie-cit457 Putnam3145 2019-12-14 20:37:57 -08:00
  • e44566038b linter is correct Putnam 2019-12-14 20:32:34 -08:00
  • 74e4391cee uh, vote changes necessary too Putnam 2019-12-14 20:01:38 -08:00
  • b96d36e719 alright that's that Putnam 2019-12-14 20:01:30 -08:00
  • 73abc2ae40 Merge branch 'master' into xantholne-christmas01 Unknown 2019-12-14 17:15:00 -07:00
  • 0921c3541a Automatic changelog generation for PR #9970 [ci skip] CitadelStationBot 2019-12-14 18:16:37 -06:00
  • cce63507d1 Merge pull request #9970 from Ghommie/Ghommie-cit402 Lin 2019-12-15 00:16:34 +00:00
  • 979807926f Automatic changelog generation for PR #10122 [ci skip] CitadelStationBot 2019-12-14 18:05:01 -06:00
  • 49c37641a7 Merge pull request #10122 from Citadel-Station-13/kevinz000-patch-124 Lin 2019-12-15 00:04:58 +00:00
  • 773d574427 Automatic changelog generation for PR #10150 [ci skip] CitadelStationBot 2019-12-14 18:03:00 -06:00
  • 1f852ea92a Merge pull request #10150 from Trilbyspaceclone/patch-245 Lin 2019-12-15 00:02:57 +00:00
  • f24dfa6387 Automatic changelog generation for PR #10163 [ci skip] CitadelStationBot 2019-12-14 18:00:01 -06:00
  • 43646434a0 Merge pull request #10163 from Ghommie/Ghommie-cit455 Lin 2019-12-14 23:59:58 +00:00
  • 967bcce38e actually i still need this Putnam 2019-12-14 14:17:05 -08:00
  • 0deaebc4ca voting makes everything dumb Putnam 2019-12-14 14:16:02 -08:00
  • e1f0c52b96 that's storytellers. time for voting Putnam 2019-12-14 14:13:23 -08:00
  • 081d3df750 This is one serious Pepe Silvia complex. Ghommie 2019-12-14 22:52:40 +01:00
  • b84b54d53f Automatic changelog generation for PR #10171 [ci skip] CitadelStationBot 2019-12-14 13:04:40 -06:00
  • bd1040ab60 Merge pull request #10171 from r4d6/patch-1 Putnam3145 2019-12-14 11:04:37 -08:00
  • 12b87b4f3d Better. Ghommie 2019-12-14 19:29:51 +01:00
  • 2ccfaf38fb consistency. Ghommie 2019-12-14 19:27:39 +01:00
  • 6117434c7f Ok Ghommie 2019-12-14 19:24:43 +01:00
  • 70252d2914 Fixing a few pill bottle issues with the ChemMaster. Ghommie 2019-12-14 19:20:02 +01:00
  • e5d45faee8 deadchat, not deathchat. Ghommie 2019-12-14 18:53:53 +01:00
  • 6124fbf316 Hopefully this fixes the linter errors Artur 2019-12-14 19:04:36 +02:00
  • 3891c91799 virtual reality component improvements, fixes and documentation. Ghommie 2019-12-14 17:19:48 +01:00
  • d0493ac471 Reviewer and linter fixes, and veil tweak Artur 2019-12-14 17:09:39 +02:00
  • 8ddde88199 Automatic changelog generation for PR #10050 [ci skip] CitadelStationBot 2019-12-13 23:33:34 -06:00
  • 2e003b7383 Merge pull request #10050 from Ghommie/Ghommie-cit427 Lin 2019-12-14 05:33:31 +00:00
  • 59d0376985 finished BlackMajor 2019-12-14 17:31:26 +13:00
  • 44ed639169 i should probably write an actual changelog for this Hatterhat 2019-12-13 22:16:50 -06:00
  • a1cc129d0b slightly better storage, cucks the surgery duffel Hatterhat 2019-12-13 21:10:12 -06:00
  • 659b78d8b8 Merge pull request #10162 from BlackMajor/Yeehaw kevinz000 2019-12-13 16:52:22 -07:00
  • 9faf3d1dac Mooaar fixeees Artur 2019-12-14 01:01:38 +02:00
  • 0b879f0f73 Fixing a boxstation pipenet mapping issue. Ghommie 2019-12-13 16:57:48 +01:00
  • b39ae815f3 Porting several quirks code updates. Ghommie 2019-12-13 16:12:04 +01:00
  • 5f95e0d5a6 Remove an extra antimatter engine shielding r4d6 2019-12-13 08:17:06 -05:00
  • 2bf35ec81c Nuclear fist BlackMajor 2019-12-14 02:15:09 +13:00
  • 8a7c559746 Allows ghost mentors to orbit around the target instead of changing their view to the mob's. Ghommie 2019-12-13 10:45:31 +01:00
  • 221291f525 Fixing some not safe for work oddity. Ghommie 2019-12-13 08:02:39 +01:00
  • 2611023488 Ports "Roundstart borg brains no longer decay." Ghommie 2019-12-13 07:33:45 +01:00
  • cdeb4733aa Merge pull request #9863 from BlackMajor/Yote nik707 2019-12-12 23:50:34 -06:00
  • c098d497ad Minor underwear fixes and tweaks. Ghommie 2019-12-13 06:50:14 +01:00
  • 93c4d3c1af martial artists kappa-sama 2019-12-12 23:27:12 -05:00
  • eec02ae973 Merge pull request #9757 from Ghommie/Ghommie-cit333 Putnam3145 2019-12-12 19:35:21 -08:00
  • 319d4d51bb Allows blood bank generators to be wrenched and unwrenched. Ghommie 2019-12-13 04:26:37 +01:00
  • 285833c8d3 Runtime fix Trilbyspaceclone 2019-12-12 21:51:50 -05:00
  • 658e050b1f Ghommie correction Trilbyspaceclone 2019-12-12 21:47:54 -05:00
  • 5331db3ebd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit333 Ghommie 2019-12-13 03:46:37 +01:00
  • e6282e95c2 Apply suggestions from code review Trilbyspaceclone 2019-12-12 21:46:31 -05:00
  • 79328012b0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402 Ghommie 2019-12-13 03:41:22 +01:00
  • 563a0fef3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390 Ghommie 2019-12-13 02:45:53 +01:00
  • 284202a092 two lines. Ghommie 2019-12-13 02:37:51 +01:00
  • 7d7bcc7c34 Fixes and ready up. Ghommie 2019-12-13 02:26:59 +01:00
  • 3fcb7808fd args Ghommie 2019-12-08 09:18:17 +01:00
  • 8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. Ghommie 2019-12-08 09:02:41 +01:00
  • 83a707ee93 Removes medihounds, same treatment as janihounds BlackMajor 2019-12-13 13:48:22 +13:00
  • fdbe2c4061 Merge pull request #26 from Citadel-Station-13/master BlackMajor 2019-12-13 12:44:03 +13:00
  • e9eb371505 Automatic changelog generation for PR #10161 [ci skip] CitadelStationBot 2019-12-12 16:46:26 -06:00
  • 06d7b37889 Merge pull request #10161 from Ghommie/Ghommie-cit454 Putnam3145 2019-12-12 14:46:23 -08:00
  • 7bc59b0d82 b kappa-sama 2019-12-12 17:38:39 -05:00
  • 911685ff0a Fixes raven's shuttle computer not being of the emergency shuttle type. Ghommie 2019-12-12 23:28:50 +01:00