Commit Graph

  • 7a3d895997 Merge pull request #9040 from Trilbyspaceclone/cooking_101_Cakes kevinz000 2019-08-04 19:15:18 -07:00
  • 4408d41c7a Automatic changelog generation for PR #9009 [ci skip] CitadelStationBot 2019-08-04 21:14:10 -05:00
  • afe2dd1e28 Merge pull request #9009 from BurgerLUA/Proper-Calculations kevinz000 2019-08-04 19:14:08 -07:00
  • e04547b838 Merge pull request #9015 from Trilbyspaceclone/patch-203 kevinz000 2019-08-04 19:13:44 -07:00
  • b053f284bb Automatic changelog generation for PR #9014 [ci skip] CitadelStationBot 2019-08-04 21:13:24 -05:00
  • 8452cf3b8a Merge pull request #9014 from Ghommie/Ghommie-cit170 kevinz000 2019-08-04 19:13:21 -07:00
  • f8dbe71bf7 Merge pull request #9035 from Poojawa/vore-toggle-fix kevinz000 2019-08-04 19:12:57 -07:00
  • 462815a9b6 Automatic changelog generation for PR #9036 [ci skip] CitadelStationBot 2019-08-04 21:09:38 -05:00
  • 53a9f3ac51 Merge pull request #9036 from Linzolle/invisiclothes kevinz000 2019-08-04 19:09:36 -07:00
  • de675a10e7 Merge pull request #9025 from Poojawa/patch-1 kevinz000 2019-08-04 19:08:16 -07:00
  • d6416abc4f Automatic changelog generation for PR #9044 [ci skip] CitadelStationBot 2019-08-04 21:07:38 -05:00
  • 4dcdf7ac4d Merge pull request #9044 from Sishen1542/rock-lock kevinz000 2019-08-04 19:07:35 -07:00
  • afd2ea7db6 Automatic changelog generation for PR #9018 [ci skip] CitadelStationBot 2019-08-04 21:05:02 -05:00
  • 27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171 kevinz000 2019-08-04 19:04:59 -07:00
  • ffa717e8d7 Prevents Eigenlockers from teleporting people to CC via cargoshuttle. Fermi 2019-08-04 19:39:14 +01:00
  • 40d6dc1812 Oops. Fermi 2019-08-04 14:54:40 +01:00
  • 9712f7b4df Delete footprints_and_rag.dm Poojawa 2019-08-04 06:39:54 -05:00
  • dcbcf704da I accidentally all the maps. whoops Poojawa 2019-08-04 06:27:28 -05:00
  • 7d65ddb417 bug blood, ipc/slime hearts, blood gen protolathe Poojawa 2019-08-04 04:07:44 -05:00
  • 51943d4c75 dduhhhhhhhd duurrrrrrrr Sishen 2019-08-04 04:56:55 -04:00
  • 6f02c5c6f6 don't pre-fill the tank CameronWoof 2019-08-04 01:10:17 -07:00
  • 6db4cbf8b0 itsworking.avi Poojawa 2019-08-04 01:32:51 -05:00
  • d3620c5894 Merge branch 'Helmet-Internals' of https://github.com/jakeramsay007/Citadel-Station-13 into Helmet-Internals Chayse Ramsay 2019-08-04 05:49:10 +01:00
  • f9d829b111 Proc to define Chayse Ramsay 2019-08-04 05:48:08 +01:00
  • 5e757f1012 Update code/modules/mob/living/carbon/life.dm Chayse Ramsay 2019-08-04 05:26:16 +01:00
  • 0a7054c604 Update code/modules/mob/living/carbon/inventory.dm Chayse Ramsay 2019-08-04 05:26:02 +01:00
  • 46e4023ba9 Monkey business Chayse Ramsay 2019-08-04 05:07:24 +01:00
  • 900d8d00af Officially ends the non-stop thrill ride of coating the station in your various fluids for "fun" CameronWoof 2019-08-03 20:37:02 -07:00
  • c9c4c5678c missed a few things nik707 2019-08-03 18:31:47 -05:00
  • 1af6445fa6 Update PubbyStation.dmm nik707 2019-08-03 18:17:28 -05:00
  • 20ce72ca9e Update PubbyStation.dmm nik707 2019-08-03 18:16:14 -05:00
  • 1f100f1f3b crush my lock with a rock i must Sishen 2019-08-03 18:48:14 -04:00
  • ba78ec7100 yes nik707 2019-08-03 17:41:12 -05:00
  • a0a21dc01f !iscarbon to !ishuman Chayse Ramsay 2019-08-03 18:36:46 +01:00
  • 464a589c25 *sobbing noises* EgoSumStultus 2019-08-03 07:34:32 -07:00
  • 1c1ca84c3a Update miscellaneous.dm kevinz000 2019-08-03 00:49:57 -07:00
  • 08c74d772a Automatic changelog generation for PR #8942 [ci skip] CitadelStationBot 2019-08-03 02:49:01 -05:00
  • f59abbf073 Merge pull request #8942 from jakeramsay007/WardenShotgun kevinz000 2019-08-03 00:48:59 -07:00
  • 8cfba8e2ce Update misc_walls.dm kevinz000 2019-08-03 00:46:24 -07:00
  • b3b8d71cc7 huuhuh... HUUuhuhuhh.... EgoSumStultus 2019-08-02 22:41:01 -07:00
  • b208a475ef huuhhuuhuhh.... EgoSumStultus 2019-08-02 21:37:56 -07:00
  • 3a85f9473c amazing TrilbySpaceClone 2019-08-02 14:37:52 -04:00
  • d0d6bc37a6 Merge branch 'master' into job-menu-improvements Poojawa 2019-08-02 11:55:28 -05:00
  • 50ea3970f6 huhuhuhuguhuuhh... EgoSumStultus 2019-08-02 09:25:38 -07:00
  • 45655c65f3 HUHUUGGUUHUHHUHUHHhhh... EgoSumStultus 2019-08-02 08:32:49 -07:00
  • 7f3e5ad3d0 AAUUGUGGHHHGHUGHUGHHH!! EgoSumStultus 2019-08-02 08:07:00 -07:00
  • 6b72e04708 HUFF HUFF HUFf... EgoSumStultus 2019-08-02 07:38:40 -07:00
  • 54f10b780c HHUUUUHGHUGHUGHGH!! EgoSumStultus 2019-08-02 07:35:59 -07:00
  • 10215b4ae2 WHHYYYyyYyYYyYYY!! EgoSumStultus 2019-08-02 06:51:53 -07:00
  • 4de05fc692 AAAAAAAAAAAAHHHHHHHHHHH EgoSumStultus 2019-08-02 06:48:14 -07:00
  • 5814ab7e8f BRRREEEEEEEEEEEEEEEEEEEEE EgoSumStultus 2019-08-02 06:23:02 -07:00
  • d5b0104a3e Update miscellaneous.dm kevinz000 2019-08-02 05:46:49 -07:00
  • 753548946d Automatic changelog generation for PR #8994 [ci skip] CitadelStationBot 2019-08-02 03:43:48 -05:00
  • eca34a6552 Merge pull request #8994 from Ghommie/Ghommie-cit164 kevinz000 2019-08-02 01:43:46 -07:00
  • a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting kevinz000 2019-08-02 00:57:05 -07:00
  • 0b97f3f99d Automatic changelog generation for PR #9005 [ci skip] CitadelStationBot 2019-08-02 02:56:01 -05:00
  • e1187036e2 Merge pull request #9005 from Trilbyspaceclone/ID_Swipers kevinz000 2019-08-02 00:55:59 -07:00
  • 17342614eb Automatic changelog generation for PR #9008 [ci skip] CitadelStationBot 2019-08-02 02:55:36 -05:00
  • 5fdd0b82dd Merge pull request #9008 from Linzolle/kravmaga kevinz000 2019-08-02 00:55:34 -07:00
  • 30b5104e63 Automatic changelog generation for PR #9026 [ci skip] CitadelStationBot 2019-08-02 02:55:20 -05:00
  • eef733da3d Merge pull request #9026 from BurgerLUA/Alert-Level-Indicator kevinz000 2019-08-02 00:55:18 -07:00
  • dba6a25b15 Merge pull request #9011 from Trilbyspaceclone/patch-201 kevinz000 2019-08-02 00:54:57 -07:00
  • caa0579fca Merge pull request #9016 from Trilbyspaceclone/patch-204 kevinz000 2019-08-01 23:29:27 -07:00
  • f8d7185ec1 Automatic changelog generation for PR #8958 [ci skip] CitadelStationBot 2019-08-02 01:29:12 -05:00
  • b52462de0d Merge pull request #8958 from Trilbyspaceclone/emitter_gun kevinz000 2019-08-01 23:29:10 -07:00
  • fc61eb84fd Automatic changelog generation for PR #8953 [ci skip] CitadelStationBot 2019-08-02 01:28:24 -05:00
  • 20f912df49 Merge pull request #8953 from Michiyamenotehifunana/Rapid-Resprite-Service kevinz000 2019-08-01 23:28:21 -07:00
  • 3848d97572 Automatic changelog generation for PR #8988 [ci skip] CitadelStationBot 2019-08-02 01:26:39 -05:00
  • 84a5c8fe5f Merge pull request #8988 from kiwedespars/hallucination-sting kevinz000 2019-08-01 23:26:37 -07:00
  • e458eb1f9f Automatic changelog generation for PR #9001 [ci skip] CitadelStationBot 2019-08-02 01:26:09 -05:00
  • 64267c7ce2 Merge pull request #9001 from Linzolle/skirtfix kevinz000 2019-08-01 23:26:07 -07:00
  • 11764c0434 Automatic changelog generation for PR #9000 [ci skip] CitadelStationBot 2019-08-02 01:25:54 -05:00
  • 0a83649f28 Merge pull request #9000 from EgoSumStultus/shielf kevinz000 2019-08-01 23:25:52 -07:00
  • bc9bca8d04 oh my god Linzolle 2019-08-02 01:20:32 -05:00
  • b5fcaf20e6 Fixes a runtime with a simple mob verb Poojawa 2019-08-01 17:40:43 -05:00
  • 657d3528e2 some good work here Poojawa 2019-08-01 17:35:37 -05:00
  • 35b4525cc6 undefined proc Ghommie 2019-08-01 19:51:22 +02:00
  • 0297d8c3e6 helmet laziest spriting complete. Ghommie 2019-08-01 19:44:41 +02:00
  • 1893a8f319 correctly copy/pasta's the chaplain stuff Poojawa 2019-08-01 11:14:50 -05:00
  • ec90505881 neyh Poojawa 2019-08-01 11:06:03 -05:00
  • 0cd72e3b76 i'm going ape EgoSumStultus 2019-08-01 08:25:42 -07:00
  • 4059b18929 muzzled scrubs make me sick. Ghommie 2019-08-01 17:09:54 +02:00
  • cf2515eb47 updates magpistol .dmi EgoSumStultus 2019-08-01 07:27:18 -07:00
  • c8d7f1909d holy FUCK I got gib overlays working. Why wasn't it before? Poojawa 2019-08-01 00:58:24 -05:00
  • 6059db6a3b missed Ghommie 2019-08-01 07:07:20 +02:00
  • 5ee9b4d4f4 part 1 plasmaman stuff. Ghommie 2019-08-01 06:58:21 +02:00
  • 397b33f0b2 Fixes a bug no one here will ever run into CameronWoof 2019-07-31 21:00:45 -07:00
  • dc3f178e65 Improves vore sound efficency Poojawa 2019-07-31 22:12:08 -05:00
  • 1f73e6eb1d Notice me!! Fermi 2019-08-01 03:48:35 +01:00
  • 3f75a42ff2 Guess who staged before compiling? Fermi 2019-08-01 03:46:30 +01:00
  • 88e6fa4703 Yamero! Fermi 2019-08-01 03:42:57 +01:00
  • 18b03f9053 Furranium fixes. Fermi 2019-08-01 03:38:06 +01:00
  • 58a27fa082 tabby boi Poojawa 2019-07-31 19:37:53 -05:00
  • 1d5e21d137 ok Poojawa 2019-07-31 19:35:27 -05:00
  • 3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods Poojawa 2019-07-31 19:24:39 -05:00
  • 218cbe2dbc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements Poojawa 2019-07-31 19:09:35 -05:00
  • c0698bd220 whitespace BurgerLua 2019-07-31 16:40:49 -07:00
  • 3baac83021 Added BurgerLua 2019-07-31 16:40:35 -07:00
  • 8c24cb519b Likely fixes vore sounds Poojawa 2019-07-31 18:30:57 -05:00
  • a9b16701a1 Ports "Lizardwine drink crafting fix" Ghommie 2019-08-01 00:31:14 +02:00