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

Commit Graph

  • fe39ffe033 quick oneline thing DeltaFire 2020-06-06 17:07:50 +02:00
  • 994ab8ac16 fixes spacevines Timothy Teakettle 2020-06-06 16:00:26 +01:00
  • c77d92ce0e Merge remote-tracking branch 'upstream/master' DeltaFire 2020-06-06 16:52:53 +02:00
  • ed47b33241 Revert "Revert "Update ss13_genchangelog.py (#12453)" (#12454)" (#12457) kevinz000 2020-06-06 03:04:51 -07:00
  • dffaecbad1 Revert "Update ss13_genchangelog.py (#12453)" (#12454) kevinz000 2020-06-06 02:49:33 -07:00
  • 92213f62bb Update ss13_genchangelog.py (#12453) kevinz000 2020-06-06 02:27:16 -07:00
  • 8b406df1ec mk III TrilbySpaceClone 2020-06-05 22:43:49 -04:00
  • c6c3cd8c4c Merge pull request #44 from Citadel-Station-13/master EmeraldSundisk 2020-06-05 12:23:50 -07:00
  • 6ad72e6972 better limb healing Timothy Teakettle 2020-06-05 15:41:52 +01:00
  • 0e2fb9801e woops kevinz000 2020-06-05 00:59:18 -07:00
  • 7891c77ea9 text2num kevinz000 2020-06-05 00:41:48 -07:00
  • ee2a2ad017 fix kevinz000 2020-06-05 00:24:01 -07:00
  • a2d131646f sigh kevinz000 2020-06-05 00:01:02 -07:00
  • 26b541dc42 css sucks kevinz000 2020-06-04 23:41:40 -07:00
  • ee5b209932 eh kevinz000 2020-06-04 23:27:50 -07:00
  • 87dc0e0823 sigh kevinz000 2020-06-04 23:22:17 -07:00
  • 51a1eeb9de sigh kevinz000 2020-06-04 23:18:31 -07:00
  • 29302c51ed ok kevinz000 2020-06-04 22:58:42 -07:00
  • 92d1af5889 adjustments kevinz000 2020-06-04 22:18:19 -07:00
  • a35fce64e2 fixes kevinz000 2020-06-04 20:02:59 -07:00
  • bad809ffce fixes kevinz000 2020-06-04 19:56:06 -07:00
  • a2c4b741ad ahaha what if they didnt heal? Trilbyspaceclone 2020-06-04 21:46:38 -04:00
  • e062d963ed Automatic changelog compile [ci skip] Changelogs 2020-06-05 00:26:08 +00:00
  • e80ec920e0 Moved the tanks to industrial tech node. shellspeed1 2020-06-04 16:42:10 -07:00
  • 2002a273de Makes empty internal tanks printable shellspeed1 2020-06-04 16:04:16 -07:00
  • 0b0e9011a7 Prevent surgery tools and items from being rad contaminatable (#12413) Trilbyspaceclone 2020-06-04 18:56:15 -04:00
  • d687a04507 Fixing stationary and instrument-less song datum UIs not updating. (#12425) Ghom 2020-06-05 00:53:57 +02:00
  • fabfd684ce Silicon Flavortexts. (SCRUTINISE HEAVILY) (#12395) Yawet330 2020-06-04 23:53:39 +01:00
  • 6db076c42f Lowers the slowdown on snow tiles (#12404) Trilbyspaceclone 2020-06-04 18:52:30 -04:00
  • 1d990d317e Minimally invasive update to Omega Station. (#12434) EmeraldSundisk 2020-06-04 15:44:12 -07:00
  • 0dc57a5a96 Powers Reimagined : Void Volt (#12433) DeltaFire15 2020-06-05 00:41:01 +02:00
  • 3eb3934e26 Adds Pride Month as a holiday! (#12436) deathride58 2020-06-04 18:40:31 -04:00
  • 358c5405f0 Merge pull request #2 from Citadel-Station-13/master shellspeed1 2020-06-04 14:34:57 -07:00
  • 76da796b76 Merge pull request #12441 from DeltaFire15/addiction-and-switch-torture Ghom 2020-06-04 19:38:24 +02:00
  • 1a6bfeb0f1 Switch man bad DeltaFire 2020-06-04 18:32:41 +02:00
  • 5ea503bd0c Merge remote-tracking branch 'upstream/master' DeltaFire 2020-06-04 18:23:17 +02:00
  • ee2a2a30e4 easy fix Timothy Teakettle 2020-06-04 17:18:44 +01:00
  • 1406364889 fix emps Timothy Teakettle 2020-06-04 15:25:56 +01:00
  • b54cc8de3c fix indentation Timothy Teakettle 2020-06-04 15:09:14 +01:00
  • f2aa370506 make ipcs cool Timothy Teakettle 2020-06-04 14:59:52 +01:00
  • d67783bac6 Merge pull request #1 from Citadel-Station-13/master YakumoChen 2020-06-04 07:05:17 -04:00
  • d1a80ca2d7 Ghommie requested change Trilbyspaceclone 2020-06-03 20:29:17 -04:00
  • 5e37d3ef3b Merge pull request #12430 from Ghommie/Ghommie-cit811 Lin 2020-06-03 20:23:16 +00:00
  • 837d011695 Merge pull request #12426 from Ghommie/Ghommie-cit810 Lin 2020-06-03 20:21:22 +00:00
  • 1a9787a9c2 Merge remote-tracking branch 'citadel/master' into combat_rework kevinz000 2020-06-02 21:49:43 -07:00
  • 1d061d667c Merge pull request #2 from Citadel-Station-13/master Heretical Lizard 2020-06-03 00:34:05 -04:00
  • 937731d77d fix and tested TrilbySpaceClone 2020-06-02 21:32:36 -04:00
  • b62ef0f4e8 right... TrilbySpaceClone 2020-06-02 19:44:47 -04:00
  • 4fca24d387 Merge remote-tracking branch 'upstream/master' DeltaFire 2020-06-03 01:02:59 +02:00
  • c06ee7b3ed Merge pull request #43 from Citadel-Station-13/master EmeraldSundisk 2020-06-02 15:46:37 -07:00
  • d53dca7322 Fixing just a couple issues. (#12417) Ghom 2020-06-03 00:30:22 +02:00
  • f926dd7f5e Update pockets.dm (#12421) Trilbyspaceclone 2020-06-02 18:29:51 -04:00
  • 575609ca8a Fixing my fix for reclyclers. (#12422) Ghom 2020-06-03 00:29:32 +02:00
  • ab3799ae7a Ports cornrows hairstyles from yogstation (#12423) ynot01 2020-06-02 18:29:07 -04:00
  • d7954ca077 Yet another PR fixing some issues. (#12424) Ghom 2020-06-03 00:29:01 +02:00
  • 0d55a387d0 Powers Remembered: Chants (#12403) TheObserver-sys 2020-06-02 18:27:13 -04:00
  • 07e42c079c Fixing cards states and user-less projectiles checking mean armor values. (#12400) Ghom 2020-06-03 00:24:13 +02:00
  • ea763df326 Photosynthesis element. (#12394) Ghom 2020-06-03 00:23:09 +02:00
  • a41f40503d More lenient soft stamina combat, decentralized gun inaccuracy from combat mode. (#12347) Ghom 2020-06-03 00:22:06 +02:00
  • 0d7d2071ec Merge pull request #12232 from Trilbyspaceclone/patch-379 Ghom 2020-06-02 23:50:14 +02:00
  • 1c3bfa623f Merge pull request #12175 from Detective-Google/snaxi2 Ghom 2020-06-02 23:48:50 +02:00
  • 26f90b5fcf Merge pull request #12429 from coldud13/altclick_grinder+biogen Ghom 2020-06-02 23:39:22 +02:00
  • 6b70215b35 A tiny paperwork update for CogStation. (#12418) Ghom 2020-06-02 23:38:21 +02:00
  • 916a1ab349 Update objective_items.dm (#12420) Trilbyspaceclone 2020-06-02 17:37:05 -04:00
  • 1a9484cf2e Fixing missing clothing icons etc. Ghommie 2020-06-02 17:43:31 +02:00
  • 17d4c99b25 alt click to remove containers from reagent grinder and biogenerator coldud13 2020-06-02 19:10:41 +10:00
  • 9fda4052b4 Merge remote-tracking branch 'origin/master' coldud13 2020-06-02 18:46:45 +10:00
  • 8122c7b35d Update code/modules/mapping/minimaps.dm Letter N 2020-06-02 11:54:03 +08:00
  • 32e93f9dce The BEPIS reward disk icon state I forgot to add. Ghommie 2020-06-02 02:51:41 +02:00
  • dee7fc67eb Update lavaland_surface_sloth.dmm TrilbySpaceClone 2020-06-01 19:50:44 -04:00
  • d35ddde7b4 tooltips vs buttons Ghommie 2020-06-01 23:49:25 +02:00
  • 368c7e80cd Merge remote-tracking branch 'upstream/master' Timothy Teakettle 2020-06-01 21:13:21 +01:00
  • 597432424c Buffs lunging gloves a bit, so they arent a detriment to the user as much (#12336) Arturlang 2020-06-01 22:51:41 +03:00
  • effa47ec93 Update projectile.dm (#12380) kevinz000 2020-06-01 12:46:02 -07:00
  • 4fe9e788ac Makes it actually nicely work Artur 2020-06-01 20:42:58 +03:00
  • 8c5005d572 Vrsleeper works, linkage for art and bepis Artur 2020-06-01 19:15:19 +03:00
  • e8547f7248 Trying to fix the vr sleeper. Artur 2020-06-01 18:41:19 +03:00
  • 85a1d0f957 VrSleeper(WIP) and hypnochair Artur 2020-06-01 12:47:37 +03:00
  • 40e54650c7 Compile Artur 2020-06-01 10:26:48 +03:00
  • 2ac1ada029 Add files via upload EmeraldSundisk 2020-05-31 19:52:00 -07:00
  • fef5e0bc56 Merge pull request #12408 from Ghommie/Ghommie-cit804 Lin 2020-06-01 01:22:56 +00:00
  • e80cee9b4c Merge pull request #12406 from Citadel-Station-13/Ghommie-patch-1 Lin 2020-06-01 01:21:20 +00:00
  • 8e26876634 Makes Spears rational. (#12401) Yawet330 2020-06-01 00:44:31 +01:00
  • 1fc73700c5 Telecomms TGUI (#12145) Letter N 2020-06-01 06:22:40 +08:00
  • b98f2532d5 little thing DeltaFire 2020-05-31 20:25:21 +02:00
  • bb7a2c43a8 First of many changes DeltaFire 2020-05-31 20:23:57 +02:00
  • 0af32207a8 Cheese and crackers! It compiles. Ghommie 2020-05-31 18:39:58 +02:00
  • 348885a58d Merge pull request #12382 from Ghommie/Ghommie-cit797 Lin 2020-05-31 15:22:23 +00:00
  • 21ac039a34 Merge remote-tracking branch 'upstream/master' DeltaFire 2020-05-31 16:21:46 +02:00
  • 2f3fd48b84 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 Ghommie 2020-05-31 16:08:52 +02:00
  • b7411bf9a0 Fix The X-01 Multiphase energy gun box (#12409) Sonic121x 2020-05-31 19:50:31 +08:00
  • 151df41d1c asset cache + better minimaps Letter N 2020-05-31 16:15:09 +08:00
  • 48b327ea74 chemistry/bio bags nerf and little pill volumetric tweak. (#12392) Ghom 2020-05-31 09:54:28 +02:00
  • abc2b820a4 Update living_blocking_parrying.dm kevinz000 2020-05-30 23:49:04 -07:00
  • faf65ae2b5 Merge branch 'combat_rework' of github.com-kevinz000:kevinz000/Citadel-Station-13 into combat_rework kevinz000 2020-05-30 23:46:34 -07:00
  • 5b6e797c4f desword adjustments kevinz000 2020-05-30 23:43:05 -07:00
  • 250d078596 that was easy kevinz000 2020-05-30 23:14:02 -07:00
  • 34d8aa0ee9 refactor kevinz000 2020-05-30 23:13:16 -07:00
  • d832cb6526 fix kevinz000 2020-05-30 22:43:23 -07:00
  • 2232271ea5 fixes and render kevinz000 2020-05-30 22:29:41 -07:00