Commit Graph
3210 Commits
Author SHA1 Message Date
CitadelStationBot 4eb281523f Automatic changelog generation for PR #1761 [ci skip] 2017-06-26 06:13:27 -05:00
LetterJayandGitHub 89bc574cb9 Merge pull request #1761 from Citadel-Station-13/upstream-merge-28708
[MIRROR] Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit
2017-06-26 06:13:26 -05:00
LetterJayandGitHub 68c45f5569 Merge pull request #1661 from Citadel-Station-13/upstream-merge-28539
[MIRROR] Runes now innately support doing damage to their invokers
2017-06-26 06:07:53 -05:00
CitadelStationBot bebda394f4 Automatic changelog generation for PR #1636 [ci skip] 2017-06-26 05:58:00 -05:00
LetterJayandGitHub b4473bedb2 Merge pull request #1636 from Citadel-Station-13/upstream-merge-28382
[MIRROR] Gives the captain a somewhat robust golden fountain pen, and some others an average fountain pen.
2017-06-26 05:57:59 -05:00
CitadelStationBot 5587f72510 Automatic changelog generation for PR #1766 [ci skip] 2017-06-26 04:54:52 -05:00
LetterJayandGitHub 78d3f91e67 Merge pull request #1766 from Citadel-Station-13/upstream-merge-28755
[MIRROR] [s] Fixes TK remote grab exploit
2017-06-26 04:54:51 -05:00
CitadelStationBot 5494d1e0b5 Automatic changelog generation for PR #1508 [ci skip] 2017-06-26 04:29:09 -05:00
LetterJayandGitHub ed6c0b042e Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227
[MIRROR] Clown Toy Box + Wooden Crates
2017-06-26 04:29:08 -05:00
LetterJayandGitHub cb6400deba Update basemap.dm 2017-06-26 03:51:50 -05:00
LetterJayandGitHub fd9b9608ce Delete cerestation.dmm 2017-06-26 03:40:30 -05:00
LetterJayandGitHub 609ccb554c Delete cerestation.dmm 2017-06-26 03:27:00 -05:00
LetterJayandGitHub 4fff59df02 Update large_objects.dm 2017-06-26 02:35:58 -05:00
LetterJayandGitHub 53afc150f9 Merge pull request #1581 from Citadel-Station-13/upstream-merge-28398
[MIRROR] Changes config tag for secret extended
2017-06-26 02:30:58 -05:00
CitadelStationBot 72e7632fa8 [s] Fixes TK remote grab exploit 2017-06-25 07:41:23 -05:00
LetterJayandGitHub 4293607509 Merge pull request #1758 from Citadel-Station-13/upstream-merge-28735
[MIRROR] Fixes bad del runtime
2017-06-25 01:05:41 -05:00
CitadelStationBot 5854f15442 Automatic changelog generation for PR #1763 [ci skip] 2017-06-25 01:03:27 -05:00
LetterJayandGitHub 5b84b92277 Merge pull request #1763 from Citadel-Station-13/upstream-merge-28527
[MIRROR] Turns the maid costume's apron into a detachable accessory.
2017-06-25 01:03:26 -05:00
LetterJayandGitHub 67e1b0fda7 Merge pull request #1765 from Citadel-Station-13/upstream-merge-28753
[MIRROR] Fixes the server taking for fucking ever to initialize for local test
2017-06-25 01:02:47 -05:00
CitadelStationBot 15362206dd Fixes the server taking for fucking ever to initialize for local test 2017-06-24 22:22:44 -05:00
CitadelStationBot 919f9f0cfc Turns the maid costume's apron into a detachable accessory. 2017-06-24 15:40:03 -05:00
CitadelStationBot bef1ffc086 Robotic legs let you use pockets without a jumpsuit, robotic chest lets you wear an ID/belt without jumpsuit 2017-06-24 14:49:11 -05:00
CitadelStationBot acc03ae85e Fixes bad del runtime 2017-06-24 11:48:05 -05:00
CitadelStationBot 9e9e8c323e Automatic changelog generation for PR #1757 [ci skip] 2017-06-24 11:11:51 -05:00
CitadelStationBotandkevinz000 b7d8fea575 Fixes nuclear bombs being radioactive (#1757) 2017-06-24 09:11:49 -07:00
CitadelStationBot 5806c7198e Automatic changelog generation for PR #1751 [ci skip] 2017-06-23 22:55:33 -05:00
LetterJayandGitHub 68604eeb63 Merge pull request #1751 from Citadel-Station-13/upstream-merge-28713
[MIRROR] Fixes goliath hide stacks having no sprite at high amounts
2017-06-23 22:55:32 -05:00
LetterJayandGitHub 4dd1449640 Merge pull request #1750 from Citadel-Station-13/upstream-merge-28714
[MIRROR] Fixes the kinetic crusher not emitting light
2017-06-23 22:54:48 -05:00
CitadelStationBot 7a4c337146 Automatic changelog generation for PR #1749 [ci skip] 2017-06-23 22:54:28 -05:00
LetterJayandGitHub 2259f604d6 Merge pull request #1749 from Citadel-Station-13/upstream-merge-28659
[MIRROR] Intercoms are now constructable
2017-06-23 22:54:27 -05:00
CitadelStationBot 62295cc85b Automatic changelog generation for PR #1745 [ci skip] 2017-06-23 22:53:54 -05:00
LetterJayandGitHub ad128ae06c Merge pull request #1745 from ganglyalexander/locker_reset
Personal locker owner reset
2017-06-23 22:53:52 -05:00
CitadelStationBot 9b5f343906 Fixes goliath hide stacks having no sprite at high amounts 2017-06-23 13:51:43 -05:00
CitadelStationBot 384234a7d9 Fixes the kinetic crusher not emitting light 2017-06-23 13:49:37 -05:00
CitadelStationBot 2530d8a09a Intercoms are now constructable 2017-06-23 13:40:25 -05:00
MatthewandGitHub 6558f31395 Adding Locker reset function 2017-06-22 23:53:02 -05:00
MatthewandGitHub ea84ff14f0 Merge pull request #1 from Citadel-Station-13/master
Sync with Citadel
2017-06-22 23:50:14 -05:00
CitadelStationBot 161fcf69d5 Automatic changelog generation for PR #1743 [ci skip] 2017-06-22 22:46:31 -05:00
LetterJayandGitHub 26f3450f77 Merge pull request #1743 from Citadel-Station-13/upstream-merge-28670
[MIRROR] Makes oldchat show while goonchat loads, sends preload messages there.
2017-06-22 22:46:30 -05:00
LetterJayandGitHub eaa36299ae Create browserOutput.html 2017-06-22 22:24:34 -05:00
LetterJayandGitHub f81aff681b Update browserOutput.dm 2017-06-22 22:15:28 -05:00
CitadelStationBot 9ee0d6aa6d Makes oldchat show while goonchat loads, sends preload messages there. 2017-06-22 19:50:15 -05:00
LetterJayandGitHub 42b910b768 Merge pull request #1742 from Citadel-Station-13/upstream-merge-28682
[MIRROR] Fixes a comment typo
2017-06-22 19:22:57 -05:00
LetterJayandGitHub 5168f5d03f Merge pull request #1740 from Citadel-Station-13/upstream-merge-28674
[MIRROR] Fixes an error message
2017-06-22 19:22:38 -05:00
LetterJayandGitHub b81b9a4f61 Merge pull request #1739 from Citadel-Station-13/upstream-merge-28673
[MIRROR] Readds sprites for grey & nanotrasen bedsheets
2017-06-22 19:22:23 -05:00
LetterJayandGitHub 84cd74bc4b Merge pull request #1738 from Citadel-Station-13/upstream-merge-28677
[MIRROR] Areas.dm cleanup + new icons
2017-06-22 19:21:59 -05:00
LetterJayandGitHub 9f52f1cea2 Merge pull request #1737 from Citadel-Station-13/upstream-merge-28486
[MIRROR] Stamina projectiles no longer set off grenades and flamethrowers
2017-06-22 19:21:30 -05:00
LetterJayandGitHub 61e8a6a290 Merge pull request #1736 from Citadel-Station-13/upstream-merge-28664
[MIRROR] Fixes swarmers dying to radiation
2017-06-22 19:20:14 -05:00
LetterJayandGitHub cf430b694e Merge pull request #1735 from Citadel-Station-13/upstream-merge-28665
[MIRROR] Fixes spriteless empty paperbins
2017-06-22 19:20:01 -05:00
CitadelStationBot fd3cc10b55 Fixes a comment typo 2017-06-22 14:34:12 -05:00