Commit Graph

  • 615dc71069 fixes kevinz000 2020-04-30 01:26:46 -07:00
  • bd7b1b1193 fixes kevinz000 2020-04-30 01:23:21 -07:00
  • e6e2277634 Update damage_procs.dm kevinz000 2020-04-30 01:07:40 -07:00
  • 9d753fe74f Update damage_procs.dm kevinz000 2020-04-30 01:07:10 -07:00
  • f028672e3c Merge remote-tracking branch 'citadel/master' into 91-files-changed-fml kevinz000 2020-04-30 01:00:08 -07:00
  • 432724a388 fixes kevinz000 2020-04-30 00:58:59 -07:00
  • 72cbb77ecc fixes kevinz000 2020-04-30 00:48:37 -07:00
  • a90a246076 Merge pull request #12024 from NopemanMcHalt/digi-justice_trek kevinz000 2020-04-29 12:03:43 -07:00
  • 1e42f3a3b7 Merge pull request #12023 from Ghommie/Ghommie-cit712 kevinz000 2020-04-29 12:03:29 -07:00
  • d176125c46 Merge pull request #11972 from Trilbyspaceclone/medical-witchcraft kevinz000 2020-04-29 12:02:51 -07:00
  • 830e1b46c8 Merge pull request #12028 from Putnam3145/fix-story-storyteller kevinz000 2020-04-29 12:02:21 -07:00
  • f9f573576e Merge pull request #12038 from Trilbyspaceclone/patch-359 kevinz000 2020-04-29 12:02:00 -07:00
  • 3d116f5e7e Merge pull request #12000 from zeroisthebiggay/comprehensivefucksecuritypr kevinz000 2020-04-29 12:01:33 -07:00
  • 619609f5ff Merge pull request #12020 from bunny232/master kevinz000 2020-04-29 12:01:11 -07:00
  • 18a8f9c607 Merge pull request #12043 from Owai-Seek/sprite-tweaks-4-27-20 kevinz000 2020-04-29 12:00:38 -07:00
  • 57ab38185f Merge pull request #12014 from Trilbyspaceclone/patch-358 kevinz000 2020-04-29 12:00:03 -07:00
  • 1d12aa5779 Merge pull request #12006 from Trilbyspaceclone/kiloton-of-errors kevinz000 2020-04-29 11:59:26 -07:00
  • 7831b53932 Links up the rad shutters MrJWhit 2020-04-29 14:03:17 -04:00
  • c1f045c98a Merge remote-tracking branch 'upstream/master' into digi-justice_trek Anonymous 2020-04-29 13:54:50 +03:00
  • 2ec9068cbf Hellish Artur 2020-04-29 09:55:11 +03:00
  • 7d17da1bac stuff kevinz000 2020-04-28 23:51:49 -07:00
  • b63cccc38d Merge pull request #12053 from Putnam3145/fix_appendix deathride58 2020-04-29 01:27:06 -04:00
  • 2c6ef2f5d1 fix appendices instakilling everyone Putnam 2020-04-28 22:14:32 -07:00
  • 95c7252d3f fixes cheetowalkers by making ashwalkers always spawn with a digitigrade leg type of "digitigrade" deathride58 2020-04-29 00:01:26 -04:00
  • 19f89ed1ba Merge pull request #12022 from Ghommie/Ghommie-cit711 Lin 2020-04-29 01:15:02 +00:00
  • 64a5831a28 Merge pull request #12044 from Citadel-Station-13/kevinz000-patch-2 Lin 2020-04-29 01:07:55 +00:00
  • df7385faf2 Automatic changelog compile [ci skip] Changelogs 2020-04-29 00:24:00 +00:00
  • bb4bcd4571 Automatic changelog compile [ci skip] Changelogs 2020-04-29 00:04:18 +00:00
  • 22d6ac78e1 i actually despise coding ZeroMan 2020-04-28 12:26:33 -04:00
  • c5107f8fe0 i actually despise coding ZeroMan 2020-04-28 12:25:48 -04:00
  • 041d7ce4bc i have committed warcrimes ZeroMan 2020-04-28 02:56:38 -04:00
  • 18eb42315e i missed a src ZeroMan 2020-04-28 02:55:25 -04:00
  • 40f7472410 i actually despise coding ZeroMan 2020-04-28 02:47:28 -04:00
  • 8dc130175d i actually despise coding ZeroMan 2020-04-28 02:46:46 -04:00
  • 50a6128a83 Merge pull request #12032 from Citadel-Station-13/kevinz000-patch-4 Lin 2020-04-27 16:24:49 +00:00
  • 68bad2ee3f Merge pull request #12033 from Citadel-Station-13/kevinz000-patch-6 Lin 2020-04-27 16:24:29 +00:00
  • 1191268430 kevs request TrilbySpaceClone 2020-04-27 07:34:23 -04:00
  • 5d6da47db7 Merge branch 'master' into medical-witchcraft TrilbySpaceClone 2020-04-27 07:25:18 -04:00
  • 39e460d795 Kevs request TrilbySpaceClone 2020-04-27 07:16:00 -04:00
  • cfd9c3fe63 Fucking clockcult Artur 2020-04-27 13:36:53 +03:00
  • 4e8a8dbebd Update items.dm kevinz000 2020-04-27 02:55:11 -07:00
  • 6d7a41594c Sprite Updates / Dupe Cleanup Winter Flare 2020-04-27 05:47:21 -04:00
  • 5d53ead547 Fucky wucky gateway and ccslab Artur 2020-04-27 10:43:08 +03:00
  • c610ee86c1 Merge pull request #11986 from Owai-Seek/sprite-tweaks-4-22-20 Lin 2020-04-27 04:17:08 +00:00
  • e33087cbf2 corrects vending tackler gloves Trilbyspaceclone 2020-04-26 22:06:35 -04:00
  • 28da033111 fine kevinz000 2020-04-26 17:37:27 -07:00
  • 51c6387224 now Putnam 2020-04-26 13:44:04 -07:00
  • 9470426d13 Merge branch 'master' into digi-justice_trek Anonymous 2020-04-26 16:30:50 +03:00
  • 858c697acc Merge pull request #11977 from kevinz000/xenomorph_balancing_pass Ghom 2020-04-26 14:03:15 +02:00
  • b1befc2ba4 Merge pull request #11989 from Citadel-Station-13/kevinz000-patch-2 Ghom 2020-04-26 13:50:46 +02:00
  • 0cb32c901e Merge pull request #12013 from kappa-sama/patch-23 Ghom 2020-04-26 13:45:28 +02:00
  • f70490c61d fixes kevinz000 2020-04-26 04:40:18 -07:00
  • 2f7b02a663 Merge pull request #12029 from Putnam3145/fix-nukies Ghom 2020-04-26 13:22:50 +02:00
  • 2e35a42f43 wow lotsa effort huh kevinz000 2020-04-26 04:10:38 -07:00
  • ff9f18bdbd wow lotsa effort huh kevinz000 2020-04-26 03:38:41 -07:00
  • bf7962d8f9 wow lotsa effort huh kevinz000 2020-04-26 03:36:09 -07:00
  • 1b5e4b32cb wow lotsa effort huh kevinz000 2020-04-26 03:33:26 -07:00
  • aeaf6ea102 wow lotsa effort huh kevinz000 2020-04-26 03:33:08 -07:00
  • e3b987879e wow lotsa effort huh kevinz000 2020-04-26 03:30:18 -07:00
  • a9d0ce45b9 wow lotsa effort huh kevinz000 2020-04-26 03:29:43 -07:00
  • af3651172c wow lotsa effort huh kevinz000 2020-04-26 03:29:31 -07:00
  • 00c2ddce8f Actually this is better Putnam 2020-04-25 23:18:37 -07:00
  • 3da4701dff Switch roundstart thing to initial. Putnam 2020-04-25 23:06:15 -07:00
  • 464fcd02cd Merge remote-tracking branch 'citadel/master' into skills kevinz000 2020-04-25 22:18:08 -07:00
  • 0e8c2ca109 Update projectile.dm kevinz000 2020-04-25 21:04:22 -07:00
  • 5c20bde9f0 Update shields.dm kevinz000 2020-04-25 20:58:22 -07:00
  • e54ba579d0 Update silicon_defense.dm kevinz000 2020-04-25 20:52:27 -07:00
  • 1740531432 it just complies TrilbySpaceClone 2020-04-25 23:23:42 -04:00
  • 257de9d4c9 Adds uplinks back to nukies. Putnam 2020-04-25 19:22:55 -07:00
  • dc0136d389 Merge pull request #36 from Citadel-Station-13/master EmeraldSundisk 2020-04-25 19:01:53 -07:00
  • 8fc661ba14 Update pins.dm kevinz000 2020-04-25 17:34:00 -07:00
  • 3c52e321e2 Merge pull request #12027 from Citadel-Station-13/kevinz000-patch-4 Lin 2020-04-26 00:24:09 +00:00
  • d7c0834794 A couple important comments. Putnam 2020-04-25 17:22:12 -07:00
  • 5e750bd43d Update pins.dm kevinz000 2020-04-25 17:21:33 -07:00
  • 77a378b131 wow that's the wrong thing to do Putnam 2020-04-25 17:16:31 -07:00
  • b9e88f85bb Allowed better admeme stuff for dynamic Putnam 2020-04-25 17:15:17 -07:00
  • 565bfdb7b0 Merge pull request #11959 from Trilbyspaceclone/patch-351 kevinz000 2020-04-25 17:10:33 -07:00
  • af08e0fecf Merge pull request #11984 from Hatterhat/fastpump kevinz000 2020-04-25 17:07:29 -07:00
  • 24bac60a95 Merge pull request #12012 from Ghommie/Ghommie-cit710 kevinz000 2020-04-25 17:05:49 -07:00
  • d7f38faab9 Merge pull request #11971 from Putnam3145/fix-story-storyteller kevinz000 2020-04-25 17:05:38 -07:00
  • 6ff9d54e4f Merge pull request #11947 from MrJWhit/vg-atmos-box kevinz000 2020-04-25 17:01:34 -07:00
  • f6a5f92ff3 Merge pull request #11918 from Ghommie/Ghommie-cit689 kevinz000 2020-04-25 16:59:38 -07:00
  • d9b6ea5181 Merge pull request #11847 from Ghommie/Ghommie-cit679 kevinz000 2020-04-25 16:59:07 -07:00
  • 0dc259a985 Merge pull request #11990 from Trilbyspaceclone/patch-357 kevinz000 2020-04-25 16:54:47 -07:00
  • 36512938a0 Merge pull request #11991 from DeltaFire15/nanite-repli-protocols kevinz000 2020-04-25 16:54:32 -07:00
  • a533906f73 Merge pull request #11992 from Ghommie/Ghommie-cit703 kevinz000 2020-04-25 16:54:14 -07:00
  • da61b04ed0 Merge pull request #11997 from Ghommie/Ghommie-cit705 kevinz000 2020-04-25 16:53:48 -07:00
  • d041df458c Merge pull request #11998 from Ghommie/Ghommie-cit706 kevinz000 2020-04-25 16:53:39 -07:00
  • 7d688126c8 Merge pull request #12008 from Ghommie/Ghommie-cit707 kevinz000 2020-04-25 16:51:52 -07:00
  • fb1c4c215f Merge pull request #12009 from Ghommie/Ghommie-cit708 kevinz000 2020-04-25 16:51:36 -07:00
  • 0bf1f1e34f Merge pull request #12010 from Ghommie/Ghommie-cit709 kevinz000 2020-04-25 16:51:27 -07:00
  • 4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700 kevinz000 2020-04-25 16:51:14 -07:00
  • 82fe5f0455 Allow rigged dynamic roundstarts (whoops) Putnam 2020-04-25 16:28:58 -07:00
  • 655497be89 why didnt these save? TrilbySpaceClone 2020-04-25 18:17:38 -04:00
  • 5637ba3b53 more decal delettion TrilbySpaceClone 2020-04-25 18:12:09 -04:00
  • 4d596ddff6 Merge pull request #12007 from Citadel-Station-13/Ghommie-patch-1 Lin 2020-04-25 18:37:35 +00:00
  • 499e71c528 Merge pull request #11993 from Ghommie/Ghommie-cit704 Lin 2020-04-25 18:30:26 +00:00
  • 88aecffc55 Fixes missing digi for ENT command uniform Anonymous 2020-04-25 19:34:45 +03:00
  • 94f014589d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 Ghommie 2020-04-25 17:09:34 +02:00
  • d2d5fda0e2 Fixing riding layers for human/cyborgs. Ghommie 2020-04-25 16:54:17 +02:00