shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,249 Commits 5 Branches 0 Tags
28cd2d61648df3ca7b4fcd1d6702d34de842fc5c
Commit Graph

1443 Commits

Author SHA1 Message Date
LetterJay
28cd2d6164 Merge pull request #1783 from Citadel-Station-13/upstream-merge-28644 
[MIRROR] Ninja Dash
 2017-06-26 10:09:16 -05:00
LetterJay
028752c3de Merge pull request #1777 from Citadel-Station-13/upstream-merge-28564 
[MIRROR] Shuttle engines affecting travel time
 2017-06-26 09:00:54 -05:00
CitadelStationBot
5cf2065432 Ninja Dash 2017-06-26 08:57:46 -05:00
LetterJay
46c3108267 Merge pull request #1772 from Citadel-Station-13/upstream-merge-28749 
[MIRROR] Exporting mechs!
 2017-06-26 06:28:22 -05:00
LetterJay
ec966f6814 Merge pull request #1779 from Citadel-Station-13/upstream-merge-28750 
[MIRROR] Makes goonchat robust.
 2017-06-26 06:26:11 -05:00
LetterJay
260ee23be8 Merge pull request #1649 from Citadel-Station-13/upstream-merge-28490 
[MIRROR] The Hierophant is a little less chaotic and murdery on average
 2017-06-26 06:23:25 -05:00
LetterJay
77295c30d4 Merge pull request #1695 from Citadel-Station-13/upstream-merge-28599 
[MIRROR] Disablers now have an in-hand sprite (Fixes #28582)
 2017-06-26 06:21:50 -05:00
LetterJay
75339a25c4 Merge pull request #1781 from Citadel-Station-13/upstream-merge-28782 
[MIRROR] Improves Ahelp feedback
 2017-06-26 06:19:03 -05:00
LetterJay
49e1c3f2b6 Merge pull request #1689 from Citadel-Station-13/upstream-merge-28591 
[MIRROR] Changes tooltip verbs to be on preferences tab
 2017-06-26 06:15:45 -05:00
LetterJay
f1937eb1fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-06-26 06:14:55 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -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
CitadelStationBot
5f4e1ed721 Improves Ahelp feedback 2017-06-26 06:01:38 -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
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
CitadelStationBot
0178323fe1 Makes goonchat robust. 2017-06-26 00:03:57 -05:00
CitadelStationBot
1a38b6fd6f Shuttle engines affecting travel time 2017-06-25 20:53:00 -05:00
CitadelStationBot
e57a753701 Exporting mechs! 2017-06-25 11:35:00 -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
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
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
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
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
CitadelStationBot
f919e995dc Stamina projectiles no longer set off grenades and flamethrowers 2017-06-22 11:00:13 -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
Poojawa
df64469de1 Removed vore sound falloff 2017-06-21 07:27:54 -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
8809db8230 Disablers now have an in-hand sprite (Fixes #28582) 2017-06-20 10:31:24 -05:00
CitadelStationBot
35ac6c40e0 Remember to test your PRs, kids! - Rebalances matter cartridge cost redux (#1652) 2017-06-20 07:59:04 -07:00
CitadelStationBot
30d3a42db6 Minor telecom code cleanup (#1691) 2017-06-20 07:58:53 -07:00
CitadelStationBot
f3ef09736e Changes tooltip verbs to be on preferences tab 2017-06-20 08:21:54 -05:00
LetterJay
cd590e7fb1 Merge pull request #1686 from Citadel-Station-13/LOOCFix 
fixes LOOC
 2017-06-20 02:01:32 -05:00
LetterJay
b28677414e Update looc.dm 2017-06-20 01:47:52 -05:00
LetterJay
62e4580fd2 Merge pull request #1684 from Citadel-Station-13/upstream-merge-28579 
[MIRROR] Chisel messages will be below objects
 2017-06-20 01:30:53 -05:00
LetterJay
35df3ca80e Merge pull request #1683 from Citadel-Station-13/upstream-merge-28583 
[MIRROR] Adds framework for equip delays and adds it to the straight jacket
 2017-06-20 01:30:32 -05:00
LetterJay
592b4ed5d7 Merge pull request #1680 from Citadel-Station-13/upstream-merge-28577 
[MIRROR] Freezers and heaters now drop the correct materials (Fixes #28560)
 2017-06-20 01:30:04 -05:00
LetterJay
a8b498a2a9 Merge pull request #1666 from Citadel-Station-13/upstream-merge-28407 
[MIRROR] [READY]Adds examine tooltips
 2017-06-20 01:29:44 -05:00
LetterJay
4775f0b9c5 Update looc.dm 2017-06-20 01:27:05 -05:00
LetterJay
9f40c381a4 fixes looc 2017-06-20 01:25:48 -05:00
CitadelStationBot
0ef0ccf127 Chisel messages will be below objects 2017-06-19 22:07:23 -05:00
CitadelStationBot
989b991b05 Adds framework for equip delays and adds it to the straight jacket 2017-06-19 22:06:18 -05:00