36778e9404
Merge pull request #3919 from Citadel-Station-13/upstream-merge-32623
...
[MIRROR] Adds ambience for Reebe.
2017-11-13 11:53:21 -06:00
648477ebe1
Merge pull request #3917 from Citadel-Station-13/upstream-merge-32637
...
[MIRROR] Adds a timer to falsewall code
2017-11-13 11:53:08 -06:00
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
07cb443ba0
Merge pull request #3913 from Citadel-Station-13/upstream-merge-32553
...
[MIRROR] Xrays go through walls but stop on mobs/blob
2017-11-13 11:51:59 -06:00
32bfa75c3a
Merge pull request #3908 from Citadel-Station-13/upstream-merge-32558
...
[MIRROR] Prevent placing posters on diagonal wall corners
2017-11-13 11:50:36 -06:00
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
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
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
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
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
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
9ff35c5b2c
Merge branch 'master' into upstream-merge-32435
2017-11-13 11:30:06 -06:00
182b81a721
Adds ambience for Reebe. ( #32623 )
...
* spooky
* fix 1
* fix 2
2017-11-13 03:45:03 -06:00
a0f70c9364
Adds a timer to falsewall code ( #32637 )
...
* Adds a timer to falsewall code
* better code
* removes a parameter
2017-11-13 03:29:21 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
033f336ed1
Merge pull request #32553 from ExcessiveUseOfCobblestone/ihategoofxray
...
Xrays go through walls but stop on mobs/blob
2017-11-13 03:17:24 -06:00
96b30fa61e
Prevent placing posters on diagonally-smoothed walls ( #32558 )
...
Posters are also knocked off the walls if they change to being
diagonally smoothed later.
2017-11-13 02:33:30 -06:00
7e6283a3f0
Merge branch 'master' into upstream-merge-32504
2017-11-12 23:11:53 -06:00
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
fffe2ea0c0
Adds a multitool_act and a proper check on tool_check ( #32640 )
2017-11-12 19:12:46 -06:00
aa020ea9e8
Update electropack.dm
2017-11-12 16:00:15 -06:00
89b23905b5
Makes clown box consistent with the rest of the boxes
2017-11-12 15:57:01 -06:00
de8e064e45
Update electropack.dm
2017-11-12 15:42:44 -06:00
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
8814c55bfb
Merge pull request #32635 from AnturK/cowardsallofthem
...
Fixes fleeing the station message accuracy
2017-11-12 11:40:57 -06:00
1c8d9b3a4e
Update electropack.dm
2017-11-12 10:38:30 -06:00
77d261aa8a
Update camera_bug.dm
2017-11-12 10:02:32 -06:00
298ddc8fa9
Update scrolls.dm
2017-11-12 08:56:30 -06:00
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
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
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
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
c2d3ad9c3f
Update RPD.dm
2017-11-12 08:15:18 -06:00
75e30e0dd8
Update pipe_dispenser.dm
2017-11-12 08:14:00 -06:00
81d1abe64e
Update message.dm
2017-11-12 08:09:12 -06:00
63fe96fba2
Update honker.dm
2017-11-12 08:08:46 -06:00
500307b034
Disposal pipes and pipe dispensers refactor
2017-11-12 00:31:00 -06:00
6ad6cae862
Update navbeacon.dm
2017-11-11 23:09:07 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
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
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
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
545ac04b78
Update simple_vent_controller.dm
2017-11-11 15:55:34 -06:00
9dce395c4a
Update airlock_controller.dm
2017-11-11 15:55:19 -06:00
7b791899b2
Update robot.dm
2017-11-11 15:54:57 -06:00
5cf5625568
Update airlock_maker.dm
2017-11-11 15:54:38 -06:00
eacd5271a2
Update communications.dm
2017-11-11 15:54:17 -06:00
95707bf1b7
fixes 512 compile reminders ( #32582 )
2017-11-11 14:33:22 -06:00
c2d1a16954
Fixes some cases where changeturf were called incorrectly ( #32584 )
2017-11-11 14:32:13 -06:00
6993018d9f
Merge pull request #32578 from YPOQ/factoryfix
...
Fixes AIs being unable to place robotics factories
2017-11-11 14:31:54 -06:00
LetterJay