LetterJay
|
c4b280b269
|
Merge pull request #1323 from Citadel-Station-13/upstream-merge-27879
[MIRROR] Fixes posters
|
2017-06-02 22:40:28 -05:00 |
|
LetterJay
|
c9a1735deb
|
Merge pull request #1318 from Citadel-Station-13/upstream-merge-27871
[MIRROR] [Meta] Var Cleanup and tweaks
|
2017-06-02 22:39:23 -05:00 |
|
CitadelStationBot
|
d36bc75074
|
Fixes posters
|
2017-05-31 19:29:20 -05:00 |
|
CitadelStationBot
|
946a6b1146
|
[Meta] Var Cleanup and tweaks
|
2017-05-31 08:57:18 -05:00 |
|
CitadelStationBot
|
4eb5a9bf21
|
Mapped active shieldgens
|
2017-05-31 08:56:07 -05:00 |
|
LetterJay
|
b19115e10f
|
Merge branch 'master' into upstream-merge-27454
|
2017-05-30 23:48:25 -05:00 |
|
LetterJay
|
fbbceadc6e
|
Merge branch 'master' into AllMapChangesInOne
|
2017-05-30 23:08:32 -05:00 |
|
LetterJay
|
9b00499d24
|
It's been a long night
|
2017-05-30 22:41:22 -05:00 |
|
LetterJay
|
9ba058930e
|
Update Space_Station_13_areas.dm
|
2017-05-30 22:18:02 -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
|
1763c4b65d
|
Merge pull request #1114 from Citadel-Station-13/upstream-merge-27530
[MIRROR] Area Refactor + Var-edit Cleanup
|
2017-05-30 20:49:42 -05:00 |
|
LetterJay
|
8948f2d636
|
FIXING SHIT.
|
2017-05-30 20:16:00 -05:00 |
|
LetterJay
|
adb7a9b6ff
|
rej clean up
more areas
|
2017-05-30 20:08:53 -05:00 |
|
LetterJay
|
0fe4a33b15
|
Merge pull request #1100 from Citadel-Station-13/upstream-merge-27453
[MIRROR] [All stations] Cleaned up var-editted areas
|
2017-05-30 19:50:35 -05:00 |
|
LetterJay
|
f6f0523fa9
|
Merge pull request #1200 from Citadel-Station-13/upstream-merge-27661
[MIRROR] Fixes ex_act not having waitfor = FALSE
|
2017-05-30 18:46:40 -05:00 |
|
LetterJay
|
abd0e85efa
|
Merge pull request #1197 from Citadel-Station-13/upstream-merge-27669
[MIRROR] Splits up mine_items.dm
|
2017-05-30 18:46:24 -05:00 |
|
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
|
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
|
41065c4e73
|
waitfor
|
2017-05-30 16:21:24 -05:00 |
|
LetterJay
|
6b7dffddb2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27661
|
2017-05-30 16:05:53 -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 |
|