Commit Graph

6039 Commits

Author SHA1 Message Date
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
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
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
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
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
55e2d08b06 Merge pull request #3901 from Citadel-Station-13/upstream-merge-32566
[MIRROR] Space vacuum damage doubled
2017-11-13 11:44:33 -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
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
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
34b3607211 Merge pull request #3867 from Citadel-Station-13/upstream-merge-32504
[MIRROR] Weakrefs
2017-11-13 11:41:38 -06:00
LetterJay
3e55cec1b0 Merge pull request #3862 from Citadel-Station-13/upstream-merge-32498
[MIRROR] Fixes VV not displaying false values in keyed lists
2017-11-13 11:41:18 -06:00
LetterJay
9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
oranges
7c45ae5cb7 Adds Extended Drill Hair 2017-11-13 03:12:44 -06:00
Tad Hardesty
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
LetterJay
7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00
LetterJay
a62be6b939 Merge branch 'master' into upstream-merge-32498 2017-11-12 23:10:50 -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
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
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
nicbn
1b5a1c369b Space vacuum damage doubled (#32566) 2017-11-12 12:54:43 -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
Leo
8814c55bfb Merge pull request #32635 from AnturK/cowardsallofthem
Fixes fleeing the station message accuracy
2017-11-12 11:40:57 -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