shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 7017ab243b Merge pull request #10216 from Ghommie/Ghommie-cit474 Putnam3145 2019-12-17 11:47:19 -08:00
  • 37cfec22aa Merge pull request #10066 from Sishen1542/aaaaaaaa Putnam3145 2019-12-17 11:40:43 -08:00
  • f84bb03bf6 Automatic changelog generation for PR #10111 [ci skip] CitadelStationBot 2019-12-17 13:38:37 -06:00
  • 7a6541936c Merge pull request #10111 from kappa-sama/patch-11 Putnam3145 2019-12-17 11:38:35 -08:00
  • 1727bf321e Automatic changelog generation for PR #10155 [ci skip] CitadelStationBot 2019-12-17 13:34:15 -06:00
  • 0adcb900c1 Merge pull request #10155 from Seris02/windowfix Putnam3145 2019-12-17 11:34:13 -08:00
  • 6888ca7e29 Automatic changelog generation for PR #10157 [ci skip] CitadelStationBot 2019-12-17 13:33:36 -06:00
  • 634154e7cf Merge pull request #10157 from Ghommie/Ghommie-cit452 Putnam3145 2019-12-17 11:33:33 -08:00
  • 85b504042a Automatic changelog generation for PR #10203 [ci skip] CitadelStationBot 2019-12-17 13:32:58 -06:00
  • 10f0fa6868 Merge pull request #10203 from DeltaFire15/mechaccess Putnam3145 2019-12-17 11:32:56 -08:00
  • 670141edf7 Merge pull request #10209 from Ghommie/Ghommie-cit470 Putnam3145 2019-12-17 11:26:36 -08:00
  • 47df4f452d Update drink_reagents.dm Trilbyspaceclone 2019-12-17 14:26:21 -05:00
  • a749df2596 Automatic changelog generation for PR #10225 [ci skip] CitadelStationBot 2019-12-17 13:22:33 -06:00
  • 5945f30523 Merge pull request #10225 from Ghommie/Ghommie-cit475 Putnam3145 2019-12-17 11:22:30 -08:00
  • e751d6bef3 Automatic changelog generation for PR #10072 [ci skip] CitadelStationBot 2019-12-17 06:02:31 -06:00
  • 95c0eddc2a Merge pull request #10072 from Useroth/new-tg-plants BlackMajor 2019-12-18 01:02:29 +13:00
  • 433cc6c05a makes trait blacklisting remove random positives instead of NULLING EVERY SINGLE FUCKING QUIRK Seris02 2019-12-17 19:59:01 +08:00
  • f2cf146255 Two slimepeople fixes. Ghommie 2019-12-17 12:49:04 +01:00
  • 3cb8391f38 Hopefully this won't screw up travis. Ghommie 2019-12-17 12:15:28 +01:00
  • 5245898c25 whoops BlackMajor 2019-12-17 23:46:15 +13:00
  • 03d2e9eb6d Compress secK9 BlackMajor 2019-12-17 23:32:51 +13:00
  • 774d853607 Adds gas miners to all maps. GrayRachnid 2019-12-17 01:39:25 -05:00
  • ef750e8ace contamination nerf Putnam 2019-12-16 18:54:59 -08:00
  • 3f06661de5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453 Ghommie 2019-12-17 03:34:11 +01:00
  • 6b7dcbceb0 Porting a few martial art code updates. Ghommie 2019-12-17 03:19:07 +01:00
  • 4011f9a1e1 Automatic changelog generation for PR #10181 [ci skip] CitadelStationBot 2019-12-16 19:08:30 -06:00
  • 6f70ba1477 Merge pull request #10181 from Ghommie/Ghommie-cit463 Lin 2019-12-17 01:08:27 +00:00
  • 274f35dd23 Automatic changelog generation for PR #10180 [ci skip] CitadelStationBot 2019-12-16 19:05:13 -06:00
  • 237fbaa02d Merge pull request #10180 from Ghommie/Ghommie-cit462 Lin 2019-12-17 01:05:10 +00:00
  • 5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." Ghommie 2019-12-17 01:57:56 +01:00
  • c036c2c835 Update drink_reagents.dm Trilbyspaceclone 2019-12-16 19:05:16 -05:00
  • 2b254653b6 typepath kevinz000 2019-12-16 16:27:00 -07:00
  • 1c3682cd15 Brings carbon action intent hotkeys down to living. Ghommie 2019-12-17 00:03:39 +01:00
  • 4fa744e78d radio short kevinz000 2019-12-16 15:42:37 -07:00
  • 2c228571f3 nerfs kevinz000 2019-12-16 15:39:22 -07:00
  • 80402a0d88 Ports some hud and update_icon code updates. Ghommie 2019-12-16 23:29:20 +01:00
  • fe1576583c Update code/modules/vending/cola.dm Trilbyspaceclone 2019-12-16 15:01:16 -05:00
  • 6365a430cc Merge pull request #10208 from Ghommie/Ghommie-cit469 Putnam3145 2019-12-16 10:57:26 -08:00
  • 1701811fb6 kay kevinz000 2019-12-16 11:35:04 -07:00
  • d9cd90c3c5 Update supply.dm kevinz000 2019-12-16 11:31:03 -07:00
  • 447f416ca6 Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471 Ghommie 2019-12-16 19:10:07 +01:00
  • 93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" Ghommie 2019-12-16 17:58:50 +01:00
  • aa14713fdd nerfs kevinz000 2019-12-16 08:12:49 -07:00
  • b3ad352a96 stuff kevinz000 2019-12-16 08:10:41 -07:00
  • 57163600ef Travis had a stroke. Ghommie 2019-12-16 16:01:50 +01:00
  • 9c5a66af67 Fixes AI being unable to talk through the holopad. Ghommie 2019-12-16 15:58:10 +01:00
  • 51a17dff94 Commit suggestions r4d6 2019-12-16 09:23:42 -05:00
  • c291511ab6 Commit suggestions r4d6 2019-12-16 09:23:35 -05:00
  • bfbb6231a5 Commit suggestions r4d6 2019-12-16 09:23:28 -05:00
  • 2d488bee52 Commit suggestions r4d6 2019-12-16 09:23:21 -05:00
  • 3e86e2207e Commit suggestions r4d6 2019-12-16 09:23:07 -05:00
  • 21b7fb0759 Commit suggestions r4d6 2019-12-16 09:22:58 -05:00
  • f738e370a4 Fixes pubby wall meds being var-edited snowflakes. Ghommie 2019-12-16 15:22:50 +01:00
  • 7142894ce7 Make the boop louder. r4d6 2019-12-16 09:02:01 -05:00
  • 2e4187b7c8 Add a boop sound effect r4d6 2019-12-16 08:56:51 -05:00
  • 728ca4fe99 Add a nose boop sound r4d6 2019-12-16 08:54:18 -05:00
  • 8209fe5159 Update encryptionkey.dm MrJWhit 2019-12-16 08:19:12 -05:00
  • f4a76781fa Removed robicist headset from the engineering channel MrJWhit 2019-12-16 08:18:35 -05:00
  • b0e8fb42cd AAAAA Ghommie 2019-12-16 14:00:14 +01:00
  • a4d6911324 Update code/modules/mob/living/carbon/carbon_defense.dm r4d6 2019-12-16 07:48:29 -05:00
  • 13aaebcd22 Update code/modules/mob/living/carbon/carbon_defense.dm r4d6 2019-12-16 07:48:22 -05:00
  • e8d43dac87 Port boops and handshakes r4d6 2019-12-16 06:27:18 -05:00
  • 5f59d7a9c5 Automatic changelog generation for PR #10115 [ci skip] CitadelStationBot 2019-12-16 05:24:00 -06:00
  • d1a37fd192 Merge pull request #10115 from Useroth/lavaland-tumors BlackMajor 2019-12-17 00:23:57 +13:00
  • 8151a1f3ff Merged master into this branch. Useroth 2019-12-16 12:06:30 +01:00
  • 05497bb392 Changes required to enable for maintenance protocols DeltaFire 2019-12-16 11:25:11 +01:00
  • a784235e35 scanline kevinz000 2019-12-16 02:05:52 -07:00
  • f11ab5eb61 hm kevinz000 2019-12-15 23:29:25 -07:00
  • 80ffb13f06 bypass joblock kevinz000 2019-12-15 23:24:43 -07:00
  • 78e9b82eb6 trying too hard kevinz000 2019-12-15 23:03:44 -07:00
  • 57748fcdc8 changes kevinz000 2019-12-15 22:28:41 -07:00
  • 4a68a5c33f fixes combo text Seris02 2019-12-16 12:59:19 +08:00
  • 932bdfd325 kay kevinz000 2019-12-15 21:57:22 -07:00
  • 9f71900052 oop kappa-sama 2019-12-15 23:29:01 -05:00
  • b6c9c73372 this cannot go wrong kappa-sama 2019-12-15 23:28:17 -05:00
  • 6e08366d40 Automatic changelog generation for PR #9736 [ci skip] CitadelStationBot 2019-12-15 21:20:41 -06:00
  • b54c8a6a2a Merge pull request #9736 from Citadel-Station-13/kevinz000-patch-113 Lin 2019-12-16 03:20:38 +00:00
  • b4bd2cbb5c Update preferences.dm kevinz000 2019-12-15 20:20:04 -07:00
  • 05460586e1 Automatic changelog generation for PR #9971 [ci skip] CitadelStationBot 2019-12-15 21:11:11 -06:00
  • ba7a3f5fd2 Merge pull request #9971 from Xantholne/xantholne-christmas01 kevinz000 2019-12-15 20:11:09 -07:00
  • 3b47949f82 haha fuck that's a lotta changes kevinz000 2019-12-15 19:59:15 -07:00
  • 843f4ed0da FLAK Ghommie 2019-12-16 02:44:58 +01:00
  • fb6b01a4ae testing, further improvements. Tired. Ghommie 2019-12-16 02:29:53 +01:00
  • 74cc1ec547 Merge pull request #10177 from BlackMajor/FIST BlackMajor 2019-12-16 14:14:35 +13:00
  • 491958475b fixed loginsandylogout 2019-12-15 18:48:50 -06:00
  • 6a5a098458 Fixing the blood bank generator. Ghommie 2019-12-16 01:43:21 +01:00
  • 5f27103641 god FUCK you icons kevinz000 2019-12-15 17:30:30 -07:00
  • 0190054c97 Update carbon.dm kevinz000 2019-12-15 17:08:41 -07:00
  • e08b5b814f Update lighting.dm kevinz000 2019-12-15 17:04:23 -07:00
  • e496b7c397 Update eyes.dm kevinz000 2019-12-15 17:02:43 -07:00
  • ce5c42f323 Update good.dm kevinz000 2019-12-15 17:02:00 -07:00
  • 745297632d Update lighting.dm kevinz000 2019-12-15 16:59:09 -07:00
  • ea84526661 Update good.dm kevinz000 2019-12-15 16:58:44 -07:00
  • 762cd00a5f Update eyes.dm kevinz000 2019-12-15 16:55:56 -07:00
  • ad88481f3e OwO whats this notices your Unknown 2019-12-15 16:45:34 -07:00
  • bdb6ef4dda Automatic changelog generation for PR #10198 [ci skip] CitadelStationBot 2019-12-15 17:42:16 -06:00
  • 363380405e Merge pull request #10198 from Ghommie/Ghommie-cit466 Putnam3145 2019-12-15 15:42:13 -08:00
  • f244ac84b2 whoops Putnam 2019-12-15 15:25:47 -08:00
  • 050551e569 Automatic changelog generation for PR #10195 [ci skip] CitadelStationBot 2019-12-15 17:25:02 -06:00
  • 56a349bcd0 Merge pull request #10195 from Ghommie/Ghommie-cit464 Putnam3145 2019-12-15 15:24:59 -08:00