LetterJay
|
59a73d238d
|
Merge pull request #1107 from Citadel-Station-13/upstream-merge-27495
[MIRROR] Fixes shooting out of view windows
|
2017-05-24 10:30:09 -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 |
|
LetterJay
|
34f82efdd7
|
mind over matter
|
2017-05-24 08:30:23 -05:00 |
|
LetterJay
|
fe9c47650f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27495
|
2017-05-24 08:26:40 -05:00 |
|
CitadelStationBot
|
9fa0539f74
|
Fixes cryo radios
|
2017-05-24 08:24:39 -05:00 |
|
LetterJay
|
b2c6bd0344
|
rej cleanup
|
2017-05-24 08:08:33 -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
|
e34bed049f
|
Merge branch 'master' into upstream-merge-27495
|
2017-05-24 08:00:10 -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
|
3aab463049
|
Merge pull request #1140 from Citadel-Station-13/upstream-merge-27553
[MIRROR] Fixes syndicate pod turrets
|
2017-05-24 07:55:20 -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 |
|
LetterJay
|
527d4bf40f
|
Merge pull request #1146 from Citadel-Station-13/upstream-merge-27549
[MIRROR] Reworks spray tan overdoses so they actually make sense
|
2017-05-24 07:52:05 -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
|
074b684b4d
|
Armour Description Changes
|
2017-05-24 00:11:57 -05:00 |
|
CitadelStationBot
|
be2aefa13b
|
Fixes syndicate pod turrets
|
2017-05-23 20:56:33 -05:00 |
|
CitadelStationBot
|
6ee6430dfb
|
Gives Void Torch its icon back
|
2017-05-23 19:56:25 -05:00 |
|
LetterJay
|
e0ada1b4c6
|
Merge pull request #1137 from Citadel-Station-13/upstream-merge-27541
[MIRROR] If you're gonna make a subsystem do it right
|
2017-05-23 16:47:32 -05:00 |
|
CitadelStationBot
|
7abd50a97d
|
If you're gonna make a subsystem do it right
|
2017-05-23 13:45:27 -05:00 |
|
CitadelStationBot
|
795ae0111d
|
Fixes Blackbox subsystem def
|
2017-05-23 13:45:23 -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
|
6307b15eed
|
Merge pull request #1115 from Citadel-Station-13/upstream-merge-27527
[MIRROR] sortMerge fix
|
2017-05-23 10:13:51 -05:00 |
|
LetterJay
|
23007bea3c
|
Merge pull request #1132 from Citadel-Station-13/upstream-merge-27536
[MIRROR] Gives all hats a default icon/item state so they work with chameleon gear.
|
2017-05-23 10:13:33 -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
|
c736d5f9dd
|
[READY FOR ~REVIEW~]Makes morphs only able to change into /objs or /mobs
|
2017-05-23 09:54:28 -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
|
64215e32e4
|
Merge pull request #1105 from Citadel-Station-13/upstream-merge-27497
[MIRROR] fixes being able to transfer into golem shells after they're already taken and sending people into nullspace as a result.
|
2017-05-23 07:14:58 -05:00 |
|
LetterJay
|
cd583208b5
|
Merge pull request #1099 from Citadel-Station-13/upstream-merge-27459
[MIRROR] Fixes ordering of text2file params
|
2017-05-23 07:14:46 -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 |
|