Commit Graph

2366 Commits

Author SHA1 Message Date
LetterJay
a21a5cf30d Merge pull request #3906 from Citadel-Station-13/upstream-merge-32640
[MIRROR] Adds a multitool_act and a proper check on tool_check
2017-11-13 11:46:41 -06:00
LetterJay
0a21e6e83b Merge pull request #3904 from Citadel-Station-13/upstream-merge-32642
[MIRROR] Makes clown box consistent with the rest of the boxes
2017-11-13 11:45:13 -06:00
LetterJay
228aed8b35 Merge pull request #3902 from Citadel-Station-13/upstream-merge-32546
[MIRROR] Refactor of base machinery a tiny bit more. DONE
2017-11-13 11:44:46 -06:00
LetterJay
0d65074f44 Merge pull request #3899 from Citadel-Station-13/upstream-merge-32635
[MIRROR] Fixes fleeing the station message accuracy
2017-11-13 11:44:16 -06:00
LetterJay
4142105fe6 Merge pull request #3895 from Citadel-Station-13/upstream-merge-32435
[MIRROR] Disposal pipes and pipe dispensers refactor
2017-11-13 11:44:04 -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
9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
LetterJay
7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -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
Leo
fffe2ea0c0 Adds a multitool_act and a proper check on tool_check (#32640) 2017-11-12 19:12:46 -06:00
LetterJay
aa020ea9e8 Update electropack.dm 2017-11-12 16:00:15 -06:00
tortellinitony
89b23905b5 Makes clown box consistent with the rest of the boxes 2017-11-12 15:57:01 -06:00
LetterJay
de8e064e45 Update electropack.dm 2017-11-12 15:42:44 -06:00
Jalleo
300c471da9 Refactor of base machinery a tiny bit more. DONE (#32546)
* Moves a base uid from machienry to a bunch of children as it was literally setting a var that most machines never used. This is probably a good candidate for a component replacement.

* Just checking something

* Does this fix the compiling not working properly?

* And this?

* What is going wrong ugh!

* params["target"] instead of params["set"] bug was there before I even touched it but my compiling of TGUI caused it or something?

* Slight tidying up for what Cyberboss and Antur likes.

* Fixes the things that I was asked to fix
2017-11-12 13:19:23 -06:00
Leo
8814c55bfb Merge pull request #32635 from AnturK/cowardsallofthem
Fixes fleeing the station message accuracy
2017-11-12 11:40:57 -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
298ddc8fa9 Update scrolls.dm 2017-11-12 08:56:30 -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
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
c2d3ad9c3f Update RPD.dm 2017-11-12 08:15:18 -06:00
LetterJay
75e30e0dd8 Update pipe_dispenser.dm 2017-11-12 08:14:00 -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
ACCount
500307b034 Disposal pipes and pipe dispensers refactor 2017-11-12 00:31:00 -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
95707bf1b7 fixes 512 compile reminders (#32582) 2017-11-11 14:33:22 -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
Leo
73cb2ead88 Items no longer need to check for tools in attackby 2017-11-11 14:31:12 -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