LetterJay
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
LetterJay
f0a852ef1e
Merge pull request #3911 from Citadel-Station-13/upstream-merge-32658
...
[MIRROR] Fixes latejoin chaplains not getting their weapon on spawn
2017-11-13 11:51:38 -06:00
LetterJay
a4c2084404
Merge pull request #3910 from Citadel-Station-13/upstream-merge-32557
...
[MIRROR] Adds Extended Drill Hair
2017-11-13 11:51:30 -06:00
LetterJay
bc23305ef9
Merge pull request #3907 from Citadel-Station-13/upstream-merge-32613
...
[MIRROR] Fixes cryo overlay system
2017-11-13 11:50:23 -06:00
LetterJay
f610a6110b
Merge pull request #3903 from Citadel-Station-13/upstream-merge-32597
...
[MIRROR] Fixes stimulum decay
2017-11-13 11:45:00 -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
6e3e6ef6b8
Merge pull request #3900 from Citadel-Station-13/upstream-merge-32585
...
[MIRROR] adjusted default internet song volume to 25
2017-11-13 11:44:25 -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
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
9ff35c5b2c
Merge branch 'master' into upstream-merge-32435
2017-11-13 11:30:06 -06:00
oranges
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
KorPhaeron
3f297ccb79
Fixes chaplain not getting his weapon on spawn ( #32658 )
2017-11-13 03:16:01 -06:00
oranges
7c45ae5cb7
Adds Extended Drill Hair
2017-11-13 03:12:44 -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
nicbn
9ac530dac9
Fixes cryo overlay system ( #32613 )
...
* Fixes cryo overlay system
* oops
2017-11-12 19:28:14 -06:00
LetterJay
768e80544e
Update autolathe_designs.dm
2017-11-12 15:41:25 -06:00
AnturK
d987dcdda8
Fixes stimulum decay ( #32597 )
...
* Fixes stimulum decay
* Nitryl too
* This too.
* Makes stimulum actually apply it's anti-stun changes.
2017-11-12 15:33:20 -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
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
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
Jordan Brown
de54b1cdd8
Merge pull request #32585 from Qbopper/turnitdown
...
adjusted default internet song volume to 25
2017-11-12 12:52:31 -06:00
LetterJay
439723caff
Update adminhelp.dm
2017-11-12 11:18:11 -06:00
LetterJay
d8c25f656b
Update admin_investigate.dm
2017-11-12 08:56:53 -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
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
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
kevinz000
80a06368bf
Fixes Colossus Projectiles ( #32621 )
2017-11-12 01:27:20 -06:00
ACCount
500307b034
Disposal pipes and pipe dispensers refactor
2017-11-12 00:31:00 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
