Commit Graph

  • 8b20df838d Just testing now. Fermi 2019-09-10 18:15:04 +01:00
  • 6bdc0ef0c0 gives engivend upgraded RCDs by default. Tupinambis 2019-09-09 21:12:28 -05:00
  • 8a1e097ba7 Merge pull request #9243 from BlackMajor/Doggo-sit kevinz000 2019-09-09 17:54:19 -07:00
  • 7ef06427c5 Removes the medihound red crosses BlackMajor 2019-09-10 11:07:54 +12:00
  • 0b581a1ded Merge branch 'master' into Doggo-sit BlackMajor 2019-09-10 11:02:57 +12:00
  • 6cc92da914 bruh Linzolle 2019-09-09 18:02:23 -05:00
  • ef700e77d9 Merge pull request #9266 from BlackMajor/master kevinz000 2019-09-09 09:39:48 -07:00
  • 2db95cf164 Yes this is how github works. BlackMajor 2019-09-09 21:16:06 +12:00
  • ede9716d98 Yeet BlackMajor 2019-09-09 21:12:40 +12:00
  • 9d32f5a6cd Merge pull request #11 from Citadel-Station-13/master BlackMajor 2019-09-09 21:11:21 +12:00
  • e1e6496976 Me no comprendo github conflicts right now BlackMajor 2019-09-09 21:08:24 +12:00
  • 54edb7553a Thank you github very cool BlackMajor 2019-09-09 21:02:32 +12:00
  • 683f46a051 Fuck BlackMajor 2019-09-09 20:57:32 +12:00
  • 574d41ff09 This better work BlackMajor 2019-09-09 20:55:23 +12:00
  • 8239f28944 FINE WE'LL DO IT YOUR WAY BlackMajor 2019-09-09 20:54:20 +12:00
  • ce962490e3 Dab on merge conflict part 2 BlackMajor 2019-09-09 20:52:08 +12:00
  • a29fc4205f Dab on merge conflict part 1 BlackMajor 2019-09-09 20:51:01 +12:00
  • c824f4a6fe Fixes Alina's donor sprites and adjusts dark medihound to not trigger the red cross BlackMajor 2019-09-09 20:38:51 +12:00
  • dbb4e43c17 Merge pull request #9264 from Citadel-Station-13/BlackMajor-patch-1 kevinz000 2019-09-08 22:18:54 -07:00
  • f1fafb7f5f Discord invite was invalid, updates it. BlackMajor 2019-09-09 17:17:28 +12:00
  • 02771c9d27 Why didnt my last commit save at all? Trilbyspaceclone 2019-09-08 22:10:31 -04:00
  • 275457001d It didnt save my last change Trilbyspaceclone 2019-09-08 21:52:28 -04:00
  • 0e12a4f8d1 and swing! TrilbySpaceClone 2019-09-08 21:39:32 -04:00
  • 97d511b0b8 Automatic changelog generation for PR #9249 [ci skip] CitadelStationBot 2019-09-08 18:49:46 -05:00
  • 11846849cf Merge pull request #9249 from Trilbyspaceclone/patch-224 nik707 2019-09-08 19:49:44 -04:00
  • bfbf9f2492 Merge pull request #9254 from Citadel-Station-13/gloria-plushie nik707 2019-09-08 19:47:50 -04:00
  • 17e15da98e Automatic changelog generation for PR #9256 [ci skip] CitadelStationBot 2019-09-08 18:46:10 -05:00
  • de055fe289 Merge pull request #9256 from Thalpy/INFINITE-FERMIES nik707 2019-09-08 19:46:08 -04:00
  • d6d0866aa5 Merge pull request #3 from Citadel-Station-13/master EmeraldSundisk 2019-09-08 13:42:19 -07:00
  • 42abad4c63 Merge pull request #9261 from Citadel-Station-13/kevinz000-patch-81 nik707 2019-09-08 14:25:22 -05:00
  • 7843e070ff Update mob.dm kevinz000 2019-09-08 12:13:24 -07:00
  • 9f275ebf01 Ports trim decals Dap 2019-09-08 10:51:05 -06:00
  • 8820fde62c Updates Icons Fermi 2019-09-08 03:33:47 +01:00
  • 1e454ff1a7 Merge branch 'pr/25' into Blind-quirk-without-anger Fermi 2019-09-08 03:29:22 +01:00
  • 033057d380 OOPS Fermi 2019-09-08 02:55:40 +01:00
  • d883192cf9 Forgot to save Fermi 2019-09-08 02:53:11 +01:00
  • 2a98f94b24 Rewrite Fermi 2019-09-08 02:52:22 +01:00
  • 018ebc32ae All that remains is MK testing. Fermi 2019-09-08 02:46:43 +01:00
  • e793c1abcb Delete plushes (2).dmi kevinz000 2019-09-07 17:15:27 -07:00
  • 0abef923b4 Add files via upload kevinz000 2019-09-07 17:14:47 -07:00
  • cfdbb54245 Add files via upload kevinz000 2019-09-07 17:13:59 -07:00
  • 3e9d37e70d Update plushes.dm kevinz000 2019-09-07 17:13:21 -07:00
  • d21a45cd53 Doubles stamina regen when laying down/standing chefferz 2019-09-07 20:07:19 -04:00
  • b2e2d49d9e Merge pull request #4 from Citadel-Station-13/master chefferz 2019-09-07 20:05:26 -04:00
  • cd4403911b Delete plushes.dmi kevinz000 2019-09-07 17:03:27 -07:00
  • b8374feafd Update plushes.dm kevinz000 2019-09-07 17:03:06 -07:00
  • 64b757f404 refactor suits Linzolle 2019-09-07 17:10:10 -05:00
  • 20ea620e9e literally why even Linzolle 2019-09-07 16:46:25 -05:00
  • ff048df797 Automatic changelog generation for PR #9248 [ci skip] CitadelStationBot 2019-09-07 13:50:36 -05:00
  • 28aac1d779 Merge pull request #9248 from Trilbyspaceclone/warcrime! kevinz000 2019-09-07 11:50:33 -07:00
  • 4b66c7af85 Automatic changelog generation for PR #9238 [ci skip] CitadelStationBot 2019-09-07 13:37:15 -05:00
  • 8f577e910a Merge pull request #9238 from Trilbyspaceclone/surgery_stuff kevinz000 2019-09-07 11:37:13 -07:00
  • 2c006004e6 Automatic changelog generation for PR #9229 [ci skip] CitadelStationBot 2019-09-07 13:35:57 -05:00
  • 4d805331df Merge pull request #9229 from Trilbyspaceclone/patch-220 kevinz000 2019-09-07 11:35:55 -07:00
  • b2a1aa54c4 Automatic changelog generation for PR #9089 [ci skip] CitadelStationBot 2019-09-07 13:35:12 -05:00
  • 09ed526594 Merge pull request #9089 from Sishen1542/rapid-construction-dabvice kevinz000 2019-09-07 11:35:09 -07:00
  • 0f6828e76e Merge pull request #9224 from kappa-sama/apeserum kevinz000 2019-09-07 11:27:44 -07:00
  • c5f3f3d7f9 Merge pull request #9250 from MrJWhit/abductor-spawntext kevinz000 2019-09-07 11:26:38 -07:00
  • 97072c63c8 Adds text to not disturb the habatat to abductor spawntext MrJWhit 2019-09-07 13:52:08 -04:00
  • 4170da3a2e missed sleepers TrilbySpaceClone 2019-09-07 04:28:39 -04:00
  • 02ae8ac889 Automatic changelog generation for PR #9221 [ci skip] CitadelStationBot 2019-09-06 18:47:50 -05:00
  • 87cf0b971a Merge pull request #9221 from Sishen1542/chappy kevinz000 2019-09-06 16:47:46 -07:00
  • 8c05b4a1d8 *poor cleanbot* Trilbyspaceclone 2019-09-06 19:20:32 -04:00
  • 3c38e6eb3d Update cleanbot.dm Trilbyspaceclone 2019-09-06 18:49:42 -04:00
  • ab8d7ec4a6 Automatic changelog generation for PR #9242 [ci skip] CitadelStationBot 2019-09-06 13:45:58 -05:00
  • e71dad4ecc Merge pull request #9242 from kappa-sama/bootcult kevinz000 2019-09-06 11:45:56 -07:00
  • a521e3307b Automatic changelog generation for PR #9239 [ci skip] CitadelStationBot 2019-09-06 13:45:23 -05:00
  • 4b0505f691 Merge pull request #9239 from Trilbyspaceclone/patch-222 kevinz000 2019-09-06 11:45:21 -07:00
  • a91eb608cd All of the objects TrilbySpaceClone 2019-09-06 13:56:10 -04:00
  • c4f99adc3c Revert "No more!" TrilbySpaceClone 2019-09-06 12:18:50 -04:00
  • dab0829da8 normalizes head roles not rolling the more common antags (wiz is kept) Sishen 2019-09-06 04:50:20 -04:00
  • 3e5a192af0 Updates borg examine to also show what module type they are. BlackMajor 2019-09-06 13:31:01 +12:00
  • cca2001ccb Fixes dogborgs not using their deadsprite BlackMajor 2019-09-06 12:29:36 +12:00
  • d36715ee7b blue cross Linzolle 2019-09-05 18:53:03 -05:00
  • 9cc7f08668 No more! TrilbySpaceClone 2019-09-05 18:56:46 -04:00
  • 816ae638a2 [TO_TEST] Fermi 2019-09-05 23:19:53 +01:00
  • 29e5c1c10a Still some residual chems kicking about..!! Fermi 2019-09-05 23:15:30 +01:00
  • d90b4769f1 MK, SDGF, Astrogen, Eigen, BE, furranium, hattmium tweaks and fixes. Fermi 2019-09-05 22:30:53 +01:00
  • 92f3e4b4ee add sprites for spaceold Linzolle 2019-09-05 15:01:24 -05:00
  • 0280ea134d use the one from RP but edited Linzolle 2019-09-05 14:06:28 -05:00
  • 04325af2d6 resprite cmo hardsuit for nagas Linzolle 2019-09-05 13:55:26 -05:00
  • 38926ddf75 pawbs Linzolle 2019-09-05 12:58:30 -05:00
  • b36caabfe6 taur fixes Linzolle 2019-09-05 12:47:55 -05:00
  • 80e2f6e7c2 Merge pull request #9245 from jakeramsay007/GLASS-MACHINE-BROKE nik707 2019-09-05 10:43:05 -05:00
  • 0cf1415969 [SPEEDMERGE] Glass Machine :b:roke Chayse Ramsay 2019-09-05 16:28:18 +01:00
  • fbc2d3c8fe Ports dogborg sprites from RP to main BlackMajor 2019-09-06 01:23:53 +12:00
  • a68f35723f Update clothesmate.dm Trilbyspaceclone 2019-09-05 06:45:22 -04:00
  • b85ff2c5a2 Update nutrimax.dm Trilbyspaceclone 2019-09-05 06:44:59 -04:00
  • 57fd7388d3 Update nutrimax.dm Trilbyspaceclone 2019-09-05 06:44:37 -04:00
  • c0c23fcc43 Update wardrobes.dm Trilbyspaceclone 2019-09-05 06:43:41 -04:00
  • 0a43c2b64d Update recipes_clothing.dm Trilbyspaceclone 2019-09-05 06:42:41 -04:00
  • 19e1e8f8b1 dream maker drives me crazy Linzolle 2019-09-04 21:33:00 -05:00
  • 0011733b9e thank you dream maker Linzolle 2019-09-04 21:30:26 -05:00
  • eff4b26076 maybe include it Linzolle 2019-09-04 21:22:41 -05:00
  • 5bc6c9ea04 requested change Linzolle 2019-09-04 21:18:18 -05:00
  • 162f16df44 potentially confusing Linzolle 2019-09-04 20:17:33 -05:00
  • d8dee76d28 Merge pull request #9222 from Citadel-Station-13/kevinz000-patch-80 nik707 2019-09-04 20:14:06 -05:00
  • 364d05e2b7 paxton going ape kappa-sama 2019-09-04 20:48:46 -04:00
  • 599634496e paxton told me to do this or else he'd go ape kappa-sama 2019-09-04 20:46:50 -04:00
  • 586eb56977 Merge pull request #9230 from Ghommie/Ghommie-cit191 nik707 2019-09-04 19:45:19 -05:00