 letterjay
|
a9664ac343
|
Fixes sharp weapons deconverting revs
|
2018-05-17 10:28:38 -05:00 |
|
|
ShizCalevandletterjay
|
e425a8514e
|
Fixes sharp weapons deconverting revs (#37871)
* Fixes sharp weapons deconverting revs
* enhanced commentary
|
2018-05-17 10:28:38 -05:00 |
|
|
CitadelStationBot
|
56544307ec
|
Automatic changelog generation for PR #6754 [ci skip]
|
2018-05-16 11:09:23 -05:00 |
|
|
deathride58andGitHub
|
ca36def4e6
|
Merge pull request #6754 from Citadel-Station-13/upstream-merge-37823
[MIRROR] Makes cult items less of a vomit coaster
|
2018-05-16 16:09:21 +00:00 |
|
|
CitadelStationBot
|
a87acf9b02
|
Automatic changelog generation for PR #6756 [ci skip]
|
2018-05-16 11:08:40 -05:00 |
|
|
deathride58andGitHub
|
61c606c602
|
Merge pull request #6756 from Citadel-Station-13/upstream-merge-37846
[MIRROR] Small cult nerf do not be alarmed robustin think about your heart
|
2018-05-16 16:08:37 +00:00 |
|
|
LetterJayandGitHub
|
3103119f6b
|
Update soulstone.dm
|
2018-05-16 09:04:51 -05:00 |
|
|
LetterJayandGitHub
|
fe93e1ccbd
|
Update cult_items.dm
|
2018-05-16 09:04:39 -05:00 |
|
|
letterjay
|
a95c91da45
|
Small cult nerf do not be alarmed robustin think about your heart
|
2018-05-16 04:47:00 -05:00 |
|
|
vuonojenmustaturskaandletterjay
|
5e48fcd275
|
Merge pull request #37846 from DaxDupont/axe-time
Small cult nerf do not be alarmed robustin think about your heart
|
2018-05-16 04:46:59 -05:00 |
|
|
CitadelStationBot
|
2b789b29b8
|
Automatic changelog generation for PR #6660 [ci skip]
|
2018-05-15 15:53:07 -05:00 |
|
|
deathride58andGitHub
|
bb1fe6cba2
|
Merge pull request #6660 from GrayRachnid/add-dorms-to-ninja-capture
Add dorms to ninja capture
|
2018-05-15 20:53:05 +00:00 |
|
|
Dax Dupontandletterjay
|
79b5e412f1
|
Makes cult items less of a vomit coaster
|
2018-05-15 12:18:00 -05:00 |
|
|
deathride58andGitHub
|
5a67cd83ca
|
Merge pull request #6753 from Citadel-Station-13/gate-keeper
Makes the Panic Bunker message a bit more helpful
|
2018-05-15 16:41:28 +00:00 |
|
|
LetterJayandGitHub
|
08fab3adaa
|
Update client_procs.dm
|
2018-05-15 10:25:58 -05:00 |
|
|
LetterJay
|
24b6ee5a6c
|
should make life simpler
|
2018-05-15 10:05:56 -05:00 |
|
|
LetterJayandGitHub
|
d421ad846a
|
Merge pull request #6751 from Citadel-Station-13/upstream-merge-37715
[MIRROR] Cleans up touch spells
|
2018-05-15 06:53:54 -05:00 |
|
|
CitadelStationBot
|
60292976a0
|
Automatic changelog generation for PR #6746 [ci skip]
|
2018-05-15 06:53:27 -05:00 |
|
|
LetterJayandGitHub
|
ce98f9c444
|
Merge pull request #6746 from Citadel-Station-13/upstream-merge-37785
[MIRROR] Replaces loose tech storage boards with spawners
|
2018-05-15 06:53:25 -05:00 |
|
|
CitadelStationBot
|
072e0b5951
|
Automatic changelog generation for PR #6745 [ci skip]
|
2018-05-15 06:53:13 -05:00 |
|
|
LetterJayandGitHub
|
49b22d2673
|
Merge pull request #6745 from Citadel-Station-13/upstream-merge-37810
[MIRROR] Adds basic electronics to techwebs
|
2018-05-15 06:53:11 -05:00 |
|
|
CitadelStationBot
|
61a3270907
|
Automatic changelog generation for PR #6744 [ci skip]
|
2018-05-15 06:52:55 -05:00 |
|
|
LetterJayandGitHub
|
e99045054b
|
Merge pull request #6744 from Citadel-Station-13/upstream-merge-37824
[MIRROR] Fixes curator hud icon
|
2018-05-15 06:52:53 -05:00 |
|
|
LetterJayandGitHub
|
f86af0ab41
|
Merge pull request #6743 from Citadel-Station-13/upstream-merge-37818
[MIRROR] Fix some missing icons
|
2018-05-15 06:52:32 -05:00 |
|
|
LetterJayandGitHub
|
a580ea7544
|
Merge pull request #6742 from Citadel-Station-13/upstream-merge-37743
[MIRROR] Remove a duplicate pipe in MetaStation maint
|
2018-05-15 06:51:52 -05:00 |
|
|
CitadelStationBot
|
8c626ffb4e
|
Automatic changelog generation for PR #6731 [ci skip]
|
2018-05-15 06:51:42 -05:00 |
|
|
LetterJayandGitHub
|
691cc34ebf
|
Merge pull request #6731 from Citadel-Station-13/upstream-merge-37749
[MIRROR] Quirk limit now only applies to positive quirks
|
2018-05-15 06:51:39 -05:00 |
|
|
LetterJayandGitHub
|
7c3c270e2a
|
Merge branch 'master' into upstream-merge-37749
|
2018-05-15 00:50:13 -05:00 |
|
|
CitadelStationBot
|
19306a2d9b
|
Automatic changelog generation for PR #6663 [ci skip]
|
2018-05-15 00:48:01 -05:00 |
|
|
LetterJayandGitHub
|
0877bdd4e5
|
Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646
[MIRROR] Renames trait datums/character traits to quirks to differentiate them from the other trait system in the code
|
2018-05-15 00:47:59 -05:00 |
|
|
letterjay
|
f4e00f39ca
|
Cleans up touch spells
|
2018-05-15 00:35:41 -05:00 |
|
|
AnturKandletterjay
|
a379391dd3
|
Cleans up touch spells (#37715)
* Cleans up touch spells
* Silent param
* Oh god i'm blind.
|
2018-05-15 00:35:41 -05:00 |
|
|
LetterJayandGitHub
|
b161047f71
|
Merge pull request #6747 from Citadel-Station-13/upstream-merge-37851
[MIRROR] Send jquery asset when initializing tooltips
|
2018-05-14 22:16:12 -05:00 |
|
|
LetterJayandGitHub
|
da5d266aae
|
Merge pull request #6750 from Citadel-Station-13/upstream-merge-37832
[MIRROR] Fixes wumborian fugu dead sprite
|
2018-05-14 22:12:06 -05:00 |
|
|
letterjay
|
e32efcba92
|
Fixes wumborian fugu dead sprite
|
2018-05-14 18:55:55 -05:00 |
|
|
YPOQandletterjay
|
a7b5415a19
|
Fixes wumborian fugu dead sprite (#37832)
|
2018-05-14 18:55:54 -05:00 |
|
|
letterjay
|
8f1fb99e85
|
Send jquery asset when initializing tooltips
|
2018-05-14 16:51:20 -05:00 |
|
|
orangesandletterjay
|
ef7be078b5
|
Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2
Send jquery asset when initializing tooltips
|
2018-05-14 16:51:20 -05:00 |
|
|
Jordan Brownandletterjay
|
3b03fa3a37
|
Replaces loose tech storage boards with spawners
|
2018-05-14 15:18:17 -05:00 |
|
|
letterjay
|
4155b0ae4f
|
Adds basic electronics to techwebs
|
2018-05-14 15:17:01 -05:00 |
|
|
Jordan Brownandletterjay
|
9a1dfefb97
|
Merge pull request #37810 from 81Denton/techweb-electronics
Adds basic electronics to techwebs
|
2018-05-14 15:17:00 -05:00 |
|
|
letterjay
|
37e7146eb2
|
Fixes curator hud icon
|
2018-05-14 15:14:46 -05:00 |
|
|
Jordan Brownandletterjay
|
d4428a4114
|
Merge pull request #37824 from DaxDupont/hud-icon
Fixes curator hud icon
|
2018-05-14 15:14:46 -05:00 |
|
|
letterjay
|
42e3d7ef87
|
Fix some missing icons
|
2018-05-14 15:13:33 -05:00 |
|
|
Jordan Brownandletterjay
|
7dc1c116d5
|
Merge pull request #37818 from AutomaticFrenzy/patch/missing-icons
Fix some missing icons
|
2018-05-14 15:13:33 -05:00 |
|
|
LetterJay
|
a98e1387c1
|
trait => quirk
|
2018-05-14 12:31:49 -05:00 |
|
|
LetterJayandGitHub
|
f9f42658e1
|
Merge pull request #6714 from Citadel-Station-13/upstream-merge-37760
[MIRROR] Fixed stacks sometimes having the wrong amount if created on another stack
|
2018-05-14 12:28:41 -05:00 |
|
|
letterjay
|
402115d3c7
|
Remove a duplicate pipe in MetaStation maint
|
2018-05-14 11:01:08 -05:00 |
|
|
Jordan Brownandletterjay
|
5a76b56d04
|
Merge pull request #37743 from AutomaticFrenzy/patch/meta-pipe
Remove a duplicate pipe in MetaStation maint
|
2018-05-14 11:01:08 -05:00 |
|
|
LetterJayandGitHub
|
21bc6c48ef
|
Update preferences.dm
|
2018-05-14 09:53:00 -05:00 |
|