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

Commit Graph

  • 5364666d0c Merge pull request #12212 from Trilbyspaceclone/patch-376 kevinz000 2020-05-12 12:34:45 -07:00
  • e0f1b65785 Merge pull request #12209 from MrJWhit/moving-fire-alarm-in-boxstation-chemistry kevinz000 2020-05-12 12:28:41 -07:00
  • 6ddd0ffa77 Merge pull request #12207 from Ghommie/Ghommie-cit743 kevinz000 2020-05-12 12:28:24 -07:00
  • ff2158b20b Merge pull request #12206 from Ghommie/Ghommie-cit742 kevinz000 2020-05-12 12:28:08 -07:00
  • 395d434e6e Merge pull request #12200 from Ghommie/Ghommie-cit738 kevinz000 2020-05-12 12:28:02 -07:00
  • 40d2d35ffa Merge pull request #12205 from Ghommie/Ghommie-cit741 kevinz000 2020-05-12 12:27:45 -07:00
  • afbbde610a Merge pull request #12201 from Ghommie/Ghommie-cit740 kevinz000 2020-05-12 12:27:26 -07:00
  • cd46bce126 Merge pull request #11890 from Ghommie/Ghommie-cit685 kevinz000 2020-05-12 12:25:12 -07:00
  • 84af9d9d40 wtf Ghommie 2020-05-12 21:12:17 +02:00
  • 11f3d19edf brute force Trilbyspaceclone 2020-05-12 15:02:37 -04:00
  • 757706653d Map paths. Ghommie 2020-05-12 21:01:34 +02:00
  • c5c11a7937 i hope we use PENDAS Trilbyspaceclone 2020-05-12 14:53:06 -04:00
  • 1f773cf4fe fixes kevinz000 2020-05-12 11:52:45 -07:00
  • 72fbd8ec87 6 rather the 4 miss-keyed Trilbyspaceclone 2020-05-12 14:27:32 -04:00
  • 88394151d8 Update research.dm Trilbyspaceclone 2020-05-12 14:22:05 -04:00
  • 7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 Ghommie 2020-05-12 20:06:59 +02:00
  • 0b03958136 Makes The syndi outpust tanks work (#12228) Arturlang 2020-05-12 19:31:33 +03:00
  • 90d4f213bf Update preferences.dm (#12230) kevinz000 2020-05-12 08:39:37 -07:00
  • e074f58a39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit739 Ghommie 2020-05-12 17:28:37 +02:00
  • 8952eb3e96 WOOPS kevinz000 2020-05-12 07:45:00 -07:00
  • ea35e297c2 fixes kevinz000 2020-05-12 07:38:52 -07:00
  • c473280099 Update subsystems.dm kevinz000 2020-05-12 07:04:00 -07:00
  • bcf60089b0 Update projectiles.dm kevinz000 2020-05-12 07:03:06 -07:00
  • 2edfcada4c adds a medlathe Detective Google 2020-05-12 05:03:41 -05:00
  • 10cd4320a7 gaytway Detective Google 2020-05-12 04:40:18 -05:00
  • e9a432d438 Initial Commit: Hey Drake? Where's the cell for electroplating? The0bserver 2020-05-12 04:07:26 -04:00
  • ad1a03d679 chem unfuckery Detective Google 2020-05-12 02:04:12 -05:00
  • bc148ad39f Space diner location MrJWhit 2020-05-12 01:52:47 -04:00
  • 458c072cf6 Update extools for non-monster spacewind Putnam 2020-05-11 22:22:07 -07:00
  • e761ffc3a7 Merge pull request #38 from Citadel-Station-13/master EmeraldSundisk 2020-05-11 22:17:13 -07:00
  • b5eddc84af Update extools so overlays work Putnam 2020-05-11 22:04:19 -07:00
  • baaee906a2 fixin' a multiz segfault Putnam 2020-05-11 22:01:20 -07:00
  • 17826fe98b monstermos wow Putnam 2020-05-11 22:00:04 -07:00
  • 8f06ae3c56 Q-pads and disposals tune ups Detective Google 2020-05-11 22:53:32 -05:00
  • dc931490fd disposals needs a recycler Detective Google 2020-05-11 21:38:49 -05:00
  • 88f87a444d spare out of locker Detective Google 2020-05-11 21:09:29 -05:00
  • bcd30a9838 more requested fans Detective Google 2020-05-11 21:06:20 -05:00
  • 7cb79695c5 first round of testing fixes Detective Google 2020-05-11 21:04:46 -05:00
  • bfde367c4e Merge remote-tracking branch 'upstream/master' into snaxi2 Detective Google 2020-05-11 20:56:42 -05:00
  • c859cfee6b Bad merge, ouchies Putnam 2020-05-11 17:36:26 -07:00
  • 478400979d Added a fallback, just in case (may not work?) Putnam 2020-05-11 17:13:47 -07:00
  • f4f80594bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real Putnam 2020-05-11 17:10:55 -07:00
  • 121d594faa Fixes Putnam 2020-05-11 17:09:35 -07:00
  • e8d7da56f4 Ported C++mos from yogs (help me) Putnam 2020-05-11 15:44:26 -07:00
  • bd19763236 Update lighting.dm Ghom 2020-05-12 00:18:27 +02:00
  • 95330e4baf Update life.dm Trilbyspaceclone 2020-05-11 17:17:04 -04:00
  • c14197bd1b Update life.dm Trilbyspaceclone 2020-05-11 17:16:10 -04:00
  • 0df3483d6f Update life.dm Trilbyspaceclone 2020-05-11 17:15:29 -04:00
  • 8fa1a0ba58 Update life.dm Trilbyspaceclone 2020-05-11 15:48:01 -04:00
  • 720abbf1c5 Update life.dm Trilbyspaceclone 2020-05-11 15:21:49 -04:00
  • 1e5cce73d9 Update life.dm Trilbyspaceclone 2020-05-11 15:19:39 -04:00
  • dfae071015 Final adjustments. Ghommie 2020-05-11 19:05:58 +02:00
  • db87da599c Update firstaid.dm Trilbyspaceclone 2020-05-11 08:41:03 -04:00
  • 3c87647fd2 Update firstaid.dm Trilbyspaceclone 2020-05-11 08:32:36 -04:00
  • dbfa8ac1ea Merge branch 'master' into typing_indicators kevinz000 2020-05-11 05:00:23 -07:00
  • 78004a7b73 kek (#12208) kappa-sama 2020-05-11 07:57:42 -04:00
  • 0ed3b17d28 Merge pull request #12179 from Putnam3145/fix-atmos kevinz000 2020-05-11 04:19:50 -07:00
  • 657a4831b4 Merge pull request #12182 from kappa-sama/patch-25 kevinz000 2020-05-11 04:18:48 -07:00
  • f1ba2ae8e4 Merge pull request #12196 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-05-11 04:18:29 -07:00
  • 0646f16377 Merge pull request #12085 from Citadel-Station-13/Ghommie-patch-2 kevinz000 2020-05-11 04:15:07 -07:00
  • 992905846d Merge pull request #12160 from Linzolle/cold-mining kevinz000 2020-05-11 04:08:17 -07:00
  • 2d225540fa Merge pull request #12185 from Detective-Google/this-is-why-we-can't-have-nice-things kevinz000 2020-05-11 04:07:46 -07:00
  • 8cbe44f20c Merge pull request #12192 from Ghommie/Ghommie-cit737 kevinz000 2020-05-11 04:07:16 -07:00
  • 4bac8befd2 atmos TEG needs a sparker Detective Google 2020-05-11 00:28:30 -05:00
  • b5a18ccba5 should be good??? MrJWhit 2020-05-11 00:09:25 -04:00
  • 5a6b48cdfb Merge pull request #12191 from Ghommie/Ghommie-cit736 Lin 2020-05-11 03:40:39 +00:00
  • d9cd4f37f2 Merge pull request #12157 from Ghommie/Ghommie-cit731 Lin 2020-05-11 03:34:04 +00:00
  • f292d4047c Adds OOC notes (#12067) kevinz000 2020-05-10 16:35:48 -07:00
  • b019915d10 Removes alien crate adds ape crate (#12178) Trilbyspaceclone 2020-05-10 19:10:45 -04:00
  • 65ae939837 Update empulse.dm (#12183) kevinz000 2020-05-10 16:10:13 -07:00
  • 71b725b511 Fixed several item action buttons not using their own states Ghommie 2020-05-11 01:07:34 +02:00
  • 615db74a46 THIS TIME FOR REAL! Ghom 2020-05-11 00:51:49 +02:00
  • 7109851089 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit742 Ghommie 2020-05-11 00:46:51 +02:00
  • a3e60364af Update craft.dm Ghom 2020-05-11 00:35:28 +02:00
  • e8a0ea5acc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit731 Ghommie 2020-05-11 00:34:22 +02:00
  • b229386efa Porting tg's icon for that plant-speak language. Ghommie 2020-05-11 00:23:36 +02:00
  • 5aea034d88 k kevinz000 2020-05-10 15:12:13 -07:00
  • 452b360450 ok kevinz000 2020-05-10 15:05:46 -07:00
  • 2b598c692c ok kevinz000 2020-05-10 15:01:30 -07:00
  • 9b68a036af Update ice_demon.dm Ghom 2020-05-10 23:53:37 +02:00
  • 7cfbdf3a1d Update human.dm (#12203) kevinz000 2020-05-10 14:51:49 -07:00
  • 46ba884965 A few runtimes, fixed. Ghommie 2020-05-10 23:47:30 +02:00
  • 1a0808170d sliightly better kevinz000 2020-05-10 14:30:09 -07:00
  • 1cf2311930 Merge pull request #12164 from Ghommie/Ghommie-cit733 kevinz000 2020-05-10 14:16:42 -07:00
  • 6b9fc7eccf Merge pull request #12169 from Ghommie/Ghommie-cit734 kevinz000 2020-05-10 14:14:19 -07:00
  • 5ed6a18ef7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit740 Ghommie 2020-05-10 22:36:04 +02:00
  • e0b91c53af Purging unused dogborg items. Ghommie 2020-05-10 22:17:05 +02:00
  • 667c12d413 nutrition adjustment wrapper procs. Ghommie 2020-05-10 21:41:50 +02:00
  • e1d113b970 Config for antag forcing (#12171) Putnam3145 2020-05-10 12:35:20 -07:00
  • c2e689aec0 i'm salty (#12181) kevinz000 2020-05-10 12:33:56 -07:00
  • dd7db603d2 Merge pull request #12159 from Ghommie/Ghommie-cit732 Lin 2020-05-10 18:25:16 +00:00
  • 13643e6dc8 Some precise adjustments. Ghommie 2020-05-10 19:07:18 +02:00
  • 7779258b50 Tests, bug fixes and improvements. Ghommie 2020-05-10 18:54:05 +02:00
  • 05cede4e4d fixes xenomorphs not being in combat mode (#12193) kevinz000 2020-05-10 08:38:07 -07:00
  • 40eeb1d9b8 A little airlock electronics tgui Fix, courtesy of YakumoChen Ghommie 2020-05-10 14:38:50 +02:00
  • 84f95d032d Update preferences_savefile.dm Ghom 2020-05-10 14:14:32 +02:00
  • e7fedd7d12 Merge pull request #12148 from Trilbyspaceclone/patch-369 Lin 2020-05-10 05:36:38 +00:00
  • 2b429a93d2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit737 Ghommie 2020-05-10 06:30:41 +02:00
  • 015660c806 Trilby's grammar is a F- Ghommie 2020-05-10 06:21:29 +02:00
  • c4c4285b00 Reorganizing techweb nodes in a subfolder. Ghommie 2020-05-10 06:20:04 +02:00