Commit Graph
22194 Commits
Author SHA1 Message Date
kevinz000 d976dd016a Merge remote-tracking branch 'origin/master' into trait_blacklisting 2019-07-25 15:20:46 -07:00
CitadelStationBot 0961491225 Automatic changelog generation for PR #8939 [ci skip] 2019-07-23 22:34:11 -05:00
kevinz000andGitHub 0f58585e5d Merge pull request #8939 from Ghommie/Ghommie-cit154
Fixing towels and improving them.
2019-07-23 20:34:09 -07:00
CitadelStationBot ff0e2f5ea8 Automatic changelog generation for PR #8934 [ci skip] 2019-07-23 22:33:11 -05: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
CitadelStationBot b4e7925e57 Automatic changelog generation for PR #8909 [ci skip] 2019-07-22 22:17:33 -05:00
kevinz000andGitHub 1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143
Fixes named arg Knockdown calls.
2019-07-22 20:17:30 -07:00
CitadelStationBot 98c75f0e58 Automatic changelog generation for PR #8926 [ci skip] 2019-07-22 22:15:38 -05:00
kevinz000andGitHub f114094138 Merge pull request #8926 from Thalpy/Secbats
Secbats
2019-07-22 20:15:36 -07:00
Jay ad036ac36d adds for donator 2019-07-21 12:37:43 -05:00
Ghommie c06c1d9b60 typo. 2019-07-21 12:11:18 +02:00
Ghommie ce4e86279c Further improvements. 2019-07-21 11:58:58 +02:00
kevinz000andGitHub f8fdbfc211 Update quirks.dm 2019-07-21 02:30:19 -07:00
Ghommie 5504fb6a6a Alt click examine string. 2019-07-21 11:27:26 +02:00
Ghommie 2f46b68e11 switching to non combat mode attack_self() and AltClick(), less clunky. 2019-07-21 11:22:19 +02:00
Ghommie e8584720b3 Fixes suit worn overlay for towels. 2019-07-21 11:18:38 +02:00
Ghommie 1a47fedade More intuitive, way less weird edge cases. 2019-07-21 10:26:16 +02:00
Ghommie 3440757fd0 Glass. 2019-07-21 10:01:00 +02:00
Ghommie fc78d02242 Fixing towels and improving them. 2019-07-21 09:58:54 +02:00
TrilbySpaceClone f315696937 fix n stuff 2019-07-20 22:19:03 -04:00
Fermi 4f2406ee3a Made it a critterbox instead. 2019-07-20 20:55:46 +01:00
Fermi c2b3df34c1 Cargobox. 2019-07-20 20:46:50 +01:00
Fermi 309bc1c899 Requested change. 2019-07-20 20:34:44 +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
Fermi e5648fd471 Made bat part of previous bat type. 2019-07-19 22:57:22 +01:00
Fermi 75d6768ba7 Changed how the box works so it's not a storage. 2019-07-19 22:12:05 +01:00
Fermi 4ab5060596 Adds secbats (tested) 2019-07-19 17:07:02 +01:00
ThalpyandGitHub 16802b2d13 Merge pull request #19 from Citadel-Station-13/master
Test
2019-07-19 16:21:43 +01:00
BurgerLua b2379198aa Makes the autolathe shock wire actually shock you lmao 2019-07-19 02:01:16 -07: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