1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
d8e1562fcf
Merge pull request #3995 from deathride58/manualsyncsreeEEEE
...
Manual map syncs + manual mirrors of missed upstream map PRs
2017-11-20 05:12:06 +00:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
7669ea4820
and copypasta falls out of my pocket
2017-11-17 22:14:09 -05:00
fb62491701
manual map syncs + manual missed pr mirrors
2017-11-17 21:34:49 -05:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
c3b60e502e
Merge pull request #3882 from Citadel-Station-13/upstream-merge-32371
...
[MIRROR] SSoverlay improvements and tweaks
2017-11-14 14:56:34 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
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
254ffca3b7
Merge pull request #3668 from Citadel-Station-13/upstream-merge-32162
...
[MIRROR] Actually fixes meteors, again
2017-10-29 15:49:40 -04:00
47cfffbb26
Merge pull request #3648 from Citadel-Station-13/upstream-merge-32116
...
[MIRROR] Line by line profiling system
2017-10-29 15:48:47 -04:00
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
d6d01ab630
Actually fixes meteors, again ( #32162 )
...
* Actually fixes meteors, again
* unrelated typo fix for an admin debug verb
2017-10-29 07:13:31 -05:00
c00c1dcc00
Merge pull request #32127 from tgstation/Cyberboss-patch-3
...
[s] Blocks world proc calls
2017-10-27 17:35:20 -05:00
f36d3ff08a
Line by line profiling system
2017-10-27 13:10:21 -05:00
5337b1fed2
Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780
...
[MIRROR] Disentangles blob from blob mode/removes blob mode
2017-10-22 16:39:35 -04:00
adc2e46114
[MIRROR] Does some code standardization/consistency. ( #3161 )
...
* Does some code standardization/consistency.
* fixes merge conflict generation
* Missed a few, oops
* Update pierrot_throat.dm
2017-10-21 06:10:22 -05:00
20b17eceec
Disentangles blob from blob mode/removes blob mode
2017-10-18 20:55:42 -05:00
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
4f32b7a0d4
Moves assert_gas() into a define it should always have been, speeding up atmos slightly
2017-10-07 13:37:28 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
3b64e0ec35
[s] Fixes config reading exploit
2017-09-30 09:45:13 -05:00
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
1471b6cac6
Merge branch 'master' into upstream-merge-30297
2017-09-13 06:41:37 -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
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
80221fa874
sync
2017-08-29 09:32:40 -07:00
3d83b55cf6
Annihilates the colons!
2017-08-15 10:49:55 -05:00
c2419e84f5
Adds a Test Areas (Station Z) verb
2017-08-08 05:50:22 -05:00
a90448b262
Fixes oversight with APCs using areastring
2017-08-05 19:28:33 -05:00
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
43a3a6b52a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27708
2017-06-05 22:48:20 -05:00
538bce59a6
Advanced proccall now supports /proc/PROCNAME
2017-05-31 19:24:13 -05:00
22e6669111
Small outfit refactor
2017-05-27 20:47:45 -05:00
915fa6cac1
IsAdminAdvancedProcCall returns FALSE in TESTING
2017-05-19 16:00:23 -05:00
4ecbec1406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720
2017-05-02 11:36:27 -05:00
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
7ab8ee8cae
Merge pull request #581 from Citadel-Station-13/upstream-merge-26524
...
[MIRROR] Admin proc calls are now serialized per admin
2017-05-02 04:51:43 -05:00
7a4f1496e9
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
2017-05-01 07:24:45 -05:00
06bfa8770e
Merge branch 'master' into upstream-merge-26129
2017-04-29 11:45:37 -05:00
991fb8335c
manual merge
2017-04-29 11:42:28 -05:00
101f1337a6
manual merge
2017-04-29 07:43:07 -05:00
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
cea81a3357
Initialize Refactor
2017-04-26 16:03:17 -05:00
4025652c11
Fixes Advanced Proc Call
2017-04-24 10:05:15 -05:00
f866139c52
Admin ticket tgstyle ( #493 )
...
* some porting
* other changes
2017-04-20 22:00:47 -05:00
fe57757fd7
Adds a proc to check if the current thread is from an admin advanced proc call ( #400 )
2017-04-15 14:41:36 -04:00
deathride58