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
|
9fa0539f74
|
Fixes cryo radios
|
2017-05-24 08:24:39 -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
|
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
|
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 |
|
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 |
|
LetterJay
|
2083b0c990
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27467
|
2017-05-23 05:31:00 -05:00 |
|
LetterJay
|
1e149d1c89
|
Merge pull request #1119 from Citadel-Station-13/upstream-merge-27463
[MIRROR] Auto Rifle Alt Mag Sprites
|
2017-05-23 05:13:51 -05:00 |
|
LetterJay
|
939362fc94
|
Merge pull request #1120 from Citadel-Station-13/upstream-merge-27458
[MIRROR] Adds webbing
|
2017-05-23 05:13:38 -05:00 |
|
LetterJay
|
2fedf6b0e2
|
Merge pull request #1121 from Citadel-Station-13/upstream-merge-27409
[MIRROR] Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls
|
2017-05-23 05:13:18 -05:00 |
|
LetterJay
|
0207ab2870
|
Merge pull request #1124 from Citadel-Station-13/upstream-merge-27516
[MIRROR] Fixes a probable bug/exploit that allows for fully ignoring slows
|
2017-05-23 05:12:17 -05:00 |
|
LetterJay
|
d01d05770b
|
Merge pull request #1125 from Citadel-Station-13/upstream-merge-27514
[MIRROR] Fixes space movement exploit
|
2017-05-23 05:11:44 -05:00 |
|
LetterJay
|
b38955b3a2
|
Merge pull request #1126 from Citadel-Station-13/upstream-merge-27512
[MIRROR] Fixes conveyor belts moving things with no gravity
|
2017-05-23 05:11:31 -05:00 |
|
CitadelStationBot
|
2ea155e6a7
|
Fixes paper bins and moves paper to initialize
|
2017-05-22 22:51:23 -05:00 |
|
CitadelStationBot
|
e382287f78
|
Fixes conveyor belts moving things with no gravity
|
2017-05-22 22:48:09 -05:00 |
|
CitadelStationBot
|
3c892e0f46
|
Fixes space movement exploit
|
2017-05-22 22:47:04 -05:00 |
|
CitadelStationBot
|
240d195e2c
|
Fixes a probable bug/exploit that allows for fully ignoring slows
|
2017-05-22 22:46:59 -05:00 |
|
CitadelStationBot
|
6b4b6ee70d
|
Mesons no longer show turfs on lavaland, but miners no longer need mesons to see minerals scanned by a mineral scanner through walls
|
2017-05-22 22:21:20 -05:00 |
|
CitadelStationBot
|
63dd699509
|
Adds webbing
|
2017-05-22 22:20:14 -05:00 |
|
CitadelStationBot
|
1d5c29b7b6
|
Auto Rifle Alt Mag Sprites
|
2017-05-22 22:16:06 -05:00 |
|
LetterJay
|
e675b3becc
|
var/mine_range
|
2017-05-22 17:35:40 -05:00 |
|
LetterJay
|
288c072544
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27474
|
2017-05-22 17:30:31 -05:00 |
|
LetterJay
|
b66b362e4f
|
Merge pull request #1109 from Citadel-Station-13/upstream-merge-27484
[MIRROR] KA Pressure Mods are now a traitor miner item
|
2017-05-22 17:25:47 -05:00 |
|
LetterJay
|
e178fb4ac6
|
Merge pull request #1111 from Citadel-Station-13/upstream-merge-27500
[MIRROR] Adds extra investigate logs for SM
|
2017-05-22 17:23:18 -05:00 |
|
LetterJay
|
25c1aa40dd
|
Merge pull request #1079 from Citadel-Station-13/upstream-merge-27450
[MIRROR] Removes the mess added with recalling with a message
|
2017-05-22 17:14:14 -05:00 |
|