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

Commit Graph

  • 52ea6ce262 Crushing presser TrilbySpaceClone 2020-01-04 03:13:21 -05:00
  • 5142a0e4ae that should probably be there Hatterhat 2020-01-04 02:07:19 -06:00
  • 7c98656939 upstream merge Hatterhat 2020-01-04 01:48:50 -06:00
  • 2e406d418b conflict THIS Hatterhat 2020-01-04 01:37:58 -06:00
  • 576db0ed41 i swear to god this conflict shouldn't even happen Hatterhat 2020-01-04 01:37:18 -06:00
  • 0567dcd6df Update godhand.dm kevinz000 2020-01-03 23:34:37 -08:00
  • a4fa24ac15 Update touch_attacks.dm kevinz000 2020-01-03 23:33:39 -08:00
  • 186194418e tg 43454+43688 port, tweaks w/ trilby, db crate Hatterhat 2020-01-01 08:30:02 -06:00
  • 94fb114611 Update hardsuit.dm Trilbyspaceclone 2020-01-04 02:11:23 -05:00
  • b1b1d7171e hard crit actually Putnam 2020-01-03 23:07:34 -08:00
  • e54ec9ec09 shh Putnam 2020-01-03 23:03:45 -08:00
  • e65583c403 set_AFTFT verb, tweaking shit Hatterhat 2020-01-04 00:44:01 -06:00
  • 52ab46255d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 r4d6 2020-01-03 21:04:42 -05:00
  • a0768120c1 Fix conflict r4d6 2020-01-03 21:04:16 -05:00
  • 8b760f5f3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit r4d6 2020-01-03 21:01:31 -05:00
  • 68613df482 Merge pull request #10424 from Linzolle/flashbang-runtime Putnam3145 2020-01-03 17:39:18 -08:00
  • d0263fc669 don't act on non mobs Linzolle 2020-01-03 18:21:08 -06:00
  • 62ea644dd0 ugh, make rcds that are able to remove r-wall be able to remvoe r-doors too. r4d6 2020-01-03 16:26:53 -05:00
  • f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 Ghommie 2020-01-03 18:24:39 +01:00
  • 1cc30833b2 Automatic changelog generation for PR #10403 [ci skip] CitadelStationBot 2020-01-03 10:16:20 -06:00
  • d1d9b7a179 Merge pull request #10403 from r4d6/patch-1 kevinz000 2020-01-03 08:16:17 -08:00
  • 44b96f01ea Make radiation collectors move faster MrJWhit 2020-01-03 06:04:10 -05:00
  • 04649efc62 Update stack.dm kevinz000 2020-01-03 02:46:57 -08:00
  • 519d379cdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock Seris02 2020-01-03 17:42:53 +08:00
  • a4d2ea0281 Small fix BlackMajor 2020-01-03 22:39:58 +13:00
  • 221cb980d6 forgot a / r4d6 2020-01-03 03:25:53 -05:00
  • 880db10033 Forgot some more mats r4d6 2020-01-03 03:22:18 -05:00
  • aedf634355 Fix mats. r4d6 2020-01-03 03:15:30 -05:00
  • 94cd2ea108 Merge branch 'RCD-Updates' of https://github.com/r4d6/Citadel-Station-13 into RCD-Updates r4d6 2020-01-03 03:13:21 -05:00
  • 3f5d4ad835 remove a duplicate comment r4d6 2020-01-03 03:13:03 -05:00
  • 7347cb0ba6 Merge branch 'master' into RCD-Updates r4d6 2020-01-03 03:09:11 -05:00
  • 38c4060bfc compile kevinz000 2020-01-03 00:04:58 -08:00
  • aac1b42b8f nightshift improvements kevinz000 2020-01-03 00:01:48 -08:00
  • 8e1affa1f5 nightshift changes kevinz000 2020-01-02 23:56:40 -08:00
  • 58a986696f Add RCD and RPD to Engie's protolathe r4d6 2020-01-03 02:46:25 -05:00
  • 5c94e02eac Add simple RCD Circuits r4d6 2020-01-03 02:32:43 -05:00
  • 031f485e4d updates kevinz000 2020-01-02 23:24:47 -08:00
  • 15d79d8818 RCD don't work on R-Doors r4d6 2020-01-03 02:14:41 -05:00
  • 37d50e2aaf Add RCD effects r4d6 2020-01-03 02:13:20 -05:00
  • 82db38d5d6 Automatic changelog generation for PR #10255 [ci skip] CitadelStationBot 2020-01-03 01:07:23 -06:00
  • c0d3b08ab0 Merge pull request #10255 from Xantholne/xantholne-christmas02 kevinz000 2020-01-02 23:07:20 -08:00
  • 5e3abec704 Removing turf with RCD cost mats. r4d6 2020-01-03 02:06:47 -05:00
  • adf87c7595 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole Putnam 2020-01-02 22:52:24 -08:00
  • 0c70fc9234 The Great Citadel De-Pissening of 2020 CameronWoof 2020-01-02 21:24:03 -08:00
  • 5c065ba3f4 Merge pull request #1 from nik707/nik707-patch-1 nik707 2020-01-02 23:11:54 -06:00
  • 8054b08dc3 reduces light power of soapstone engravings nik707 2020-01-02 23:11:40 -06:00
  • f4b35e635b Automatic changelog generation for PR #10189 [ci skip] CitadelStationBot 2020-01-02 22:01:22 -06:00
  • 0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers nik707 2020-01-02 22:01:19 -06:00
  • 46041edab8 stuff more collectors in the 1x3 SM. r4d6 2020-01-02 22:31:20 -05:00
  • 304ac7b20b fixes TrilbySpaceClone 2020-01-02 21:06:31 -05:00
  • 2931cb6757 Merge branch 'master' into glassware Trilbyspaceclone 2020-01-02 20:30:20 -05:00
  • 312d569039 Automatic changelog generation for PR #10238 [ci skip] CitadelStationBot 2020-01-02 18:01:56 -06:00
  • f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478 Lin 2020-01-03 00:01:54 +00:00
  • b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473 Lin 2020-01-03 00:00:51 +00:00
  • 3a20d16b2e Automatic changelog generation for PR #10270 [ci skip] CitadelStationBot 2020-01-02 17:56:46 -06:00
  • 4b7e6ec2a5 Merge pull request #10270 from Ghommie/Ghommie-cit489 Lin 2020-01-02 23:56:43 +00:00
  • 2f1e44a3a5 Automatic changelog generation for PR #10388 [ci skip] CitadelStationBot 2020-01-02 17:54:17 -06:00
  • 5d667a3540 Merge pull request #10388 from CameronWoof/ez-valids Lin 2020-01-02 23:54:14 +00:00
  • 7e7a11a5c8 lizard tails for humans and anthromorphs CameronWoof 2020-01-02 13:07:05 -08:00
  • b793bceffc A kevinz000 2020-01-02 10:51:06 -08:00
  • a102bb18a0 Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit kevinz000 2020-01-02 09:39:48 -08:00
  • b580d1dc32 Merge pull request #10390 from deathride58/orangespleasestopforcepushing kevinz000 2020-01-02 08:56:49 -08:00
  • 4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 Ghommie 2020-01-02 17:49:01 +01:00
  • a6a110bca3 nopenopenope Seris02 2020-01-02 19:29:11 +08:00
  • 0b02439b08 Puts an end to the Christmas Menace Unknown 2020-01-02 03:53:04 -07:00
  • dd68be6d31 IM NOT TRYING TO EDIT CARBON.DM GITHUB, PLEASE. BlackMajor 2020-01-02 22:20:54 +13:00
  • 8e5b7c1cba Get outta here BlackMajor 2020-01-02 22:17:56 +13:00
  • 08d042901c thank you github BlackMajor 2020-01-02 22:16:47 +13:00
  • da3ab71222 Revert "Revert "Revert "Revert "Merge branch 'master' into Yeehaw"""" BlackMajor 2020-01-02 22:16:09 +13:00
  • 74a646490f Revert "Revert "Revert "Merge branch 'master' into Yeehaw""" BlackMajor 2020-01-02 22:15:40 +13:00
  • 189e1af175 Revert "Revert "Merge branch 'master' into Yeehaw"" BlackMajor 2020-01-02 22:15:36 +13:00
  • 1b25996e55 Revert "Merge branch 'master' into Yeehaw" BlackMajor 2020-01-02 22:15:31 +13:00
  • 490fb3ab61 Merge branch 'master' into Yeehaw BlackMajor 2020-01-02 22:13:52 +13:00
  • 34f76aa042 Merge remote-tracking branch 'upstream/master' BlackMajor 2020-01-02 22:13:01 +13:00
  • aabb39a364 Revert "Merge branch 'master' into Yeehaw" BlackMajor 2020-01-02 22:06:31 +13:00
  • 30e3edaac1 Merge branch 'master' into Yeehaw BlackMajor 2020-01-02 22:03:58 +13:00
  • 3239acf74d Sync BlackMajor 2020-01-02 22:02:55 +13:00
  • 62c8fce043 Fix conflict BlackMajor 2020-01-02 21:56:17 +13:00
  • 6e5d04ff1f Adding a way to make opaque plastic flaps r4d6 2020-01-02 02:52:48 -05:00
  • 12680566b7 fixed voting. Putnam 2020-01-01 23:37:14 -08:00
  • 25c92b0fd7 fix number. r4d6 2020-01-02 02:13:10 -05:00
  • 91a8a434f5 Fix a bug and allow for the three crystals to be hit. r4d6 2020-01-02 01:58:34 -05:00
  • 0fad4aff75 change a x of place to make more sense. r4d6 2020-01-02 01:34:17 -05:00
  • 4010d72b7a Add 3 SM Variations r4d6 2020-01-02 01:31:21 -05:00
  • 46feaf9663 Update watercloset.dm chefferz 2020-01-02 01:09:29 -05:00
  • ab15fdcabf Automatic changelog generation for PR #10371 [ci skip] CitadelStationBot 2020-01-02 00:08:23 -06:00
  • 67d9923ff7 Merge pull request #10371 from kappa-sama/patch-15 kevinz000 2020-01-01 22:08:20 -08:00
  • 49084e8394 Automatic changelog generation for PR #10366 [ci skip] CitadelStationBot 2020-01-02 00:07:42 -06:00
  • 16172f68aa Merge pull request #10366 from Hatterhat/beaker-buff kevinz000 2020-01-01 22:07:40 -08:00
  • 96a57d74db Automatic changelog generation for PR #10374 [ci skip] CitadelStationBot 2020-01-02 00:07:20 -06:00
  • e771ea9066 Merge pull request #10374 from Trilbyspaceclone/patch-260 kevinz000 2020-01-01 22:07:18 -08:00
  • b5b00102a0 Update shuttle.dm kevinz000 2020-01-01 22:04:34 -08:00
  • 74c308c16c runtime fix Linzolle 2020-01-01 22:23:16 -06:00
  • 21fc6d1d2b saving is back Putnam 2020-01-01 19:24:13 -08:00
  • a881231149 Merge pull request #10395 from Hatterhat/shit-and-cum nik707 2020-01-01 20:45:33 -06:00
  • 5b99524e82 Revert "Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe" Hatterhat 2020-01-01 20:44:48 -06:00
  • 1195762f86 space cola isnt a reagent idiot Hatterhat 2020-01-01 20:37:09 -06:00
  • 0ad15d4cb5 Automatic changelog generation for PR #10368 [ci skip] CitadelStationBot 2020-01-01 20:32:51 -06:00
  • 1e6a485976 Merge pull request #10368 from Hatterhat/orm-laser-fix-question-mark nik707 2020-01-01 20:32:48 -06:00
  • 459275fd2e Automatic changelog generation for PR #10379 [ci skip] CitadelStationBot 2020-01-01 20:32:19 -06:00