Commit Graph
1258 Commits
Author SHA1 Message Date
Fermi 40d6dc1812 Oops. 2019-08-04 14:54:40 +01:00
Fermi 1f73e6eb1d Notice me!! 2019-08-01 03:48:35 +01:00
Fermi 3f75a42ff2 Guess who staged before compiling? 2019-08-01 03:46:30 +01:00
Fermi 88e6fa4703 Yamero! 2019-08-01 03:42:57 +01:00
Fermi 18b03f9053 Furranium fixes. 2019-08-01 03:38:06 +01:00
Fermi a9330b784a Reward those who try. 2019-07-30 23:16:05 +01:00
Fermi fbbc4d8589 Merge branch 'pr/21' 2019-07-29 22:57:40 +01:00
kevinz000andGitHub 26c195dec8 Merge pull request #8971 from Linzolle/toxiclover
makes slimepeople like toxic food
2019-07-29 04:39:12 -07:00
kevinz000andGitHub 11628431b4 Merge pull request #8976 from Ghommie/Ghommie-cit157
Fixes combatmode disarm pushing people on inaccessible tables and more.
2019-07-29 04:38:14 -07:00
Fermi 5e5f2fea54 Heck 2019-07-29 00:05:26 +01:00
Fermi d472177a4c A casual cough. 2019-07-28 23:59:33 +01:00
Fermi 4c01b7ad57 Maybe Oxy so people don't kill themselves. 2019-07-28 23:56:30 +01:00
Fermi b6e2122d8d Fixes, but good. 2019-07-28 23:55:25 +01:00
Fermi d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
Fermi 31709938c6 Pushing a buncha stuff so I can fix things. 2019-07-28 23:23:45 +01:00
Ghommie 1adaf01839 Fixes combatmode disarm pushing people on inaccessible tables and more. 2019-07-26 22:55:46 +02:00
Linzolle 99720f12e5 makes slimepeople like toxic food 2019-07-25 20:55:18 -05:00
kevinz000andGitHub 692f2322c0 Merge pull request #8928 from Ghommie/Ghommie-cit121
Reverts a commit that reverted a fix.
2019-07-25 17:43:14 -07:00
kevinz000andGitHub 29c0a56fb9 Merge pull request #8929 from Ghommie/Ghommie-cit152
Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites.
2019-07-25 17:41:42 -07:00
kevinz000andGitHub b6f2c67177 Merge pull request #8949 from Trilbyspaceclone/patch-194
Removes armor from all star treck outfits/suits
2019-07-25 17:40:08 -07:00
Thalpy 123c9199ba Added Eigenlockers. I love them. 2019-07-25 20:51:09 +01:00
kevinz000andGitHub ff08743f65 Merge pull request #8934 from Trilbyspaceclone/loadout
Removes a Rando plushies from loadout and adds in a few more items
2019-07-23 20:33:09 -07:00
kevinz000andGitHub 61e94bd7db Merge pull request #8940 from Citadel-Station-13/borgplush
Borg Plush - Donator
2019-07-23 20:30:16 -07:00
TrilbyspacecloneandGitHub 6db3502294 Update trek_under.dm 2019-07-23 01:09:58 -04:00
kevinz000andGitHub 1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143
Fixes named arg Knockdown calls.
2019-07-22 20:17:30 -07:00
Jay ad036ac36d adds for donator 2019-07-21 12:37:43 -05:00
TrilbySpaceClone f315696937 fix n stuff 2019-07-20 22:19:03 -04:00
ThalpyandGitHub 15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
kevinz000andGitHub 08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
kevinz000andGitHub fc7a305c46 Merge pull request #8906 from Ghommie/Ghommie-cit141
Sweaters now cover the groins too.
2019-07-20 11:49:58 -07:00
Ghommie 7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
Ghommie 7e99dd205a Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites. 2019-07-19 21:54:48 +02:00
Fermi d73fabffff . 2019-07-19 05:18:56 +01:00
Fermi fbf542134a Cidadel makes me want to hurt myself. 2019-07-19 05:18:35 +01:00
Fermi a5fcb918aa Astrogen tweaks and cat fixes. 2019-07-19 04:11:26 +01:00
deathride58andGitHub 7b39c0935c Merge pull request #8415 from Citadel-Station-13/sprint_stamina
Adds a sprint buffer - 35 tiles, regen 2 tiles/second (always active), 0.3 stamcost per tile if empty (as old) directly applied to staminaloss rather than stamina action buffer (unlike old)
2019-07-17 18:07:57 -04:00
kevinz000andGitHub b134d23ea3 Merge pull request #8882 from Trilbyspaceclone/slaggy
Adds discount plushies and a way to get random plushies at shift start
2019-07-17 00:50:21 -07:00
Fermi 69725a902b Tweak 2019-07-17 01:10:36 +01:00
Ghommie b6f10c96a7 Modularity was a mistake. 2019-07-16 21:05:12 +02:00
Ghommie acaf628d89 Sweaters now cover groin too. 2019-07-16 10:23:02 +02:00
Fermi 3512d5eaec MK only pacifies on withdrawal now. 2019-07-16 06:00:40 +01:00
Fermi f343ea24db Ugh fine 2019-07-16 02:06:17 +01:00
Fermi ff41020b6f aaaa No I like it like this.... 2019-07-15 23:34:55 +01:00
Fermi bb17af0f30 Better limit it a lil. 2019-07-15 23:30:29 +01:00
Fermi d8a46dd0e3 Another fix to reduce spam. 2019-07-15 23:10:16 +01:00
Fermi c746cb3078 Quick fix 2019-07-15 23:07:49 +01:00
Fermi 55cc4f45f2 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-07-15 22:13:45 +01:00
Fermi f08e34cde6 Sigh. 2019-07-15 22:13:34 +01:00
ThalpyandGitHub 9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
kevinz000andGitHub 0c658ba41a Merge pull request #8796 from Trilbyspaceclone/patch-190
Russian Paratrooper Jumper Uniform fix
2019-07-14 14:44:01 -07:00