Commit Graph
22583 Commits
Author SHA1 Message Date
Fermi 31709938c6 Pushing a buncha stuff so I can fix things. 2019-07-28 23:23:45 +01:00
Thalpy 123c9199ba Added Eigenlockers. I love them. 2019-07-25 20:51:09 +01:00
ThalpyandGitHub 15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
CitadelStationBot 39dea966ae Automatic changelog generation for PR #8920 [ci skip] 2019-07-20 14:06:57 -05:00
kevinz000andGitHub c657244d9b Merge pull request #8920 from Ghommie/Ghommie-cit149
Towels.
2019-07-20 12:06:54 -07:00
kevinz000andGitHub 66ddaf3ae8 Merge pull request #8903 from Trilbyspaceclone/patch-192
Re-words brass flasks to not be wrong
2019-07-20 11:59:30 -07:00
CitadelStationBot f32eac94d3 Automatic changelog generation for PR #8829 [ci skip] 2019-07-20 13:59:07 -05:00
kevinz000andGitHub ab3c5acb0e Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT
Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes
2019-07-20 11:59:05 -07:00
CitadelStationBot 60f8dc9bc8 Automatic changelog generation for PR #8830 [ci skip] 2019-07-20 13:57:16 -05: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
CitadelStationBot 9f00a26eb4 Automatic changelog generation for PR #8917 [ci skip] 2019-07-20 13:54:50 -05:00
kevinz000andGitHub 3176cf958f Merge pull request #8917 from deathride58/fuckwarpwhistles
Fixes warp whistles
2019-07-20 11:54:48 -07:00
CitadelStationBot a39dbf2e85 Automatic changelog generation for PR #8898 [ci skip] 2019-07-20 13:52:47 -05:00
kevinz000andGitHub f649920b49 Merge pull request #8898 from WhiteHusky/batch-check-injuries
Batch check injuries
2019-07-20 11:52:45 -07:00
kevinz000andGitHub 8c93e48a01 Merge pull request #8896 from Bapldap/patch-1
Updates Blood Brother
2019-07-20 11:51:54 -07:00
CitadelStationBot 559a238d37 Automatic changelog generation for PR #8922 [ci skip] 2019-07-20 13:50:23 -05:00
kevinz000andGitHub 3fada5c624 Merge pull request #8922 from BurgerLUA/Voting-Transparency
Gamemode Voting Results are now displayed at the end of round screen
2019-07-20 11:50:21 -07:00
CitadelStationBot 724af961fd Automatic changelog generation for PR #8906 [ci skip] 2019-07-20 13:50:00 -05: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
CitadelStationBot 22ddaafad4 Automatic changelog generation for PR #8925 [ci skip] 2019-07-20 13:49:41 -05:00
kevinz000andGitHub 08d9732fb8 Merge pull request #8925 from BurgerLUA/Autolathe-Fix
Makes the autolathe shock wire actually shock you
2019-07-20 11:49:39 -07:00
BurgerLua b2379198aa Makes the autolathe shock wire actually shock you lmao 2019-07-19 02:01:16 -07: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
BurgerLua 9d183beb9c Added 2019-07-17 18:15:55 -07:00
Ghommie 44063e523d missing flag. 2019-07-18 02:14:00 +02:00
Ghommie 4e6554076c item flags, not clothing flags. 2019-07-18 00:16:14 +02:00
kevinz000andGitHub 28ac38d800 Merge pull request #8910 from Ghommie/Ghommie-cit144
Ports "Removes some getflaticon calls from things that don't draw browser interfaces"
2019-07-17 15:08:36 -07: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
CitadelStationBot 29f961ea07 Automatic changelog generation for PR #8915 [ci skip] 2019-07-17 17:07:40 -05:00
kevinz000andGitHub 884299e152 Merge pull request #8915 from Ghommie/Ghommie-cit148
Gives cult conversions an alert popup and four extra seconds wait time.
2019-07-17 15:07:38 -07:00
Ghommie 589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
deathride58andGitHub edbcabdce4 Merge pull request #8836 from Citadel-Station-13/kevinz000-patch-55
nanite metabolic synthesis now drains you until you're starving
2019-07-17 17:55:27 -04:00
deathride58andGitHub adaac8322c Merge pull request #8589 from Citadel-Station-13/kevinz000-patch-47
buffs pepperspray to hardstun (knockdown + drop items) for 0.1 ds because for some reason we don't have a standalone knockdown without hardstun when are we porting the /tg/ mobility flags that I made?
2019-07-17 17:53:39 -04:00
deathride58andGitHub 77360259ae Merge pull request #8855 from Citadel-Station-13/kevinz000-patch-15
Fixes and buffs nano-boost symptom
2019-07-17 17:53:02 -04:00
deathride58andGitHub dfc69b8deb Merge pull request #8871 from Citadel-Station-13/kevinz000-patch-58
Fixese nanite virology symptoms not being compiled in...
2019-07-17 17:52:05 -04:00
deathride58andGitHub 7e12cfc9ff Merge pull request #8868 from Citadel-Station-13/kevinz000-patch-57
Nanites in non /livings are no longer immune to EMPs
2019-07-17 17:51:15 -04:00
deathride58andGitHub 80b1383362 Merge pull request #8865 from Citadel-Station-13/kevinz000-patch-53
adds an adminspawned nanite hub that draws from admin techweb datum instead
2019-07-17 17:50:46 -04:00
deathride58andGitHub 51665f0d5f Merge pull request #8863 from Citadel-Station-13/kevinz000-patch-51
Makes aggressive replication not useless
2019-07-17 17:49:08 -04:00
deathride58andGitHub d7cbbfc8a4 Merge pull request #8866 from Citadel-Station-13/kevinz000-patch-54
Fixes nanites getting instant nuked by EMPs and shocks and removes the random drain in favor of a scaled drain
2019-07-17 17:48:38 -04:00
deathride58andGitHub 8f41a29697 Merge pull request #8867 from Citadel-Station-13/kevinz000-patch-56
Nerfs chain detonation (removes dev radius)
2019-07-17 17:47:36 -04:00
deathride58andGitHub 9ebdad68b7 Merge pull request #8892 from Citadel-Station-13/kevinz000-patch-61
Fixes RPD infinite transit tube stacking
2019-07-17 17:47:09 -04:00
deathride58andGitHub c36f25144b Merge pull request #8890 from Citadel-Station-13/kevinz000-patch-59
Nerfs nanite armor
2019-07-17 17:46:41 -04:00
CitadelStationBot f667ee7845 Automatic changelog generation for PR #8881 [ci skip] 2019-07-17 16:44:56 -05:00
kevinz000andGitHub 70d7ebbb45 Merge pull request #8881 from Ghommie/Ghommie-cit134
Fixing a reagent ID typo.
2019-07-17 14:44:54 -07:00
BurgerLUAandGitHub 03ef2c5257 Merge branch 'master' into NO-MORE-FETISH-CONTENT 2019-07-17 14:17:33 -07:00
deathride58 ea5837bfb1 double the sanity check, double the stability 2019-07-17 16:54:02 -04:00
deathride58 42aae8f45f fixing warp whistles in literally two fucking lines 2019-07-17 16:49:46 -04:00
bc158f4fd8 Update code/modules/food_and_drinks/drinks/drinks/bottle.dm
weh

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-07-17 16:39:14 -04:00