Commit Graph

2335 Commits

Author SHA1 Message Date
LetterJay 77d261aa8a Update camera_bug.dm 2017-11-12 10:02:32 -06:00
LetterJay 298ddc8fa9 Update scrolls.dm 2017-11-12 08:56: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
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 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 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 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
Emmett Gaines c2d1a16954 Fixes some cases where changeturf were called incorrectly (#32584) 2017-11-11 14:32:13 -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
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
LetterJay 108e04e525 Merge pull request #3884 from Citadel-Station-13/upstream-merge-32567
[MIRROR] [s] Fixes RPDs qdel'ing girders and causing runtimes
2017-11-11 12:40:24 -06:00
LetterJay 35a49d5178 Merge pull request #3873 from Citadel-Station-13/upstream-merge-32516
[MIRROR] removes pipe construction cache
2017-11-11 12:38:45 -06:00
LetterJay 4fedb15f3b Merge pull request #3871 from Citadel-Station-13/upstream-merge-32526
[MIRROR] Fix bluespace shelters smoothing with non-shelter walls
2017-11-11 12:38:21 -06:00
LetterJay fc04d94a29 Merge pull request #3870 from Citadel-Station-13/upstream-merge-32530
[MIRROR] Makes editing movements delay configs have an effect again
2017-11-11 12:37:59 -06:00
LetterJay a3ba99a7e8 Merge pull request #3869 from Citadel-Station-13/upstream-merge-32531
[MIRROR] Fixes word crimes
2017-11-11 12:37:43 -06:00
LetterJay 9071fde91b Merge pull request #3860 from Citadel-Station-13/upstream-merge-32515
[MIRROR] Process_Spacemove proc improvement
2017-11-11 12:36:35 -06:00
deathride58 59f654f8b9 [s] Fixes RPDs qdel'ing girders and causing runtimes (#32567)
* fixes qdeling girders and lattices with RPDs and other weird edge cases

* thanks mom the shitcode's cleaner now

* 👍
2017-11-10 17:55:12 -06:00
duncathan salt 3c8eef9243 removes pipe construction cache (#32516) 2017-11-09 11:14:43 -06:00
Tad Hardesty 5f8d368d9f Fix bluespace shelters smoothing with non-shelter walls (#32526) 2017-11-09 11:07:15 -06:00
Jordan Brown 248d63fa3a Makes editing movements delay configs have an effect again (#32530) 2017-11-09 11:06:03 -06:00
swindly 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJay 8effd8c87e Merge pull request #3864 from Citadel-Station-13/upstream-merge-32509
[MIRROR] buffs ripley mining equipment
2017-11-09 03:25:31 -06:00
LetterJay 3a455b17d3 Merge pull request #3859 from Citadel-Station-13/upstream-merge-32503
[MIRROR] Fixes power_change being called on un-initialized machines
2017-11-09 03:18:42 -06:00
LetterJay 0473aedc1c Merge pull request #3858 from deathride58/boxfixesandothersyncs
Map syncs with upstream + small Boxstation fixes and tweaks
2017-11-09 03:18:34 -06:00
LetterJay 41b60c6d1e Merge pull request #3845 from Citadel-Station-13/upstream-merge-32441
[MIRROR] Crayon rotation as a type var
2017-11-09 03:18:17 -06:00
Iamgoofball 1e2ecf3ef7 buffs ripley mining equipment (#32509)
* buffs ripley mining equipment

done in separate PR in case people want just this change instead of the others
1. increased range on the drill
2. halved the cooldown on the drill
3. doubled the speed of the ore pulse

* Why argue about this for days when I can just update it myself
2017-11-09 00:44:28 -06:00
Blute1 e6031b0d5c Process_Spacemove proc improvement 2017-11-08 19:51:57 -06:00
Emmett Gaines f1cbf4e0a3 fixes power_change being called on un-initialized machines (#32503) 2017-11-08 19:51:48 -06:00
deathride58 2f21f16b53 initial commit - syncs and fiXES EVERYTHING WRONG ABOUT BOX HOLY FUCK HOW DID NOBODY REPORT ALL THIS SHIT 2017-11-08 17:04:20 -05:00
LetterJay a297f4bc7f Update crayon.dm 2017-11-08 02:22:48 -06:00
LetterJay 448326cd60 Merge pull request #3856 from Citadel-Station-13/upstream-merge-32466
[MIRROR] Fixes turf_decal layering
2017-11-08 02:21:13 -06:00
LetterJay ee4415e864 Merge pull request #3851 from Citadel-Station-13/upstream-merge-32399
[MIRROR] Multiple fixes in RPD and pipe construciton
2017-11-08 01:46:33 -06:00
LetterJay db65ced87d Merge pull request #3848 from Citadel-Station-13/upstream-merge-32446
[MIRROR] Xenobio blobbernauts can no longer walk on blob tiles
2017-11-08 01:45:28 -06:00
LetterJay 56415d62d3 Merge pull request #3847 from Citadel-Station-13/upstream-merge-32448
[MIRROR] (Hopefully!) Final clockwork marauder balancing pass
2017-11-08 01:44:51 -06:00
ShizCalev 88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00
ACCount 0d691189aa Multiple fixes in RPD and pipe construciton (#32399)
* Multiple fixes in RPD and pipe construciton

* Integrates another fix PR to avoid conflicts
2017-11-07 14:26:15 -06:00
MoreRobustThanYou 4b7970f4f7 Xenobio blobbernauts can no longer walk on blob tiles (#32446) 2017-11-07 10:30:21 -06:00
Ashe Higgs 577d1b7d20 Marauder balancing pass (#32448) 2017-11-07 09:57:26 -06:00
Jordie 5bcaf7a3b1 Crayon rotation as a type var 2017-11-07 08:03:32 -06:00
vuonojenmustaturska 355de66eeb Allows non-humans to be chem scanned via the health analyzer (#32457) 2017-11-07 08:02:22 -06:00
LetterJay c393addda3 Merge pull request #3839 from Citadel-Station-13/upstream-merge-32046
[MIRROR] Plush Ratvar can now fight plush Nar-Sie
2017-11-07 04:46:32 -06:00
LetterJay f254e6fb9d Merge pull request #3838 from Citadel-Station-13/upstream-merge-32408
[MIRROR] Fixes hand tele losing ranged portal-dispel function
2017-11-07 04:45:52 -06:00