1c06a2b277
[MIRROR] Fixes goliath tentacles ( #2738 )
...
* Merge pull request #30646 from ChangelingRain/tentafix
Fixes goliath tentacles
* Fixes goliath tentacles
2017-09-13 16:53:52 -05:00
63c94a5c2b
Merge branch 'master' into upstream-merge-30633
2017-09-13 08:00:06 -05:00
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
6b5fbc9bcd
Update one_click_antag.dm
2017-09-13 03:49:32 -05:00
3da71799ab
Garbage collection tweaks and refactors. ( #30118 )
...
* Garbage collection queuing rewriting
* Some Tweaks
* Fixes some queue tracking oddities
* More tweaks
* Remove the middle two queue steps. tis was a silly idea
* New logging.
We store logging datums for use in tracking the stats of shit qdeleted
Added logging for destroy time as well as hard delete time, per type. As well as a few others
* Fix compile for testing
* Does the cyberboss
* does the antur
2017-09-13 01:47:12 -05:00
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
c0a467c2fc
Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415
...
[MIRROR] Nightmare
2017-09-12 23:31:38 -05:00
4ee17d5167
Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583
...
[MIRROR] Fixes initialize hints for a fair number of mobs and items
2017-09-12 23:31:28 -05:00
c924ec765a
Update ed209bot.dm
2017-09-12 23:19:05 -05:00
e88bb9c612
Update shadowpeople.dm
2017-09-12 23:15:53 -05:00
3a7cc3df75
re-nerfs cakehat
2017-09-12 23:01:48 -05:00
1d040d46d1
Merge pull request #2701 from Citadel-Station-13/upstream-merge-30564
...
[MIRROR] Spetsnaz Pyro Bundle Rebalance
2017-09-12 19:17:23 -05:00
912746d8a4
Merge pull request #2700 from Citadel-Station-13/upstream-merge-30584
...
[MIRROR] Fixes ventriloquist dummy
2017-09-12 19:11:09 -05:00
81fdf521fb
Merge pull request #2712 from Citadel-Station-13/upstream-merge-30502
...
[MIRROR] Makes shiny versions of lavaland monsters slightly more distinct
2017-09-12 19:10:21 -05:00
91b7ba491e
Merge pull request #2726 from Citadel-Station-13/upstream-merge-30631
...
[MIRROR] Fixes shuttle lighting issues
2017-09-12 18:21:08 -05:00
8bab6e6748
Merge pull request #2728 from Citadel-Station-13/upstream-merge-30624
...
[MIRROR] Fixes TK implanting yourself with an autosurgeon
2017-09-12 18:20:27 -05:00
c82a2af526
Merge pull request #2725 from Citadel-Station-13/upstream-merge-30637
...
[MIRROR] Adds 5s delay to current immediate ahelp verb returns
2017-09-12 18:19:04 -05:00
0f6e8fed8e
Merge pull request #2721 from Citadel-Station-13/upstream-merge-30602
...
[MIRROR] Fixes admin volume not updating datum var
2017-09-12 18:18:45 -05:00
65c2d41238
Merge pull request #2724 from Citadel-Station-13/upstream-merge-30625
...
[MIRROR] Removes GLOB.all_lighting_objects
2017-09-12 18:17:47 -05:00
9341846304
Merge pull request #30624 from ShizCalev/autosurgeon-tk
...
Fixes TK implanting yourself with an autosurgeon
2017-09-12 17:13:03 -05:00
f2adac2a9a
Merge pull request #30631 from AnturK/literallyfasterthanlight
...
Fixes shuttle lighting issues
2017-09-12 17:10:42 -05:00
3e6c0624fc
Merge pull request #30637 from tgstation/Cyberboss-patch-6
...
Adds 5s delay to current immediate ahelp verb returns
2017-09-12 17:09:31 -05:00
d7c905e709
Removes GLOB.all_lighting_objects
2017-09-12 16:54:06 -05:00
cd525c51d9
Fixes admin volume not updating datum var
2017-09-12 14:16:49 -05:00
b1dccf49a3
Adds 360p MP4 a+v stream to play_web_sound ( #30598 )
...
Also moves aac to the bottom
2017-09-12 14:16:36 -05:00
eeadba6f18
Merge pull request #2696 from Citadel-Station-13/upstream-merge-30494
...
[MIRROR] Adds missing span-endings
2017-09-12 06:32:45 -05:00
342ee9cfb3
Merge pull request #2717 from Citadel-Station-13/sssssssssssssssssssssssssssssss
...
Sssssssssssssssssssssssssssssss
2017-09-12 03:21:06 -05:00
6413dd5264
Merge pull request #2699 from Citadel-Station-13/upstream-merge-30551
...
[MIRROR] Mechs now can be connected to atmos ports
2017-09-12 03:19:23 -05:00
6b27a81e61
Update powers.dm
2017-09-12 03:10:07 -05:00
e2536975dc
Merge pull request #2675 from Citadel-Station-13/upstream-merge-30554
...
[MIRROR] Fixes admin topics
2017-09-12 03:07:04 -05:00
fcfd4a2ce1
Update ed209bot.dm
2017-09-12 03:06:43 -05:00
4cd4c6df70
Merge pull request #2697 from Citadel-Station-13/upstream-merge-30574
...
[MIRROR] Adds a few SDQL2 list wrappers
2017-09-12 02:41:30 -05:00
dac6cc56e4
Merge branch 'master' into upstream-merge-30494
2017-09-12 02:40:24 -05:00
8223692c32
Merge pull request #2684 from Citadel-Station-13/upstream-merge-30558
...
[MIRROR] Adds href tokens to topic.dm
2017-09-12 02:37:49 -05:00
4fdc313486
Update topic.dm
2017-09-12 02:36:28 -05:00
01b0e754c2
Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531
...
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-12 02:35:17 -05:00
b8f2fe00e5
Update topic.dm
2017-09-12 02:31:25 -05:00
caca1d1794
Merge pull request #2690 from Citadel-Station-13/upstream-merge-30553
...
[MIRROR] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume!
2017-09-12 01:22:11 -05:00
a5a8f8faba
Merge pull request #2691 from Citadel-Station-13/upstream-merge-30530
...
[MIRROR] Adds Gondoland and the rare Gondolas
2017-09-12 01:21:09 -05:00
4d7c4e6da9
Merge branch 'master' into upstream-merge-30554
2017-09-12 01:20:05 -05:00
7deeac86eb
Merge pull request #2670 from Citadel-Station-13/upstream-merge-29839
...
[MIRROR] [s] Adds a security token to all admin hrefs
2017-09-12 01:17:56 -05:00
3e62306f0a
Merge pull request #2685 from Citadel-Station-13/upstream-merge-30580
...
[MIRROR] Fixes breathing from softcrit (hopefully)
2017-09-12 01:09:54 -05:00
fcbebe6423
Update life.dm
2017-09-12 01:03:11 -05:00
2ae18cd35e
Update life.dm
2017-09-12 00:52:07 -05:00
d045103744
Update life.dm
2017-09-12 00:48:22 -05:00
1cea5d6e4b
Update one_click_antag.dm
2017-09-11 23:41:45 -05:00
f60d57520b
Merge branch 'master' into upstream-merge-29839
2017-09-11 23:22:39 -05:00
6c9609a7ee
Merge branch 'master' into upstream-merge-30580
2017-09-11 23:19:07 -05:00
CitadelStationBot