Commit Graph

671 Commits

Author SHA1 Message Date
LetterJay
29da073bb9 Merge pull request #1284 from Citadel-Station-13/upstream-merge-27840
[MIRROR] Fixes doubled post-round end time.
2017-05-30 18:40:54 -05:00
LetterJay
c81dc599e3 Merge pull request #1174 from Citadel-Station-13/upstream-merge-27414
[MIRROR] 4th Attempt at 60% shuttle recall gang murderbone thing
2017-05-30 16:04:41 -05:00
LetterJay
bc5ecc91b5 rej clean 2017-05-30 15:55:00 -05:00
LetterJay
cbe12313d2 Merge pull request #1306 from Citadel-Station-13/upstream-merge-27844
[MIRROR] Lavaland - Ruins now have lights
2017-05-30 15:49:40 -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
f259908266 Merge pull request #1196 from Citadel-Station-13/upstream-merge-27675
[MIRROR] Fixes Gang War's infinity shuttle
2017-05-30 15:48:23 -05:00
LetterJay
377d3ffbf9 Merge pull request #1184 from Citadel-Station-13/upstream-merge-27631
[MIRROR] Turret bases will properly layer under turret covers
2017-05-30 15:47:00 -05:00
LetterJay
a38973ece8 commit 2017-05-30 15:44:41 -05:00
LetterJay
c28818b893 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27414 2017-05-30 15:29:24 -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
CitadelStationBot
87593dd8f7 Lavaland - Ruins now have lights 2017-05-30 14:46:30 -05:00
LetterJay
ae22a1876a 41 files changed, original only had 4. SPACES. 2017-05-30 14:36:11 -05:00
LetterJay
b2afc61f54 cyka 2017-05-30 14:18:32 -05:00
LetterJay
80896d0371 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27675 2017-05-30 14:14:25 -05:00
LetterJay
c2f8df8a6f Merge pull request #1286 from Citadel-Station-13/upstream-merge-27791
[MIRROR] Gives abductees a message saying they can't remember the abduction
2017-05-29 15:03:34 -05:00
LetterJay
7750095289 Merge pull request #1281 from Citadel-Station-13/upstream-merge-27770
[MIRROR] AI holocall hangups
2017-05-29 15:01:43 -05:00
LetterJay
b0681a0ae2 Merge pull request #1288 from Citadel-Station-13/upstream-merge-27802
[MIRROR] Fixes holopads not returning an initialize hint
2017-05-29 15:00:52 -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
86123e0271 Fixes holopads not returning an initialize hint 2017-05-29 11:03:08 -05:00
CitadelStationBot
18db38f7db Gives abductees a message saying they can't remember the abduction 2017-05-29 09:19:20 -05:00
CitadelStationBot
d60e7c9d2a AI holocall hangups 2017-05-29 06:38:24 -05:00
LetterJay
750baf3dca multi level 2017-05-29 02:15:26 -05:00
LetterJay
aefca24012 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27697 2017-05-29 02:12:41 -05:00
CitadelStationBot
6b6a156c2f Lavaland Lighting Fix + ruin varedit cleanup (#1257) 2017-05-28 15:27:50 -07:00
CitadelStationBot
53fb384b63 Emagging a cloner drops bits, cloners don't keep extra flesh (#1264) 2017-05-28 15:22:10 -07: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
fcb3a53072 Merge pull request #1243 from Citadel-Station-13/upstream-merge-27725
[MIRROR] Changes incorporeal movement to use defines
2017-05-28 14:33:22 -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
LetterJay
c07544a553 Merge pull request #1258 from Citadel-Station-13/upstream-merge-27739
[MIRROR] Removes duplicate sharpener from gang uplink
2017-05-28 14:31:56 -05:00
LetterJay
52606cba53 Merge pull request #1260 from Citadel-Station-13/upstream-merge-27750
[MIRROR] Fixes clown creampie cannon not recharging properly
2017-05-28 14:31:36 -05:00
CitadelStationBot
64562ba0c4 Fixes clown creampie cannon not recharging properly 2017-05-28 08:17:44 -05:00
CitadelStationBot
f89d732d0a Removes duplicate sharpener from gang uplink 2017-05-28 08:16:35 -05:00
CitadelStationBot
4b9a7ce9cf Adds AI follow links to PDA messages and holopad speech 2017-05-28 08:14:21 -05:00
CitadelStationBot
fa42d8631a Comm Console Fix 2017-05-27 23:27:19 -05:00
CitadelStationBot
29c15fe9fd Centcomm is on Z1 2017-05-27 20:57:26 -05:00
CitadelStationBot
2cc74f4a8f Changes incorporeal movement to use defines 2017-05-27 20:55:04 -05:00
CitadelStationBot
d1e38d9e1f Fixed very minor capitalization and punctuation inconsistencies. (#1104) 2017-05-27 13:43:20 -07:00
CitadelStationBot
a1ebd8c791 Refactors how diagonal smoothing underlays work (#1187) 2017-05-27 13:40:09 -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
833c0c549c Make dance machine mob dancing asynchronous (#1221) 2017-05-27 13:35:52 -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
740f172772 Fixes airlocks having two Initializes (#1198) 2017-05-27 13:32:49 -07:00
CitadelStationBot
7b820cf7ca Fixes missing bracket in domi spawner message (#1234) 2017-05-27 13:32:11 -07:00
CitadelStationBot
3ed1975dda Fixes dirty in lavaland (#1227) 2017-05-27 13:31:13 -07:00