Commit Graph

  • d1404a84d8 Update backpack.dm Trilbyspaceclone 2019-08-19 07:03:54 -04:00
  • cede93299e REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE Poojawa 2019-08-19 04:48:37 -05:00
  • 213b01b969 fixes the IV dripper memes, better formatting too Poojawa 2019-08-19 04:33:40 -05:00
  • 4a741d4938 Automatic changelog generation for PR #8349 [ci skip] CitadelStationBot 2019-08-19 03:07:44 -05:00
  • dbe50db261 Merge pull request #8349 from Trilbyspaceclone/patch-124 BlackMajor 2019-08-19 20:07:40 +12:00
  • 7398df25dd Automatic changelog generation for PR #8636 [ci skip] CitadelStationBot 2019-08-19 03:02:28 -05:00
  • 1d22b77293 Merge pull request #8636 from Trilbyspaceclone/lighten_up BlackMajor 2019-08-19 20:02:26 +12:00
  • 8ad705ec74 Update curator.dm Poojawa 2019-08-19 02:16:30 -05:00
  • 1ab64d4003 Update ert.dm kevinz000 2019-08-18 23:43:31 -07:00
  • 86cb735cc9 Merge branch 'master' into kevinz000-patch-64 kevinz000 2019-08-18 23:41:40 -07:00
  • de5a0a922d Automatic changelog generation for PR #8763 [ci skip] CitadelStationBot 2019-08-19 01:39:41 -05:00
  • 3f734d9aca Merge pull request #8763 from Trilbyspaceclone/patch-188 kevinz000 2019-08-18 23:39:39 -07:00
  • f12e7ded08 Automatic changelog generation for PR #9149 [ci skip] CitadelStationBot 2019-08-19 01:37:58 -05:00
  • 47dd8d22eb Merge pull request #9149 from Trilbyspaceclone/padding_and_such kevinz000 2019-08-18 23:37:56 -07:00
  • a56bc56167 Automatic changelog generation for PR #9150 [ci skip] CitadelStationBot 2019-08-19 01:37:27 -05:00
  • 789d729fad Automatic changelog generation for PR #9097 [ci skip] CitadelStationBot 2019-08-19 01:37:09 -05:00
  • 3ef29bbbeb Merge pull request #9097 from lolman360/durathread kevinz000 2019-08-18 23:37:07 -07:00
  • 6cc4a62534 Automatic changelog generation for PR #9137 [ci skip] CitadelStationBot 2019-08-19 01:34:51 -05:00
  • 8a96b29ef9 Merge pull request #9137 from Sishen1542/the-d-boiz kevinz000 2019-08-18 23:34:49 -07:00
  • edc54dd2aa Automatic changelog generation for PR #9151 [ci skip] CitadelStationBot 2019-08-19 01:34:06 -05:00
  • 558ea557f8 Merge pull request #9151 from Trilbyspaceclone/cloak kevinz000 2019-08-18 23:34:03 -07:00
  • 4a9610e543 Automatic changelog generation for PR #9134 [ci skip] CitadelStationBot 2019-08-19 01:33:05 -05:00
  • ec349ae347 Merge pull request #9134 from Arturlang/Nanite-sloime-heals kevinz000 2019-08-18 23:33:02 -07:00
  • 1913d74471 Automatic changelog generation for PR #9136 [ci skip] CitadelStationBot 2019-08-19 01:32:49 -05:00
  • f55682d6dd Merge pull request #9136 from Sishen1542/strained kevinz000 2019-08-18 23:32:47 -07:00
  • 6f918f3ef6 Automatic changelog generation for PR #9141 [ci skip] CitadelStationBot 2019-08-19 01:32:18 -05:00
  • 86cfd8a561 Merge pull request #9141 from deathride58/removwarpwissle kevinz000 2019-08-18 23:32:15 -07:00
  • 17a522300c Update hardsuit.dm kevinz000 2019-08-18 20:05:42 -07:00
  • f130bfe32e Merge branch 'job-menu-improvements' of https://github.com/Poojawa/Citadel-Station-13-portworks into job-menu-improvements Poojawa 2019-08-18 21:27:03 -05:00
  • 43541b043d Update warden.dm Poojawa 2019-08-18 21:27:00 -05:00
  • 70e3964fd2 Update head_of_security.dm Poojawa 2019-08-18 21:22:10 -05:00
  • c8810be706 Update captain.dm Code-Cygnet 2019-08-18 22:15:52 -04:00
  • 5840284e9e Update alcohol_reagents.dm Code-Cygnet 2019-08-18 22:14:41 -04:00
  • 32695f28cf Merge branch 'master' into The-Art-of-Drunken-Captaining Code-Cygnet 2019-08-18 22:12:23 -04:00
  • a351d8f995 Update captain.dm Code-Cygnet 2019-08-18 21:34:31 -04:00
  • 8fdb1c59d5 Update dynamic_rulesets_roundstart.dm Sishen 2019-08-18 21:16:07 -04:00
  • 323073f8d4 Merge pull request #6 from Trilbyspaceclone/patch-213 lolman360 2019-08-19 11:12:50 +10:00
  • 2ad94dccac Update dynamic_rulesets_roundstart.dm Sishen 2019-08-18 21:11:16 -04:00
  • 7fef33160d sure I guess Poojawa 2019-08-18 15:25:48 -05:00
  • 9cbd8af5b9 Updates colors, fixes alignment issues. Poojawa 2019-08-18 14:38:10 -05:00
  • 2c000636dd Update hardsuit.dm kevinz000 2019-08-18 07:24:58 -07:00
  • a0308a2760 Enables Poly phrases on tgs commands Poojawa 2019-08-18 08:29:28 -05:00
  • 5d33321f80 Merge remote-tracking branch 'refs/remotes/origin/job-pref-jonks' into job-menu-improvements Poojawa 2019-08-18 07:46:00 -05:00
  • 867b112158 HOW DID THIS NOT GET UPDATED???? Poojawa 2019-08-18 07:44:46 -05:00
  • c4198296d0 and this too Poojawa 2019-08-18 04:26:30 -05:00
  • 5e03f5be3d Update shaft_miner.dm Poojawa 2019-08-18 04:24:48 -05:00
  • b5da43c1b7 Gives Sec Officers back their stun combat weapons Poojawa 2019-08-18 04:04:05 -05:00
  • 933db4d05f reverts the overly greyish colors back to vibrant ones Poojawa 2019-08-18 01:00:16 -05:00
  • e1cee15720 seed TrilbySpaceClone 2019-08-18 01:40:36 -04:00
  • 566a4e65a1 right crafting TrilbySpaceClone 2019-08-18 01:31:38 -04:00
  • 8214a7012f I Didnt save the two corrections Trilbyspaceclone 2019-08-18 01:17:34 -04:00
  • fc6633071a rwar! Trilbyspaceclone 2019-08-18 01:07:38 -04:00
  • 4dae36869c tada TrilbySpaceClone 2019-08-18 01:01:00 -04:00
  • b5842048b4 blacklisting quirks Poojawa 2019-08-17 23:42:01 -05:00
  • 2922f08ef6 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements Poojawa 2019-08-17 23:41:28 -05:00
  • 2b08b97f1d yay TrilbySpaceClone 2019-08-17 23:54:50 -04:00
  • 13f27c040e Merge pull request #8848 from Citadel-Station-13/trait_blacklisting BlackMajor 2019-08-18 15:33:08 +12:00
  • 43b1d0405e Update flowers.dm Trilbyspaceclone 2019-08-17 23:25:38 -04:00
  • bb9aa4f039 I woulder how much this will fuck everthing up Trilbyspaceclone 2019-08-17 22:49:06 -04:00
  • cfd8217947 Update flowers.dm Trilbyspaceclone 2019-08-17 22:10:23 -04:00
  • e69d27f9eb Traitor armor TrilbySpaceClone 2019-08-17 20:36:47 -04:00
  • 975a33aad7 Update alcohol_reagents.dm Code-Cygnet 2019-08-17 19:38:58 -04:00
  • d2760287e1 Update captain.dm Code-Cygnet 2019-08-17 19:27:11 -04:00
  • 1d0cb91aaf Update traits.dm Code-Cygnet 2019-08-17 19:02:30 -04:00
  • d74b46c7f7 some updates thanks to thechosenevilone Sishen 2019-08-17 11:10:09 -04:00
  • 2eac1b6ca2 Everything's working again, for now. Poojawa 2019-08-17 08:04:18 -05:00
  • 569e33fdbc Update human.dm Poojawa 2019-08-17 05:55:47 -05:00
  • 5746126794 since it conflicted there, let's just fix it here Poojawa 2019-08-17 05:43:24 -05:00
  • 2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-08-17 05:43:05 -05:00
  • 725a8046e1 just need items to actually have their overlays, ree Poojawa 2019-08-17 04:50:24 -05:00
  • ff58fec243 New plant type: Peaches Raptorizer 2019-08-17 02:50:56 -05:00
  • 088bc484e3 Forensics re-destroyed, but better this time. Poojawa 2019-08-17 02:43:59 -05:00
  • 372c53b3da Uploads new drinks.dmi Code-Cygnet 2019-08-17 01:47:25 -04:00
  • 4b6b2cf195 Adds new drink to drink recipes Code-Cygnet 2019-08-17 01:37:28 -04:00
  • bcf65dc901 Update drink_reagents.dm Trilbyspaceclone 2019-08-17 00:58:02 -04:00
  • 906e7a1bd8 Update backpack.dm Trilbyspaceclone 2019-08-17 00:25:40 -04:00
  • 3851739533 Update other_reagents.dm Trilbyspaceclone 2019-08-17 00:06:58 -04:00
  • c81fd8fcd4 Update drink_reagents.dm Trilbyspaceclone 2019-08-17 00:02:22 -04:00
  • 5225665516 kev fix Trilbyspaceclone 2019-08-16 23:48:41 -04:00
  • 7ddfff7f5c Update uplink_items.dm Trilbyspaceclone 2019-08-16 23:07:15 -04:00
  • ae2ccb2686 should be done now lolman360 2019-08-17 12:20:37 +10:00
  • 20d71d1196 Fixes warp whistle runtimes for real this time. deathride58 2019-08-16 22:19:37 -04:00
  • 7d12535ead thanks paxxy boi lolman360 2019-08-17 12:18:18 +10:00
  • d93fceec98 oops recipe time thanks pax lolman360 2019-08-17 12:15:17 +10:00
  • e838da8039 Merge pull request #3 from Citadel-Station-13/master lolman360 2019-08-17 11:55:56 +10:00
  • dace39137f Kenneth!! lolman360 2019-08-17 11:54:55 +10:00
  • c2dd7111d0 Merge pull request #9112 from Trilbyspaceclone/patch-209 kevinz000 2019-08-16 17:17:04 -07:00
  • 2839935209 Automatic changelog generation for PR #9138 [ci skip] CitadelStationBot 2019-08-16 19:14:31 -05:00
  • f26718aab2 Merge pull request #9138 from kappa-sama/canefix kevinz000 2019-08-16 17:14:28 -07:00
  • 9071917e72 Merge pull request #9088 from Poojawa/blurry-runtimes kevinz000 2019-08-16 17:05:21 -07:00
  • ce62780ba0 Merge pull request #9095 from fludd12/snowflake-b-gone kevinz000 2019-08-16 17:04:45 -07:00
  • 1adeeebcac Automatic changelog generation for PR #9130 [ci skip] CitadelStationBot 2019-08-16 19:03:13 -05:00
  • f9eb85c3c1 Merge pull request #9130 from Owai-Seek/ServiceStuff kevinz000 2019-08-16 17:03:11 -07:00
  • f376fac53d Automatic changelog generation for PR #9133 [ci skip] CitadelStationBot 2019-08-16 18:59:53 -05:00
  • da7f4bfb9b Merge pull request #9133 from Raptorizer/Peaches kevinz000 2019-08-16 16:59:52 -07:00
  • cf55151f04 Merge pull request #9131 from jakeramsay007/Runtime-Fixes kevinz000 2019-08-16 16:59:11 -07:00
  • dea9ea4b3f Automatic changelog generation for PR #9119 [ci skip] CitadelStationBot 2019-08-16 18:58:29 -05:00
  • bdf7fb6980 Merge pull request #9119 from Linzolle/miningshuttle kevinz000 2019-08-16 16:58:27 -07:00
  • a124b02ee2 Automatic changelog generation for PR #9107 [ci skip] CitadelStationBot 2019-08-16 18:57:39 -05:00
  • 97306ff53c Merge pull request #9107 from deathride58/fixesarest kevinz000 2019-08-16 16:57:36 -07:00