Commit Graph

6014 Commits

Author SHA1 Message Date
LetterJay
97757d2c87 Merge pull request #3894 from Citadel-Station-13/upstream-merge-32559
[MIRROR] Makes false alarm use more explicit in event code.
2017-11-13 11:42:53 -06:00
LetterJay
9a80e5f91c Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582
[MIRROR] Fixes 512 compile reminders
2017-11-13 11:42:40 -06:00
LetterJay
34b3607211 Merge pull request #3867 from Citadel-Station-13/upstream-merge-32504
[MIRROR] Weakrefs
2017-11-13 11:41:38 -06:00
LetterJay
3e55cec1b0 Merge pull request #3862 from Citadel-Station-13/upstream-merge-32498
[MIRROR] Fixes VV not displaying false values in keyed lists
2017-11-13 11:41:18 -06:00
LetterJay
7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00
LetterJay
a62be6b939 Merge branch 'master' into upstream-merge-32498 2017-11-12 23:10:50 -06:00
LetterJay
9fefd15f66 Merge branch 'master' into upstream-merge-32247 2017-11-12 23:09:10 -06:00
LetterJay
3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161
[MIRROR] 512 forward compatibility merge
2017-11-12 23:06:55 -06:00
LetterJay
aa020ea9e8 Update electropack.dm 2017-11-12 16:00:15 -06:00
LetterJay
de8e064e45 Update electropack.dm 2017-11-12 15:42:44 -06:00
LetterJay
768e80544e Update autolathe_designs.dm 2017-11-12 15:41:25 -06:00
LetterJay
f812be1ee0 Update autolathe_designs.dm 2017-11-12 14:46:18 -06:00
LetterJay
e97bc1028e Update examine.dm 2017-11-12 14:09:20 -06:00
LetterJay
fa6b955dcf Update tgui.dm 2017-11-12 13:18:42 -06:00
LetterJay
5ca3389cc2 Update clipboard.dm 2017-11-12 13:17:59 -06:00
LetterJay
8d78a999e1 Update jellypeople.dm 2017-11-12 13:17:41 -06:00
LetterJay
6da7d8e8b5 Update posibrain.dm 2017-11-12 13:17:08 -06:00
LetterJay
439723caff Update adminhelp.dm 2017-11-12 11:18:11 -06:00
LetterJay
1c8d9b3a4e Update electropack.dm 2017-11-12 10:38:30 -06:00
LetterJay
77d261aa8a Update camera_bug.dm 2017-11-12 10:02:32 -06:00
LetterJay
d8c25f656b Update admin_investigate.dm 2017-11-12 08:56:53 -06:00
LetterJay
298ddc8fa9 Update scrolls.dm 2017-11-12 08:56:30 -06:00
LetterJay
ef700ef8d7 Merge pull request #3898 from Citadel-Station-13/upstream-merge-32627
[MIRROR] Fixes AI anti-cheat false positives
2017-11-12 08:21:56 -06:00
LetterJay
94578d2f37 Merge pull request #3897 from Citadel-Station-13/upstream-merge-32621
[MIRROR] Fixes colossus projectiles only shooting north
2017-11-12 08:21:39 -06:00
LetterJay
07afeccfe9 Merge pull request #3885 from Citadel-Station-13/upstream-merge-32602
[MIRROR] Items no longer need to check for tools in attackby
2017-11-12 08:21:26 -06:00
LetterJay
9b406f88a7 Merge pull request #3879 from Citadel-Station-13/upstream-merge-32400
[MIRROR] Assmos tweaks/minor additions.
2017-11-12 08:21:09 -06:00
LetterJay
f2ef581114 Merge pull request #3878 from Citadel-Station-13/upstream-merge-32545
[MIRROR] clamps view range and add view range to a minimum of 7
2017-11-12 08:20:58 -06:00
LetterJay
94bdcb6848 Merge pull request #3876 from Citadel-Station-13/upstream-merge-32556
[MIRROR] Fixed teleporting food out of the deep fryer
2017-11-12 08:20:10 -06:00
LetterJay
1c8ae63808 Merge pull request #3836 from Citadel-Station-13/upstream-merge-32453
[MIRROR] Little change. More the same
2017-11-12 08:20:01 -06:00
LetterJay
7eccc3b2db Merge pull request #3875 from Citadel-Station-13/upstream-merge-32445
[MIRROR] ok now i kinda tested the ark examine
2017-11-12 08:19:30 -06:00
LetterJay
4f5a728415 Update weightless.dm 2017-11-12 08:12:54 -06:00
LetterJay
c7a25534e4 Update spontaneous_appendicitis.dm 2017-11-12 08:12:43 -06:00
LetterJay
65daec8f75 Update prison_break.dm 2017-11-12 08:12:32 -06:00
LetterJay
a29c317a1d Update mass_hallucination.dm 2017-11-12 08:12:21 -06:00
LetterJay
eb193ef22b Update ion_storm.dm 2017-11-12 08:12:11 -06:00
LetterJay
e8e18ebc5f Update friday13th.dm 2017-11-12 08:11:50 -06:00
LetterJay
3ae0051dc7 Update dust.dm 2017-11-12 08:11:41 -06:00
LetterJay
475e604892 Update communications_blackout.dm 2017-11-12 08:11:28 -06:00
LetterJay
a5a7b92897 Update anomaly_vortex.dm 2017-11-12 08:11:14 -06:00
LetterJay
c311b6c87e Update anomaly_grav.dm 2017-11-12 08:11:06 -06:00
LetterJay
3b6e596a45 Update anomaly_flux.dm 2017-11-12 08:10:56 -06:00
LetterJay
1be11114c5 Update anomaly_bluespace.dm 2017-11-12 08:10:48 -06:00
LetterJay
fdb3324a4b Update anomaly.dm 2017-11-12 08:10:37 -06:00
LetterJay
81d1abe64e Update message.dm 2017-11-12 08:09:12 -06:00
LetterJay
63fe96fba2 Update honker.dm 2017-11-12 08:08:46 -06:00
YPOQ
561b9b88f4 Fixes AI anti-cheat false positives (#32627) 2017-11-12 02:08:13 -06:00
kevinz000
80a06368bf Fixes Colossus Projectiles (#32621) 2017-11-12 01:27:20 -06:00
LetterJay
6ad6cae862 Update navbeacon.dm 2017-11-11 23:09:07 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay
da70da9c89 Merge pull request #3887 from Citadel-Station-13/upstream-merge-32592
[MIRROR] Fixes medbots not injecting from one tile away
2017-11-11 15:57:08 -06:00