CitadelStationBot
4da91bc330
[MIRROR] Fixes Archaeology not working ( #2744 )
...
* Fixes Archaeology not working (#30547 )
* gg
* fixes that other issue
* ok
* okie dokie
* removes this devil
* Fixes Archaeology not working
2017-09-13 16:53:30 -05:00
LetterJay
c34b5c805f
Merge pull request #2708 from Citadel-Station-13/upstream-merge-30633
...
[MIRROR] Missed some parentheses in multi Z
2017-09-13 08:36:05 -05:00
LetterJay
63c94a5c2b
Merge branch 'master' into upstream-merge-30633
2017-09-13 08:00:06 -05:00
LetterJay
83793fb57d
Merge pull request #2704 from Citadel-Station-13/upstream-merge-30297
...
[MIRROR] Makes the station Z level into a list instead of a single define
2017-09-13 07:55:58 -05:00
LetterJay
470d15fa2b
Update borer_event.dm
2017-09-13 07:13:45 -05:00
LetterJay
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -05:00
CitadelStationBot
5aecacdc44
Automatic changelog generation for PR #2577 [ci skip]
2017-09-13 06:32:18 -05:00
LetterJay
c7952c1361
Merge pull request #2577 from Citadel-Station-13/upstream-merge-30056
...
[MIRROR] Removes fucking gangs
2017-09-13 06:32:16 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
LetterJay
be15a30098
Update mapping.dm
2017-09-13 03:56:06 -05:00
LetterJay
6b5fbc9bcd
Update one_click_antag.dm
2017-09-13 03:49:32 -05:00
LetterJay
c9aa7653bc
Merge pull request #2731 from Citadel-Station-13/upstream-merge-30118
...
[MIRROR] Garbage collection tweaks and refactors.
2017-09-13 03:35:49 -05:00
CitadelStationBot
5e1d95c14e
Garbage collection tweaks and refactors.
2017-09-13 01:47:12 -05:00
Kyle Spier-Swenson
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
LetterJay
aa09cd4785
Update teleport.dm
2017-09-13 00:50:41 -05:00
LetterJay
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
CitadelStationBot
23e40446ae
Automatic changelog generation for PR #2709 [ci skip]
2017-09-12 23:31:39 -05:00
LetterJay
c0a467c2fc
Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415
...
[MIRROR] Nightmare
2017-09-12 23:31:38 -05:00
LetterJay
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
LetterJay
c924ec765a
Update ed209bot.dm
2017-09-12 23:19:05 -05:00
LetterJay
e88bb9c612
Update shadowpeople.dm
2017-09-12 23:15:53 -05:00
LetterJay
6c5774724d
Update sound.dm
2017-09-12 23:15:48 -05:00
LetterJay
f55ad5ec95
Update safe.dm
2017-09-12 23:12:19 -05:00
Poojawa
3a7cc3df75
re-nerfs cakehat
2017-09-12 23:01:48 -05:00
LetterJay
2b8c2d25d7
Merge pull request #2722 from Citadel-Station-13/upstream-merge-30603
...
[MIRROR] Remove an unused bit of code
2017-09-12 19:22:40 -05:00
CitadelStationBot
50ca003ef3
Automatic changelog generation for PR #2701 [ci skip]
2017-09-12 19:17:25 -05:00
LetterJay
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
LetterJay
912746d8a4
Merge pull request #2700 from Citadel-Station-13/upstream-merge-30584
...
[MIRROR] Fixes ventriloquist dummy
2017-09-12 19:11:09 -05:00
CitadelStationBot
73ed2efe9f
Automatic changelog generation for PR #2710 [ci skip]
2017-09-12 19:10:54 -05:00
LetterJay
0429a75e52
Merge pull request #2710 from Citadel-Station-13/upstream-merge-30592
...
[MIRROR] Fixed changeling augmented eyesight ability
2017-09-12 19:10:52 -05:00
LetterJay
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
LetterJay
e24de430f5
Merge pull request #2730 from Citadel-Station-13/upstream-merge-30608
...
[MIRROR] adds logging to graivpult precision throwing
2017-09-12 19:09:44 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
f742ad8da0
Merge pull request #2719 from Citadel-Station-13/upstream-merge-30578
...
[MIRROR] Caches the github diff for has_tree_been_edited
2017-09-12 18:18:11 -05:00
LetterJay
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
LetterJay
1f7ddb27c7
Merge pull request #2720 from Citadel-Station-13/upstream-merge-30598
...
[MIRROR] Adds MP4 a+v stream to internet midi
2017-09-12 18:16:41 -05:00
CitadelStationBot
e5c4a1040f
adds logging to graivpult precision throwing
2017-09-12 17:14:22 -05:00
kevinz000
ee5c44191d
adds logging to graivpult precision throwing ( #30608 )
...
* Update other_tools.dm
* Update other_tools.dm
* Update other_tools.dm
2017-09-12 17:14:22 -05:00
CitadelStationBot
96a3242841
Fixes TK implanting yourself with an autosurgeon
2017-09-12 17:13:03 -05:00
oranges
9341846304
Merge pull request #30624 from ShizCalev/autosurgeon-tk
...
Fixes TK implanting yourself with an autosurgeon
2017-09-12 17:13:03 -05:00
CitadelStationBot
f5eff81d91
Fixes shuttle lighting issues
2017-09-12 17:10:42 -05:00
oranges
f2adac2a9a
Merge pull request #30631 from AnturK/literallyfasterthanlight
...
Fixes shuttle lighting issues
2017-09-12 17:10:42 -05:00
CitadelStationBot
2fb502ac45
Adds 5s delay to current immediate ahelp verb returns
2017-09-12 17:09:31 -05:00
oranges
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
CitadelStationBot
9c127a15d4
Removes GLOB.all_lighting_objects
2017-09-12 16:54:06 -05:00
Jordan Brown
d7c905e709
Removes GLOB.all_lighting_objects
2017-09-12 16:54:06 -05:00
