Commit Graph

5992 Commits

Author SHA1 Message Date
LetterJay
14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -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
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
LetterJay
5a7ea4de92 Merge pull request #3892 from Citadel-Station-13/upstream-merge-32584
[MIRROR] Fixes some cases where changeturf were called incorrectly
2017-11-11 15:56:45 -06:00
LetterJay
3b14c035cd Merge pull request #3891 from Citadel-Station-13/upstream-merge-32577
[MIRROR] Fixes lich revival text spelling
2017-11-11 15:56:35 -06:00
LetterJay
e28a6eb82a Merge pull request #3890 from Citadel-Station-13/upstream-merge-32578
[MIRROR] Fixes AIs being unable to place robotics factories
2017-11-11 15:56:22 -06:00
LetterJay
5af478fa05 Merge pull request #3889 from Citadel-Station-13/upstream-merge-32574
[MIRROR] Fix portable turrets attacking some heads and sec
2017-11-11 15:56:01 -06:00
LetterJay
267f4c14af Merge pull request #3888 from Citadel-Station-13/upstream-merge-32583
[MIRROR] Frog masks no longer have a sound
2017-11-11 15:55:45 -06:00
LetterJay
545ac04b78 Update simple_vent_controller.dm 2017-11-11 15:55:34 -06:00
LetterJay
9dce395c4a Update airlock_controller.dm 2017-11-11 15:55:19 -06:00
LetterJay
7b791899b2 Update robot.dm 2017-11-11 15:54:57 -06:00
LetterJay
5cf5625568 Update airlock_maker.dm 2017-11-11 15:54:38 -06:00
LetterJay
eacd5271a2 Update communications.dm 2017-11-11 15:54:17 -06:00
LetterJay
4605b252f3 Update config_entry.dm 2017-11-11 15:53:20 -06:00
LetterJay
3bd0fda1ba Update unsorted.dm 2017-11-11 15:53:07 -06:00
Emmett Gaines
c2d1a16954 Fixes some cases where changeturf were called incorrectly (#32584) 2017-11-11 14:32:13 -06:00
Leo
6962cf8b24 Merge pull request #32577 from PKPenguin321/patch-13
Fixes lich revival text spelling
2017-11-11 14:32:04 -06:00
Leo
6993018d9f Merge pull request #32578 from YPOQ/factoryfix
Fixes AIs being unable to place robotics factories
2017-11-11 14:31:54 -06:00
Leo
e4793153d8 Merge pull request #32574 from AutomaticFrenzy/patch/turret-access
Fix portable turrets attacking some heads and sec
2017-11-11 14:31:46 -06:00
Leo
64d0c4711f Merge pull request #32583 from Iamgoofball/patch-334
Frog masks no longer have a sound
2017-11-11 14:31:37 -06:00
Dax Dupont
83c40d5fcc Fixes medbots not injecting from one tile away 2017-11-11 14:31:29 -06:00
Jordan Brown
bd88488c39 Updates the clockwork slab description (#32610)
* Updates the clockwork slab description

* Adds period to the end of clockwork slab description
2017-11-11 14:31:21 -06:00