Commit Graph

  • 803ac258f8 Merge pull request #11254 from deathride58/fuckclosets Ghom 2020-02-27 01:11:23 +01:00
  • 2c642d5507 Update kitchen_spike.dm Ghom 2020-02-27 01:10:38 +01:00
  • 7eac87d2e0 Merge pull request #11252 from Citadel-Station-13/kevinz000-patch-12 Ghom 2020-02-27 01:09:47 +01:00
  • 1ca755e358 Automatic changelog generation for PR #10877 [ci skip] CitadelStationBot 2020-02-26 17:54:56 -06:00
  • 6dd35355ef Automatic changelog generation for PR #11150 [ci skip] CitadelStationBot 2020-02-26 17:54:44 -06:00
  • 954f03f4e0 Merge pull request #11150 from raspyosu/master Ghom 2020-02-27 00:54:41 +01:00
  • 1711fcaa06 k kevinz000 2020-02-26 15:56:01 -07:00
  • 69e3d857a8 derp Lin 2020-02-26 21:39:53 +00:00
  • ac384e4d70 consistency? Lin 2020-02-26 21:01:34 +00:00
  • c708d30d47 shitty webedit Lin 2020-02-26 20:59:32 +00:00
  • d7192a7c35 Makes the default sprint config options match live's actual config deathride58 2020-02-26 10:21:26 -05:00
  • c232356a88 Makes clicking open closets with items on harm intent attack the closet rather than put the item in the closet deathride58 2020-02-26 09:51:48 -05:00
  • 27b6469c67 Forgot a var Artur 2020-02-26 16:42:38 +02:00
  • b536c061fb Reviewer suggestion and co Artur 2020-02-26 16:26:57 +02:00
  • 25a2b34c38 some fixes kevinz000 2020-02-26 05:59:53 -07:00
  • 872872d9f9 move stuff kevinz000 2020-02-26 05:38:34 -07:00
  • 626cf886d6 Update twohanded.dm kevinz000 2020-02-26 05:31:47 -07:00
  • 655b154cf5 cleaned house TrilbySpaceClone 2020-02-26 07:00:22 -05:00
  • c326ca28a2 Adds the ruin spawn to KiloStation as well. BlackMajor 2020-02-26 23:57:53 +13:00
  • fc64c0a008 yeah woops forgot that Seris02 2020-02-26 18:02:07 +08:00
  • de6e8012f3 balances yee Seris02 2020-02-26 17:49:37 +08:00
  • be740ba690 Merge branch 'master' into SpaceRuins BlackMajor 2020-02-26 20:58:46 +13:00
  • f7058617c2 Merge pull request #33 from Citadel-Station-13/master BlackMajor 2020-02-26 20:56:20 +13:00
  • 7fe6ebb2c9 Update chair.dm Trilbyspaceclone 2020-02-26 00:24:09 -05:00
  • c906f8f17f lickable. Putnam 2020-02-25 20:49:01 -08:00
  • 0a698d1eeb oy. Putnam 2020-02-25 20:07:07 -08:00
  • ebac066b2f lets add traitor classes Putnam 2020-02-25 16:10:23 -08:00
  • 6b2bbe0133 there fixed Seris02 2020-02-26 06:51:03 +08:00
  • 76c1d5ddb9 k kevinz000 2020-02-25 15:40:00 -07:00
  • 5a320c7933 fugg u kevinz000 2020-02-25 14:37:40 -07:00
  • 40c2bdf5ee oh boy kevinz000 2020-02-25 14:06:12 -07:00
  • 5bd62d129f Merge pull request #10877 from kevinz000/staves Ghom 2020-02-25 20:32:36 +01:00
  • 74d6473c3b Initial Commit Artur 2020-02-25 17:07:40 +02:00
  • e02a6f6dea Fixing virology cause someone didn't covert ALL mob/species biotypes to flags. Ghommie 2020-02-25 15:37:02 +01:00
  • 5bdbe1a60a Automatic changelog generation for PR #11236 [ci skip] CitadelStationBot 2020-02-25 08:19:31 -06:00
  • 56d5899bbc Merge pull request #11236 from bunny232/master Ghom 2020-02-25 15:19:28 +01:00
  • 3ab027aca6 Automatic changelog generation for PR #11169 [ci skip] CitadelStationBot 2020-02-25 07:48:40 -06:00
  • 5ee2f0dcd8 Merge pull request #11169 from PersianXerxes/ohHeyKilo Ghom 2020-02-25 14:48:37 +01:00
  • 00403a39c6 Reverts tracker changes somewhat Artur 2020-02-25 15:47:15 +02:00
  • ea5774e713 Merge pull request #11225 from r4d6/Random-Mining Ghom 2020-02-25 14:41:40 +01:00
  • b8fa0c0977 Merge pull request #11217 from Citadel-Station-13/kevinz000-patch-12 Ghom 2020-02-25 14:31:07 +01:00
  • d37112d330 Automatic changelog generation for PR #11212 [ci skip] CitadelStationBot 2020-02-25 07:23:59 -06:00
  • 5adfb5ca46 Merge pull request #11212 from r4d6/engine Ghom 2020-02-25 14:23:56 +01:00
  • bf8a91b4f7 Automatic changelog generation for PR #11238 [ci skip] CitadelStationBot 2020-02-25 07:22:34 -06:00
  • f98e181820 Merge pull request #11238 from Trilbyspaceclone/patch-296 Ghom 2020-02-25 14:22:31 +01:00
  • 170e092a24 this is going to end well Kraseo 2020-02-25 13:14:18 +01:00
  • bfb8139225 DefaultCombatknockdown kevinz000 2020-02-25 03:18:37 -07:00
  • 8b06f6d4e9 message fix kevinz000 2020-02-25 03:08:34 -07:00
  • 5726b848b1 Stopping for the night, chem masters can only dispense smart darts Persi 2020-02-25 04:27:20 -05:00
  • f8469c89a4 Conflict fix Artur 2020-02-25 10:46:20 +02:00
  • 2aeb1e1b4a Update overmind.dm Trilbyspaceclone 2020-02-25 00:32:45 -05:00
  • f48fd43e82 Fixed dining room sofas, oops Persi 2020-02-25 00:29:19 -05:00
  • f2fe25d118 Updates maps with ruin border. Lowers ore gen on roids. BlackMajor 2020-02-25 17:33:18 +13:00
  • cf23018b6a Update snacks_cake.dm Trilbyspaceclone 2020-02-24 22:51:43 -05:00
  • fc85f62546 Merge branch 'master' into SpaceRuins BlackMajor 2020-02-25 16:51:39 +13:00
  • acf78d4b2d Merge pull request #32 from Citadel-Station-13/master BlackMajor 2020-02-25 16:47:49 +13:00
  • 2eae147e93 ok kevinz000 2020-02-24 16:51:35 -07:00
  • 53d5328c0c Update sentience.dm bunny232 2020-02-24 18:49:34 -05:00
  • 569ea6bd61 unfucks paramedics access + PDA Detective Google 2020-02-24 16:36:45 -06:00
  • 5144e45ba9 it works now :D kevinz000 2020-02-24 15:32:46 -07:00
  • bbcc9cf4e5 never ever webeditor kevinz000 2020-02-24 15:15:21 -07:00
  • 270c5f26b5 Automatic changelog generation for PR #11192 [ci skip] CitadelStationBot 2020-02-24 16:12:47 -06:00
  • febb890c7f Merge pull request #11192 from Putnam3145/supermatter-hardcap kevinz000 2020-02-24 15:12:45 -07:00
  • 672da86c51 NEVERWEBEDITORGUYS kevinz000 2020-02-24 15:08:08 -07:00
  • 5ad51758e0 fix kevinz000 2020-02-24 15:04:25 -07:00
  • 388a804add Merge remote-tracking branch 'citadel/kevinz000-patch-15' into kevinz000-patch-17 kevinz000 2020-02-24 15:03:20 -07:00
  • c739091285 Merge remote-tracking branch 'citadel/kevinz000-patch-11' into kevinz000-patch-17 kevinz000 2020-02-24 15:03:05 -07:00
  • 526471510f Merge remote-tracking branch 'citadel/kevinz000-patch-17-1' into kevinz000-patch-17 kevinz000 2020-02-24 15:03:02 -07:00
  • 306b711ab1 Update reagents.dm kevinz000 2020-02-24 14:30:50 -07:00
  • 2b3e8a64f7 Update holder.dm kevinz000 2020-02-24 14:23:44 -07:00
  • 5cece42c1a Update glass.dm kevinz000 2020-02-24 14:20:40 -07:00
  • 23aa38a381 Update reagent_containers.dm kevinz000 2020-02-24 14:17:48 -07:00
  • c6a0418946 Update reagent_containers.dm kevinz000 2020-02-24 14:10:53 -07:00
  • 3709992b46 Update reagent_containers.dm kevinz000 2020-02-24 14:07:58 -07:00
  • 77edc602dc Update glass.dm kevinz000 2020-02-24 13:59:27 -07:00
  • d4657df9f5 Update glass.dm kevinz000 2020-02-24 13:58:51 -07:00
  • 1668bc598a Update glass.dm kevinz000 2020-02-24 13:55:44 -07:00
  • 00c70acee9 Target wew kevinz000 2020-02-24 13:20:12 -07:00
  • 26b908f53d thonk kevinz000 2020-02-24 13:19:38 -07:00
  • 90d7fd81b1 k kevinz000 2020-02-24 13:17:08 -07:00
  • fa9e275237 k kevinz000 2020-02-24 13:16:12 -07:00
  • 59e95555bb Merge remote-tracking branch 'citadel/master' into staves kevinz000 2020-02-24 13:09:45 -07:00
  • 4205233e45 Automatic changelog generation for PR #11129 [ci skip] CitadelStationBot 2020-02-24 13:53:39 -06:00
  • f86e17d945 Merge pull request #11129 from Owai-Seek/movefood-2-16-20 Ghom 2020-02-24 20:53:36 +01:00
  • feaadffd93 Gave jittering to salbutamol. Putnam 2020-02-24 11:23:51 -08:00
  • f76a1c15f3 Port random mining base r4d6 2020-02-24 13:27:54 -05:00
  • d138878e03 peace is an option TrilbySpaceClone 2020-02-24 12:18:49 -05:00
  • bc94cf25ee it didnt TrilbySpaceClone 2020-02-24 11:49:27 -05:00
  • a3917a1bbc huh that worked? TrilbySpaceClone 2020-02-24 11:47:06 -05:00
  • 525cedf16a this just works TrilbySpaceClone 2020-02-24 11:45:47 -05:00
  • 85150b651e Automatic changelog generation for PR #11167 [ci skip] CitadelStationBot 2020-02-24 09:40:20 -06:00
  • 213a406568 Merge pull request #11167 from Citadel-Station-13/kevinz000-patch-11 Ghom 2020-02-24 16:40:17 +01:00
  • 645da9010a Automatic changelog generation for PR #11110 [ci skip] CitadelStationBot 2020-02-24 09:39:19 -06:00
  • 9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk Ghom 2020-02-24 16:39:16 +01:00
  • 6624155e3d Hey you know this is probably a smarter way to go about ruin spawning in station space. BlackMajor 2020-02-25 02:21:28 +13:00
  • 80ebdc44c7 moral of the story is doublecheck your code Kraseo 2020-02-24 14:13:52 +01:00
  • 08829fe535 why don't they get a powersink by default Kraseo 2020-02-24 14:03:18 +01:00
  • 528a226dae Done. Artur 2020-02-24 13:36:55 +02:00
  • 3914c5522a TWOCAT YakumoChen 2020-02-24 05:33:40 -05:00
  • 6385445fd5 ruining the joke YakumoChen 2020-02-24 10:31:47 +00:00