Commit Graph

158 Commits

Author SHA1 Message Date
LetterJay
4c1b223248 Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync
Selective mirror sync
2017-06-14 06:41:01 -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
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
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
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
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
f8505883d4 Removes dragoontomb ruin and loot. (#1290) 2017-06-03 06:39:11 -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
CitadelStationBot
1fd718cf29 Makes VV'ing ID cards easier. 2017-05-31 08:50:11 -05:00
LetterJay
b33d26c67f Merge pull request #1307 from Citadel-Station-13/upstream-merge-27846
[MIRROR] Flamethrower fixes
2017-05-30 15:48:44 -05:00
LetterJay
f2730839d4 Merge pull request #1168 from Citadel-Station-13/upstream-merge-26361
[MIRROR]  Refactors explosions
2017-05-30 15:15:51 -05:00
CitadelStationBot
d4af5004a6 Flamethrower fixes 2017-05-30 14:55:42 -05:00
LetterJay
ae22a1876a 41 files changed, original only had 4. SPACES. 2017-05-30 14:36:11 -05:00
CitadelStationBot
b05d56d9fa Increase plasmaman tank volume 2017-05-29 11:07:23 -05:00
CitadelStationBot
afbfb66386 Splits mining_mobs.dm into separate files 2017-05-29 01:17:13 -05:00
CitadelStationBot
e3d228aa00 [MIRROR] ID card mapping aid (#1223)
* ID card mapping aid

* Update cards_ids.dm

* lf
2017-05-28 15:19:46 -07:00
CitadelStationBot
64562ba0c4 Fixes clown creampie cannon not recharging properly 2017-05-28 08:17:44 -05:00
CitadelStationBot
e9d00c2aff [READY] Adds ability to add bayonets to weapons - Only enabled on kinetic accelerators - refactors gunlight/bayonet sprites to ballistics too (#1191) 2017-05-27 13:36:44 -07:00
CitadelStationBot
6c79b06e2c c4 now takes 3 seconds instead of 5 to plant (#1186) 2017-05-27 13:34:00 -07:00
CitadelStationBot
8a3cd334db Port vapes to Initialize() (#1224) 2017-05-27 13:32:59 -07:00
CitadelStationBot
127a9ff6d4 Vapes are tiny (#1231) 2017-05-27 13:26:50 -07:00
LetterJay
42959d5ae0 Merge pull request #1207 from Citadel-Station-13/upstream-merge-27679
[MIRROR] Ports defibs to Initialize
2017-05-26 23:20:38 -05:00
LetterJay
371a902ff6 Merge pull request #1208 from Citadel-Station-13/upstream-merge-27680
[MIRROR] Ports stunbatons to Initialize
2017-05-26 23:20:28 -05:00
CitadelStationBot
b089a14c53 Ports guns to Initialize 2017-05-26 19:06:39 -05:00
CitadelStationBot
0e40cd7f6d Ports stunbatons to Initialize 2017-05-26 18:03:17 -05:00
CitadelStationBot
04df45c907 Ports defibs to Initialize 2017-05-26 18:02:13 -05:00
CitadelStationBot
11344c4682 Refactors explosions 2017-05-24 16:45:00 -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
a80a00bc6e Merge branch 'master' into upstream-merge-27324 2017-05-23 07:17:45 -05:00