CitadelStationBot
|
8a1a4dd671
|
Hand drill, jaws of life, and emitter grammar tweaks
|
2017-06-16 15:19:22 -05:00 |
|
CitadelStationBot
|
ddee871df7
|
Good boy Robustin does a heckin inducer fix
|
2017-06-15 19:04:35 -05:00 |
|
LetterJay
|
ff8b2acf9e
|
Merge pull request #1461 from Citadel-Station-13/upstream-merge-28145
[MIRROR] Syndicate Uplink - Typos & Grammar mk2
|
2017-06-14 08:58:35 -05:00 |
|
LetterJay
|
9df28d90bf
|
Merge pull request #1456 from Citadel-Station-13/upstream-merge-28150
[MIRROR] Fixes CE's hand drill changing size
|
2017-06-14 08:54:05 -05:00 |
|
LetterJay
|
4c1b223248
|
Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
Selective mirror sync
|
2017-06-14 06:41:01 -05:00 |
|
LetterJay
|
ec415077c1
|
final commit for merge
|
2017-06-14 05:07:20 -05:00 |
|
CitadelStationBot
|
44f4059968
|
Weaponizes station charters (#1449)
|
2017-06-13 13:47:17 -07:00 |
|
CitadelStationBot
|
e9f3bc7f1e
|
Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones (#1453)
|
2017-06-13 13:46:20 -07:00 |
|
CitadelStationBot
|
4ef7ad7724
|
Flashlight suduko (#1426)
|
2017-06-13 13:45:58 -07:00 |
|
CitadelStationBot
|
9c31812e5b
|
Fixes dead PKborgs having active dampener fields
|
2017-06-13 02:24:06 -05:00 |
|
CitadelStationBot
|
e69c61a4c5
|
Flashdarks can't be used for examining eyes/mouth.
|
2017-06-12 16:37:43 -05:00 |
|
LetterJay
|
b464a2dc19
|
Merge pull request #1517 from Citadel-Station-13/upstream-merge-28113
[MIRROR] Adds F.R.A.M.E. cartridge
|
2017-06-12 12:33:04 -05:00 |
|
LetterJay
|
55d30f865b
|
upstream-merge-28062
|
2017-06-12 12:20:07 -05:00 |
|
LetterJay
|
69b2922e58
|
Merge pull request #1548 from Citadel-Station-13/upstream-merge-28318
[MIRROR] IED code cleanup
|
2017-06-12 12:18:26 -05:00 |
|
LetterJay
|
8b4d5cb68d
|
Merge pull request #1546 from Citadel-Station-13/upstream-merge-28331
[MIRROR] Lighters need to be on
|
2017-06-12 12:13:35 -05:00 |
|
CitadelStationBot
|
024efabf09
|
IED code cleanup
|
2017-06-11 20:47:55 -05:00 |
|
CitadelStationBot
|
ea5f6037cf
|
Lighters need to be on
|
2017-06-11 20:44:46 -05:00 |
|
CitadelStationBot
|
dcaa6c5db4
|
Fixes #28182 (IED sprites are bugged)
|
2017-06-11 17:28:40 -05:00 |
|
LetterJay
|
e596e3eea4
|
missing files
|
2017-06-11 00:04:13 -05:00 |
|
LetterJay
|
b80a184d97
|
up to upstream-merge-27868
|
2017-06-11 00:04:00 -05:00 |
|
CitadelStationBot
|
4bd99124de
|
Adds F.R.A.M.E. cartridge
|
2017-06-10 12:18:31 -05:00 |
|
LetterJay
|
700004e309
|
Update lockbox.dm
|
2017-06-10 09:24:03 -05:00 |
|
LetterJay
|
7189249f66
|
Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115
[MIRROR] A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
|
2017-06-10 09:01:25 -05:00 |
|
LetterJay
|
12ea900051
|
Merge pull request #1487 from Citadel-Station-13/upstream-merge-28189
[MIRROR] Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them
|
2017-06-09 15:55:30 -05:00 |
|
LetterJay
|
06be53ffeb
|
Merge pull request #1405 from Citadel-Station-13/upstream-merge-28049
[MIRROR] Only human and silicon servants can help recite multi-invoker scriptures
|
2017-06-09 09:13:18 -05:00 |
|
LetterJay
|
c3ebcf9d69
|
Merge pull request #1327 from Citadel-Station-13/upstream-merge-27891
[MIRROR] Fixes black carpet recipe and sprite
|
2017-06-09 09:10:08 -05:00 |
|
CitadelStationBot
|
24bfaa9b56
|
Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them
|
2017-06-08 10:58:31 -05:00 |
|
LetterJay
|
00790c0fdd
|
Merge pull request #1315 from Citadel-Station-13/upstream-merge-27866
[MIRROR] Makes VV'ing ID cards easier.
|
2017-06-08 03:43:31 -05:00 |
|
LetterJay
|
190b47983c
|
cleanup
|
2017-06-08 03:39:13 -05:00 |
|
LetterJay
|
9b840ae323
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891
|
2017-06-08 03:36:39 -05:00 |
|
LetterJay
|
923c5b9035
|
Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
|
2017-06-08 03:35:23 -05:00 |
|
LetterJay
|
3563459d15
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891
|
2017-06-08 03:33:56 -05:00 |
|
CitadelStationBot
|
06187dd178
|
Syndicate Uplink - Typos & Grammar mk2
|
2017-06-07 14:56:22 -05:00 |
|
CitadelStationBot
|
c759862d4b
|
Fixes CE's hand drill changing size
|
2017-06-07 14:14:18 -05:00 |
|
CitadelStationBot
|
9725329268
|
A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
|
2017-06-07 03:06:15 -05:00 |
|
LetterJay
|
35b56f3075
|
Merge branch 'master' into upstream-merge-27773
|
2017-06-06 09:05:26 -05:00 |
|
LetterJay
|
2feab0a411
|
cleanup
|
2017-06-05 23:18:40 -05:00 |
|
LetterJay
|
962177c423
|
Merge branch 'master' into upstream-merge-27652
|
2017-06-05 23:16:40 -05:00 |
|
CitadelStationBot
|
4d25a6e299
|
Only human and silicon servants can help recite multi-invoker scriptures
|
2017-06-04 19:23:18 -05:00 |
|
CitadelStationBot
|
e0b5221ebd
|
The Crafting Menu now has subcategories! (#1364)
|
2017-06-04 09:09:59 -07:00 |
|
CitadelStationBot
|
79f28a732d
|
Buffs chemical grenades (#1372)
|
2017-06-04 09:08:50 -07:00 |
|
CitadelStationBot
|
b5d2cf3c99
|
[READY] Stacks will change item_states and w_class based on how full they are. (#1370)
|
2017-06-04 09:08:33 -07:00 |
|
CitadelStationBot
|
8fcbf20c79
|
Another spawn timer (#1388)
|
2017-06-04 09:07:16 -07:00 |
|
CitadelStationBot
|
9023e0ff67
|
refactor another spawn cooldown (#1392)
|
2017-06-04 09:05:12 -07:00 |
|
CitadelStationBot
|
f8505883d4
|
Removes dragoontomb ruin and loot. (#1290)
|
2017-06-03 06:39:11 -07:00 |
|
kevinz000
|
8e7b6adff0
|
Update cardboard_cutouts.dm
|
2017-06-02 21:54:59 -07:00 |
|
kevinz000
|
86d11b3bce
|
Delete cardboard_cutouts.dm.rej
|
2017-06-02 21:54:49 -07:00 |
|
CitadelStationBot
|
bdd4f9d17f
|
Allows explorer webbings to hold marker beacons (#1219)
|
2017-06-02 21:35:41 -07:00 |
|
CitadelStationBot
|
2c7e3ad4f7
|
Makes op belts less brown (#1336)
|
2017-06-02 21:18:26 -07:00 |
|
CitadelStationBot
|
6e563e7a53
|
Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
|
2017-06-02 06:42:23 -05:00 |
|