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
LetterJay
da70da9c89
Merge pull request #3887 from Citadel-Station-13/upstream-merge-32592
...
[MIRROR] Fixes medbots not injecting from one tile away
2017-11-11 15:57:08 -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
3b14c035cd
Merge pull request #3891 from Citadel-Station-13/upstream-merge-32577
...
[MIRROR] Fixes lich revival text spelling
2017-11-11 15:56:35 -06:00
AnturK
f6e07cf824
Makes false alarm use more explicit in event code.
2017-11-11 14:36:36 -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
6962cf8b24
Merge pull request #32577 from PKPenguin321/patch-13
...
Fixes lich revival text spelling
2017-11-11 14:32:04 -06:00
Leo
64d0c4711f
Merge pull request #32583 from Iamgoofball/patch-334
...
Frog masks no longer have a sound
2017-11-11 14:31:37 -06:00
Dax Dupont
83c40d5fcc
Fixes medbots not injecting from one tile away
2017-11-11 14:31:29 -06:00
LetterJay
29cf96f2d0
Merge pull request #3881 from Citadel-Station-13/upstream-merge-32560
...
[MIRROR] Renames charcoal bottles
2017-11-11 12:40:08 -06:00
LetterJay
88c67ccaa7
Merge pull request #3872 from Citadel-Station-13/upstream-merge-32518
...
[MIRROR] Ensures sentienced animals know how to speak all the languages their master does
2017-11-11 12:38:32 -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
Kyle Spier-Swenson
2d8fc6de61
SSoverlay improvements and tweaks ( #32371 )
...
* Overlay per-type cost logging.
Overlays will now log how long each type took to process.
Changed up how overlays was done to account for the fact its a queue and not a processor. (it was using almost none of the processing subsystem framework)
Made the overlay loop faster by making it not cut the list until the end.
Added a simple generic benchmark stat tracking system.
I don't know how much overhead this adds to overlays. i may put it behind testing or something, but i do want to test this on the serbers to get some stats.
* Removes flush() as it was creating race conditions
* Use ref
* text2file
* Atoms added as an overlay will have their pending overlays compiled before being converted to an appearance
2017-11-10 13:26:23 -06:00
Leo
c11dc9d20f
Merge pull request #32560 from Mark9013100/11/9/17_char_antitox
...
Renames charcoal bottles
2017-11-10 09:10:41 -06:00
as334
7f9800e8fa
Assmos tweaks/minor additions. ( #32400 )
...
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.
* Review response.
* tanks now melt above 1 Million degrees Kelvin.
2017-11-10 01:31:16 -06:00
Jordan Brown
114936682c
Merge pull request #32545 from Buggy123/patch-33
...
clamps view range and add view range to a minimum of 7
2017-11-09 23:25:23 -06:00
Jordan Brown
b6e7e8501d
Merge pull request #32556 from Cruix/deep_fryer
...
Fixed teleporting food out of the deep fryer
2017-11-09 23:21:59 -06:00
PKPenguin321
1aeb81cc25
Ensures sentienced animals know how to speak all the languages their master does ( #32518 )
...
* Ensures sentienced animals know how to speak Common
* Give all of master's languages
* Languages
2017-11-09 11:08:25 -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
a9d8bf1c7a
Merge pull request #3822 from Citadel-Station-13/upstream-merge-32379
...
[MIRROR] Scale fullscreen overlays to the view size
2017-11-09 03:24:57 -06:00
LetterJay
b8fb23c964
Merge pull request #3818 from Citadel-Station-13/upstream-merge-32374
...
[MIRROR] Fixes canceling cavity implants
2017-11-09 03:24:48 -06:00
LetterJay
d6e5942baf
Merge branch 'master' into upstream-merge-31176
2017-11-09 03:24:38 -06:00
