Commit Graph

  • f883f55391 Merge pull request #9818 from GrayRachnid/portssaboteur kevinz000 2019-11-19 21:28:25 -07:00
  • 411310b0c6 Unmodularize tools and apc icons. Ghommie 2019-11-20 05:18:15 +01:00
  • 36d860a4ba Makes from-ghosts ruleset cancel if fewer than required candidates Putnam 2019-11-19 20:10:06 -08:00
  • b78da82336 Honkbot slip and slide fun ride. Ghommie 2019-11-20 04:03:57 +01:00
  • 7c0c14e059 Fixing aux-base construction RCD door access settings menu and reverting another non-functional bit Ghommie 2019-11-20 03:35:06 +01:00
  • 592c952d64 Update regenerative_core.dm Knouli 2019-11-19 20:03:04 -05:00
  • 8ab67ccf49 what does this button do dzahlus 2019-11-20 01:34:26 +01:00
  • 13f65c028f Moves some clockie paper info to the right file. Ghommie 2019-11-20 01:19:05 +01:00
  • f161b01f6b ayytech plants Hatterhat 2019-11-19 17:26:44 -06:00
  • c21a137a62 Fixes super-lube waterflower. Ghommie 2019-11-19 22:56:29 +01:00
  • 95b9dd61a8 Update game_mode.dm kevinz000 2019-11-19 13:01:06 -07:00
  • 64433ec8ab Automatic changelog generation for PR #9814 [ci skip] CitadelStationBot 2019-11-19 12:38:22 -06:00
  • cb70f47a48 Merge pull request #9814 from Citadel-Station-13/kevinz000-patch-115 deathride58 2019-11-19 13:38:20 -05:00
  • 5169205a19 Added a 10pack as well Useroth 2019-11-19 19:35:37 +01:00
  • 21f15e411d Part 3 Ghommie 2019-11-19 19:34:42 +01:00
  • 24bd42fc80 Adds strange seeds as a buyable traitor botanist item. Useroth 2019-11-19 19:19:40 +01:00
  • dd101ef221 Part 2 Ghommie 2019-11-19 18:00:56 +01:00
  • 20fa223fc4 Oop Thalpy 2019-11-19 16:46:59 +00:00
  • 3abae989df Final settings Thalpy 2019-11-19 16:44:10 +00:00
  • bf89df7e7b Fixing things Thalpy 2019-11-19 16:03:33 +00:00
  • 6e2ff6ce3c Prevents storage bags from re-ordering their contents when items are removed. Useroth 2019-11-19 16:13:57 +01:00
  • c0287cf7b5 Reagent sleepers! Thalpy 2019-11-19 14:50:22 +00:00
  • 2eb33afcd6 Workin Thalpy 2019-11-19 14:19:51 +00:00
  • 9fb6c2f3a3 Okay I gotta hop Fermi 2019-11-19 12:22:53 +00:00
  • a6d4e7edef Update regenerative_core.dm Knouli 2019-11-19 06:00:56 -05:00
  • d4f6bc67ca Whoops that cansprint is in the wrong place BlackMajor 2019-11-19 22:41:39 +13:00
  • 1b1ed21f42 No adrenals for borgs please BlackMajor 2019-11-19 22:13:22 +13:00
  • 2494ea4d07 Merge pull request #9824 from YakumoChen/YakumoChen-mariplush kevinz000 2019-11-19 01:55:59 -07:00
  • 40a01dedfe Merge pull request #9806 from BlackMajor/Yote kevinz000 2019-11-19 01:54:47 -07:00
  • 6cdb54bef1 Fix service borg lights breaking BlackMajor 2019-11-19 21:29:05 +13:00
  • 84e84355c3 Update code/controllers/configuration/config_entry.dm kevinz000 2019-11-19 01:07:43 -07:00
  • 31c59b7cad fixes upgrades removing dogborg stuff BlackMajor 2019-11-19 20:50:59 +13:00
  • f9b632019b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update Linzolle 2019-11-18 21:39:45 -06:00
  • b5f6c12b30 Automatic changelog generation for PR #9782 [ci skip] CitadelStationBot 2019-11-18 21:25:12 -06:00
  • c57e0f5add Merge pull request #9782 from Ghommie/Ghommie-cit342 Lin 2019-11-19 03:25:09 +00:00
  • dd0d1b6a9c Automatic changelog generation for PR #9802 [ci skip] CitadelStationBot 2019-11-18 21:24:40 -06:00
  • c188c20f37 Merge pull request #9802 from Ghommie/Ghommie-cit349 Lin 2019-11-19 03:24:38 +00:00
  • 1a40865fae Automatic changelog generation for PR #9730 [ci skip] CitadelStationBot 2019-11-18 21:23:15 -06:00
  • 512939f1e6 Merge pull request #9730 from Citadel-Station-13/kevinz000-patch-112 Lin 2019-11-19 03:23:12 +00:00
  • a52e292cc8 Ports "examine-code refactor"... part 1... Ghommie 2019-11-19 03:28:06 +01:00
  • da56a33e43 stuff Ghommie 2019-11-19 01:02:54 +01:00
  • cdfd5bbeac mistakes were made. Ghommie 2019-11-19 00:55:14 +01:00
  • f6b06a878c Ports "Mime PDAs only accept emojis for messages, mime cartridge comes with an emoji guidebook" Ghommie 2019-11-19 00:50:18 +01:00
  • 63a3919ed2 Fixing gasping xenos. Ghommie 2019-11-18 20:58:22 +01:00
  • d5e7f77c13 A Ghommie 2019-11-18 18:47:34 +01:00
  • bddb437872 It works now. Ghommie 2019-11-18 18:30:46 +01:00
  • 21c1f8bc2a Fixing suit store overlays Ghommie 2019-11-18 15:19:39 +01:00
  • b64b039709 correctes commits Trilbyspaceclone 2019-11-18 06:30:47 -05:00
  • d90812b0b2 reverts rapier nerfs Trilbyspaceclone 2019-11-18 06:26:25 -05:00
  • 86072fe682 " Ghommie 2019-11-18 04:15:33 +01:00
  • deadffe96f missing parenthesis. Ghommie 2019-11-18 03:26:04 +01:00
  • 1c39a3bc6d Adds a few extra cardboard cutout variants. Ghommie 2019-11-18 03:23:24 +01:00
  • ec4e3898eb Fixing some wizard den teleportation issues. Ghommie 2019-11-18 02:04:49 +01:00
  • bd41cfbfc5 fixing a few minor issues with console frames building. Ghommie 2019-11-17 22:44:37 +01:00
  • ebd78958ea bruh ghoo mee why you mean? KathrinBailey 2019-11-17 21:30:05 +00:00
  • 6e9d2d57c0 check_shields from human to living, part 2 Ghommie 2019-11-17 22:06:19 +01:00
  • c575b3c798 base ball bats, katanan's and chainsaws will still fit Trilbyspaceclone 2019-11-17 13:54:18 -05:00
  • 7780a14a60 rapier huge Trilbyspaceclone 2019-11-17 13:49:32 -05:00
  • e62f01648a Fixed removed armrests for regular sofas. KathrinBailey 2019-11-17 18:09:21 +00:00
  • b714c32ca2 Partly Reverts "Fixes loadout name, adds DAB outf- Anonymous 2019-11-17 19:44:22 +03:00
  • 8f7571a115 Don't do webedits, folks NopemanMcHalt 2019-11-17 18:18:20 +03:00
  • 468b6eb609 mining winter coat shtuff Seris02 2019-11-17 22:27:09 +08:00
  • 0d508e9108 DME update KathrinBailey 2019-11-17 14:21:08 +00:00
  • 05c74c731b Ports TG pew files KathrinBailey 2019-11-17 14:20:44 +00:00
  • ba091b3a27 limited midround wizard summon events possibilities Putnam 2019-11-17 05:56:19 -08:00
  • 1bb8ff1c0c Fixes loadout name, adds DAB outfit crate to cargo Anonymous 2019-11-17 15:08:30 +03:00
  • dea5019bc9 cosmic winter coat yeeeehaw Seris02 2019-11-17 20:06:01 +08:00
  • 35c538b412 Merge remote-tracking branch 'upstream/master' Fermi 2019-11-17 11:19:24 +00:00
  • 86a576e644 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix Seris02 2019-11-17 15:45:35 +08:00
  • 7d99508bd0 adds janitor winter coat Seris02 2019-11-17 15:45:12 +08:00
  • 7adf8da43e weh work please no error KathrinBailey 2019-11-17 06:32:33 +00:00
  • 51c1642976 yeah there we go self-confidence destroyed misshun accomplished KathrinBailey 2019-11-17 06:18:53 +00:00
  • 84e388840b Merge remote-tracking branch 'upstream/master' into Kat'sBoxRework KathrinBailey 2019-11-17 06:17:56 +00:00
  • b0a8547b43 I hate my life KathrinBailey 2019-11-17 06:17:28 +00:00
  • 5d06ea5d48 o Ghommie 2019-11-17 07:16:53 +01:00
  • c76c94bc35 Merge remote-tracking branch 'upstream/master' KathrinBailey 2019-11-17 06:12:11 +00:00
  • d65023ce1f please please fix merge conflict KathrinBailey 2019-11-17 06:08:13 +00:00
  • b560ff8284 refactoring code to allow all living mobs to use shields. Ghommie 2019-11-17 06:23:12 +01:00
  • b7f4580414 robotics winter coat Seris02 2019-11-17 11:50:56 +08:00
  • 773b3e6605 Oh yea, now I remember why I did not port the webedit.. bhjiiiiiiin! Ghommie 2019-11-17 04:11:37 +01:00
  • 9a65803e04 Ports "#47709" Ghommie 2019-11-17 03:59:57 +01:00
  • 641ddebed1 Ports "Uses defines for turf atmos" Ghommie 2019-11-17 03:19:35 +01:00
  • 6d6cc93e50 Ports "Self sustaining fix" Ghommie 2019-11-17 02:59:38 +01:00
  • 4d71f95b16 Merge branch 'master' into HeadCorgi lolman360 2019-11-17 12:24:04 +11:00
  • 8a54a73be4 e lolman360 2019-11-17 12:12:46 +11:00
  • aed866339f pickup pickup pickup pickup 100% pickup lolman360 2019-11-17 12:00:17 +11:00
  • df4ae7ea18 Just some fixes DeltaFire 2019-11-16 21:11:08 +01:00
  • 3f36a0096c Bruh moment DeltaFire 2019-11-16 20:45:23 +01:00
  • 73109f0858 Makes dynamic nukeops population scaling more like secret Putnam 2019-11-16 11:26:22 -08:00
  • 0ecb569a95 changes syndi mediborg cross to a black cross GrayRachnid 2019-11-16 13:44:23 -05:00
  • 613605e0d0 Unborking id consoles. Ghommie 2019-11-16 17:49:12 +01:00
  • f1205b4ab2 Makes meteor not repeatable. Putnam 2019-11-16 08:27:36 -08:00
  • 3e6a298a6d one line shuttle fix port Ghommie 2019-11-16 17:18:26 +01:00
  • 239974e8eb Hmmm DeltaFire 2019-11-16 16:25:18 +01:00
  • a213a3f603 Okay cool DeltaFire 2019-11-16 16:24:32 +01:00
  • a5b1c3cc9a Merge branch 'master' into cbt-clockvsbloodtorture DeltaFire 2019-11-16 16:18:38 +01:00
  • c9cfecb9f4 Okay epic DeltaFire15 2019-11-16 16:17:19 +01:00
  • 264dad4d29 Merge branch 'master' into cbt-clockvsbloodtorture DeltaFire 2019-11-16 16:12:44 +01:00
  • 9f8547d42d Another sync (#4) DeltaFire15 2019-11-16 16:12:12 +01:00
  • 350dd6ed3a Sync with master (#3) DeltaFire15 2019-11-16 16:03:25 +01:00