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
|
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 |
|
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
|
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 |
|
CitadelStationBot
|
11c74ee6b4
|
Adds cycling delay to PKborg dampeners, fixes dampener projectors leaving fields behind when server is lagging
|
2017-05-26 11:13:15 -05:00 |
|
CitadelStationBot
|
e4fc936789
|
INDESTRUCTIBLE objects are no longer affected by explosions
|
2017-05-25 08:38:05 -05:00 |
|
CitadelStationBot
|
11344c4682
|
Refactors explosions
|
2017-05-24 16:45:00 -05:00 |
|
LetterJay
|
869953cd18
|
Merge pull request #1123 from Citadel-Station-13/upstream-merge-27503
[MIRROR] Changes investigate logs to use a define
|
2017-05-24 12:34:36 -05:00 |
|
CitadelStationBot
|
88d88741f5
|
Splits equipment.dm into several component files
|
2017-05-24 08:28:08 -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
|
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 |
|
CitadelStationBot
|
3a97af10cf
|
Water wets hide, you can microwave wet leather
|
2017-05-24 00:18:51 -05:00 |
|
CitadelStationBot
|
e02290bf2b
|
Replaced mob spawner vars with outfits
|
2017-05-23 07:57:42 -05:00 |
|
LetterJay
|
a80a00bc6e
|
Merge branch 'master' into upstream-merge-27324
|
2017-05-23 07:17:45 -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
|
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
|
939362fc94
|
Merge pull request #1120 from Citadel-Station-13/upstream-merge-27458
[MIRROR] Adds webbing
|
2017-05-23 05:13:38 -05:00 |
|
LetterJay
|
b0c10c5898
|
Merge pull request #1122 from Citadel-Station-13/upstream-merge-27532
[MIRROR] DNA injector inject proc now properly returns success
|
2017-05-23 05:12:32 -05:00 |
|
CitadelStationBot
|
e9cdeec4f6
|
Removes HasProx testing message
|
2017-05-22 22:48:13 -05:00 |
|
CitadelStationBot
|
01cd2039e5
|
Changes investigate logs to use a define
|
2017-05-22 22:45:54 -05:00 |
|
CitadelStationBot
|
1b5d04bfb3
|
DNA injector inject proc now properly returns success
|
2017-05-22 22:44:49 -05:00 |
|
CitadelStationBot
|
63dd699509
|
Adds webbing
|
2017-05-22 22:20:14 -05:00 |
|
LetterJay
|
ab50a3eca5
|
Merge pull request #1068 from Citadel-Station-13/upstream-merge-27283
[MIRROR] Decentralized and Vastly Improved Gang Influence System
|
2017-05-22 16:28:57 -05:00 |
|
LetterJay
|
9df8057e0e
|
Merge pull request #1050 from Citadel-Station-13/upstream-merge-27344
[MIRROR] Repaths /obj/effect/overlay/temp to /obj/effect/temp_visual
|
2017-05-22 12:40:18 -05:00 |
|
LetterJay
|
8791ad036f
|
Merge pull request #1045 from Citadel-Station-13/upstream-merge-27268
[MIRROR] World.dm Refactor
|
2017-05-22 12:39:52 -05:00 |
|
LetterJay
|
d1db0044d1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27344
|
2017-05-22 11:52:18 -05:00 |
|