LetterJay
|
35b56f3075
|
Merge branch 'master' into upstream-merge-27773
|
2017-06-06 09:05:26 -05:00 |
|
LetterJay
|
71bb6c930c
|
Merge pull request #1274 from Citadel-Station-13/upstream-merge-27652
[MIRROR] [Centcom] Nanotrasen Private Security 2.0
|
2017-06-06 09:01:33 -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 |
|
LetterJay
|
54549d43a2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27728
|
2017-06-05 23:07:52 -05:00 |
|
CitadelStationBot
|
e8663bee81
|
Refactors the latejoin list
|
2017-06-04 15:08:35 -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
|
e59e7f8d06
|
Fixes bsa not showing up (#1396)
|
2017-06-04 09:03:30 -07:00 |
|
CitadelStationBot
|
f8505883d4
|
Removes dragoontomb ruin and loot. (#1290)
|
2017-06-03 06:39:11 -07:00 |
|
CitadelStationBot
|
043d9b478e
|
Gives the janitor a flyswatter in their roundstart equipment (#1354)
|
2017-06-03 06:37:08 -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 |
|
LetterJay
|
7b346b6241
|
Merge pull request #1342 from Citadel-Station-13/upstream-merge-27932
[MIRROR] Attempts to add items to a storage container beyond its slots limit will obtain a failure message again.
|
2017-06-02 22:47:01 -05: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
|
d36bc75074
|
Fixes posters
|
2017-05-31 19:29:20 -05:00 |
|
LetterJay
|
8f06db65c9
|
Merge pull request #1131 from Citadel-Station-13/upstream-merge-27534
[MIRROR] Replaced mob spawner vars with outfits
|
2017-05-30 21:43:31 -05:00 |
|
LetterJay
|
81e4f39733
|
Merge branch 'master' into upstream-merge-27669
|
2017-05-30 17:02:11 -05:00 |
|
LetterJay
|
976086e490
|
Merge branch 'master' into upstream-merge-27534
|
2017-05-30 16:45:59 -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 |
|
LetterJay
|
aa6d89df07
|
Merge pull request #1291 from Citadel-Station-13/upstream-merge-27769
[MIRROR] Increase plasmaman tank volume
|
2017-05-29 14:58:56 -05:00 |
|
CitadelStationBot
|
94fdea8866
|
Some pAI fixes
|
2017-05-29 14:42:48 -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
|
ee638d81a5
|
Fixes projectile dampening fields being on infinite cooldown (#1263)
|
2017-05-28 15:20:00 -07: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
|
dec17dcfe6
|
Dog beds can now be renamed after new owners (#1238)
|
2017-05-28 15:11:06 -07:00 |
|
CitadelStationBot
|
243148f27c
|
[Centcom] Nanotrasen Private Security 2.0
|
2017-05-28 16:39:14 -05:00 |
|
LetterJay
|
1a28e1ccf8
|
Merge pull request #1255 from Citadel-Station-13/upstream-merge-27706
[MIRROR] Adds AI follow links to PDA messages and holopad speech
|
2017-05-28 14:32:18 -05:00 |
|
CitadelStationBot
|
64562ba0c4
|
Fixes clown creampie cannon not recharging properly
|
2017-05-28 08:17:44 -05:00 |
|
CitadelStationBot
|
4b9a7ce9cf
|
Adds AI follow links to PDA messages and holopad speech
|
2017-05-28 08:14:21 -05:00 |
|
CitadelStationBot
|
c07034f45a
|
The kinetic crusher can now gain bonus effects via trophies gained by killing bosses with it
|
2017-05-27 20:55:08 -05:00 |
|
CitadelStationBot
|
d1e38d9e1f
|
Fixed very minor capitalization and punctuation inconsistencies. (#1104)
|
2017-05-27 13:43:20 -07: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
|
eadfde3cb8
|
Merge pull request #1194 from Citadel-Station-13/upstream-merge-27655
[MIRROR] Adds cycling delay to PKborg dampeners, fixes dampener projectors leaving fields behind when server is lagging
|
2017-05-26 23:22:14 -05: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
|
c5b0f01dcd
|
Splits up mine_items.dm
|
2017-05-26 13:19:42 -05:00 |
|