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
|
402b52229f
|
shit always breaks somehow.
|
2017-05-30 18:37:28 -05:00 |
|
LetterJay
|
fce022389a
|
Update job.dm
|
2017-05-30 17:07:04 -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
|
5073d8e6f2
|
rej
|
2017-05-30 16:43:09 -05:00 |
|
LetterJay
|
c3a243106f
|
wew
|
2017-05-30 16:42:56 -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
|
a821d90a37
|
commit
|
2017-05-30 15:54:42 -05:00 |
|
LetterJay
|
dda7ae1658
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27840
|
2017-05-30 15:54:03 -05:00 |
|
LetterJay
|
df34173509
|
Merge pull request #1301 from Citadel-Station-13/upstream-merge-27831
[MIRROR] Fixes multi cyborgs
|
2017-05-30 15:50:56 -05:00 |
|
LetterJay
|
5201e60356
|
Merge pull request #1303 from Citadel-Station-13/upstream-merge-27820
[MIRROR] Adds some silly new meson failure excuses
|
2017-05-30 15:50:40 -05:00 |
|
LetterJay
|
9474de0028
|
Merge pull request #1304 from Citadel-Station-13/upstream-merge-27754
[MIRROR] !!!Projectile spread tweaks!!! <-- Yes, this is a huge balance change for dualwielding!
|
2017-05-30 15:50:21 -05:00 |
|
LetterJay
|
ebaa245f0b
|
Merge pull request #1305 from Citadel-Station-13/upstream-merge-27839
[MIRROR] Fixes another holocall runtime
|
2017-05-30 15:50:07 -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
|
33af767101
|
Merge pull request #1169 from Citadel-Station-13/upstream-merge-27596
[MIRROR] Nerfs plasma cost
|
2017-05-30 15:46:34 -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
|
2de531b2e7
|
Merge pull request #1173 from Citadel-Station-13/upstream-merge-27607
[MIRROR] Fixed some jobs not spawning with their box
|
2017-05-30 15:18:54 -05:00 |
|
LetterJay
|
3c89f142ed
|
Update materials.dm
|
2017-05-30 15:17:00 -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 |
|
LetterJay
|
9a64d4731c
|
Merge pull request #1167 from Citadel-Station-13/upstream-merge-27589
[MIRROR] Adds marker beacons to mining as a vendible item
|
2017-05-30 15:02:44 -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 |
|
CitadelStationBot
|
6c958c129a
|
Fixes another holocall runtime
|
2017-05-30 14:44:25 -05:00 |
|
LetterJay
|
ae22a1876a
|
41 files changed, original only had 4. SPACES.
|
2017-05-30 14:36:11 -05:00 |
|
LetterJay
|
20ea1dd108
|
Merge pull request #1165 from Citadel-Station-13/upstream-merge-27601
[MIRROR] Dot Nonsense: find the current running proc's type!
|
2017-05-30 14:21:33 -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 |
|
CitadelStationBot
|
9deb5069f4
|
!!!Projectile spread tweaks!!! <-- Yes, this is a huge balance change for dualwielding!
|
2017-05-30 11:22:09 -05:00 |
|
CitadelStationBot
|
dceafe4122
|
Adds some silly new meson failure excuses
|
2017-05-30 11:12:56 -05:00 |
|
CitadelStationBot
|
38b10b8c53
|
Fixes multi cyborgs
|
2017-05-30 08:52:22 -05:00 |
|
LetterJay
|
601636f4a1
|
map rotation
|
2017-05-30 01:55:28 -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 |
|