Commit Graph

1019 Commits

Author SHA1 Message Date
CitadelStationBot
29384db52f Improves collector feedback 2017-05-24 18:20:41 -05:00
LetterJay
869953cd18 Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503
[MIRROR] Changes investigate logs to use a define
2017-05-24 12:34:36 -05:00
LetterJay
9befc09252 UAV online 2017-05-24 12:21:14 -05:00
LetterJay
c8d071ccf4 25 kill streak with a famas 2017-05-24 12:20:50 -05:00
LetterJay
a9aa36e5c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27557 2017-05-24 12:13:44 -05:00
LetterJay
57f9345ace Merge pull request #1135 from Citadel-Station-13/upstream-merge-27543
[MIRROR] Fixes advanced cam not cleaning up properly
2017-05-24 12:12:16 -05:00
LetterJay
2edfb6f9e4 Merge pull request #1157 from Citadel-Station-13/upstream-merge-27580
[MIRROR] Splits equipment.dm into several component files
2017-05-24 10:32:11 -05:00
LetterJay
936e1d3061 Missed during mirror downtime 2017-05-24 08:40:45 -05:00
LetterJay
56c2405d35 Merge pull request #1143 from Citadel-Station-13/upstream-merge-27556
[MIRROR] Sketchin Alt Magazine Sprites
2017-05-24 08:34:19 -05:00
LetterJay
10f5f27bf0 Merge pull request #1144 from Citadel-Station-13/upstream-merge-27554
[MIRROR] Prevents inserted inert legion cores from healing
2017-05-24 08:33:58 -05:00
LetterJay
d995dd2dee Merge pull request #1150 from Citadel-Station-13/upstream-merge-27535
[MIRROR] Ballistic Weapon/Shotgun Reload Sounds
2017-05-24 08:33:34 -05:00
LetterJay
f2a1ee11a2 Merge pull request #1152 from Citadel-Station-13/upstream-merge-27533
[MIRROR] Auto Rifle Armour Piercing Increase
2017-05-24 08:33:14 -05:00
LetterJay
e8f45a69ac Merge pull request #1153 from Citadel-Station-13/upstream-merge-27570
[MIRROR] fixes comment grammar
2017-05-24 08:32:56 -05:00
LetterJay
b8f22b24f7 Merge pull request #1154 from Citadel-Station-13/upstream-merge-27579
[MIRROR] Fixes cryo radios
2017-05-24 08:32:35 -05:00
CitadelStationBot
88d88741f5 Splits equipment.dm into several component files 2017-05-24 08:28:08 -05:00
CitadelStationBot
9fa0539f74 Fixes cryo radios 2017-05-24 08:24:39 -05:00
LetterJay
e966230ed9 logging 2017-05-24 08:19:45 -05:00
LetterJay
006c74c6ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503 2017-05-24 08:11:07 -05:00
LetterJay
34e74a377e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27442 2017-05-24 08:06:53 -05:00
LetterJay
035e95705b Merge pull request #1141 from Citadel-Station-13/upstream-merge-27558
[MIRROR] Armour Description Changes
2017-05-24 07:56:53 -05:00
LetterJay
bc51506071 Merge pull request #1148 from Citadel-Station-13/upstream-merge-27566
[MIRROR] Fixes library machines not finding book scanners
2017-05-24 07:55:57 -05:00
LetterJay
da1eb3d96f Merge pull request #1147 from Citadel-Station-13/upstream-merge-27546
[MIRROR] Water wets hide, you can microwave wet leather
2017-05-24 07:54:34 -05:00
CitadelStationBot
d11da1221f fixes comment grammar 2017-05-24 05:55:50 -05:00
CitadelStationBot
25f7f32f37 Auto Rifle Armour Piercing Increase 2017-05-24 05:54:45 -05:00
CitadelStationBot
14427a2b8c Ballistic Weapon/Shotgun Reload Sounds 2017-05-24 05:52:37 -05:00
CitadelStationBot
991dfbeb5a Fixes library machines not finding book scanners 2017-05-24 03:47:08 -05:00
CitadelStationBot
3a97af10cf Water wets hide, you can microwave wet leather 2017-05-24 00:18:51 -05:00
CitadelStationBot
e29928312d Reworks spray tan overdoses so they actually make sense 2017-05-24 00:16:45 -05:00
CitadelStationBot
fa9785e90e Prevents inserted inert legion cores from healing 2017-05-24 00:15:13 -05:00
CitadelStationBot
5fe4c7eb07 Sketchin Alt Magazine Sprites 2017-05-24 00:14:08 -05:00
CitadelStationBot
ab7e9539bd Tactical Energy Gun Unique Sprites 2017-05-24 00:13:03 -05:00
CitadelStationBot
074b684b4d Armour Description Changes 2017-05-24 00:11:57 -05:00
CitadelStationBot
7abd50a97d If you're gonna make a subsystem do it right 2017-05-23 13:45:27 -05:00
CitadelStationBot
3651637cd8 Fixes advanced cam not cleaning up properly 2017-05-23 13:44:19 -05:00
LetterJay
21b9e3a160 Merge pull request #1134 from Citadel-Station-13/LavalandFix
Something I broke in a previous PR that I didn't see
2017-05-23 10:20:20 -05:00
LetterJay
febefa0c78 Something I broke in a previous PR that I didn't see 2017-05-23 10:11:19 -05:00
CitadelStationBot
e6617661f9 Gives all hats a default icon/item state so they work with chameleon gear. 2017-05-23 07:58:48 -05:00
LetterJay
61c0094033 Merge pull request #1102 from Citadel-Station-13/upstream-merge-27324
[MIRROR] Reorganizes martial arts and stores them in the MIND.
2017-05-23 07:54:47 -05:00
LetterJay
e77cf64ff9 Merge pull request #1103 from Citadel-Station-13/upstream-merge-27498
[MIRROR] A silicon will always be able to speak Galactic Common
2017-05-23 07:18:16 -05:00
LetterJay
a80a00bc6e Merge branch 'master' into upstream-merge-27324 2017-05-23 07:17:45 -05:00
LetterJay
c13af581b3 Merge pull request #1101 from Citadel-Station-13/upstream-merge-27489
[MIRROR] Having less legs won't slow you down if you're in zero gravity with a jetpack
2017-05-23 07:15:15 -05:00
LetterJay
dd6e5c8368 Merge pull request #1098 from Citadel-Station-13/upstream-merge-27460
[MIRROR] Fixes built air meters not working
2017-05-23 07:14:24 -05:00
LetterJay
2deead1ab2 Merge pull request #1096 from Citadel-Station-13/upstream-merge-27427
[MIRROR] Warden Compact Combat Shotgun
2017-05-23 07:13:52 -05:00
LetterJay
958afdf037 oops 2017-05-23 06:29:15 -05:00
LetterJay
2fcc8fdc25 magic 2017-05-23 06:23:29 -05:00
LetterJay
9fc02333dd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27467 2017-05-23 06:18:28 -05:00
LetterJay
b633ef0991 Merge pull request #1130 from Citadel-Station-13/GangSync
Syncs all gang related PRs with upstream
2017-05-23 06:17:29 -05:00
LetterJay
db9f2a6d74 rej cleanup 2017-05-23 06:15:33 -05:00
LetterJay
0b1a680d1a Merge pull request #1087 from Citadel-Station-13/upstream-merge-27480
[MIRROR] Ports pandemic to tgui
2017-05-23 06:13:41 -05:00
LetterJay
b85d2ea321 Syncs all gang related PRs with upstream 2017-05-23 06:10:40 -05:00