Commit Graph

2323 Commits

Author SHA1 Message Date
LetterJay
faa0849b4b Merge pull request #1663 from Citadel-Station-13/upstream-merge-28573
[MIRROR] Alien closets now correctly cost two alloy to make (Fixes #28561)
2017-06-26 06:13:59 -05:00
LetterJay
43d4a06266 Merge pull request #1662 from Citadel-Station-13/upstream-merge-28543
[MIRROR] Fixes crusher trophies not properly being added
2017-06-26 06:13:46 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
4fff59df02 Update large_objects.dm 2017-06-26 02:35:58 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
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
b7d8fea575 Fixes nuclear bombs being radioactive (#1757) 2017-06-24 09:11:49 -07:00
LetterJay
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
LetterJay
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
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
Matthew
6558f31395 Adding Locker reset function 2017-06-22 23:53:02 -05:00
LetterJay
eaa36299ae Create browserOutput.html 2017-06-22 22:24:34 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
CitadelStationBot
fd3cc10b55 Fixes a comment typo 2017-06-22 14:34:12 -05:00
CitadelStationBot
8375a2dcf9 Fixes an error message 2017-06-22 11:03:29 -05:00
CitadelStationBot
d0d1ae1e01 Readds sprites for grey & nanotrasen bedsheets 2017-06-22 11:03:26 -05:00
CitadelStationBot
7ce0be3ab6 Areas.dm cleanup + new icons 2017-06-22 11:02:21 -05:00
CitadelStationBot
f919e995dc Stamina projectiles no longer set off grenades and flamethrowers 2017-06-22 11:00:13 -05:00
CitadelStationBot
c98248cf7e Fixes swarmers dying to radiation 2017-06-22 10:59:03 -05:00
CitadelStationBot
389203023f Fixes spriteless empty paperbins 2017-06-22 10:58:57 -05:00
LetterJay
20486e0184 🆑
sounddel: Removes oof
/🆑
2017-06-22 08:59:33 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
LetterJay
0719541100 Merge pull request #1721 from Citadel-Station-13/upstream-merge-28640
[MIRROR] Lavaland's default atmos is now a define
2017-06-21 15:45:34 -05:00
CitadelStationBot
d587d692c6 Flame thrower plasma tanks can be removed easily. 2017-06-21 13:21:31 -05:00
CitadelStationBot
df815e99bd Lavaland's default atmos is now a define 2017-06-21 08:32:00 -05:00
Poojawa
df64469de1 Removed vore sound falloff 2017-06-21 07:27:54 -05:00
LetterJay
b84426d8fa Merge pull request #1712 from Citadel-Station-13/upstream-merge-28618
[MIRROR] Fixes shining lights into peoples eyes
2017-06-20 20:30:24 -05:00
LetterJay
8ae2ceda05 Merge pull request #1713 from Citadel-Station-13/panicbunkerhotfix
Hotfix for panic bunker
2017-06-20 20:29:18 -05:00
LetterJay
b1df8322b2 remove double set 2017-06-20 20:08:59 -05:00
CitadelStationBot
4102d88802 Fixes shining lights into peoples eyes 2017-06-20 20:06:25 -05:00
CitadelStationBot
39ad327fab Fixes grenade belt and bandolier UI obscuring half the screen 2017-06-20 15:37:20 -05:00
CitadelStationBot
f0dc32ef4f Space cash descriptions are more descriptive (#1651) 2017-06-20 08:04:28 -07:00