deathride58
9ce056322a
Merge pull request #4493 from Citadel-Station-13/upstream-merge-33714
...
[MIRROR] Job landmarks now show the mob with the proper job outfit.
2017-12-24 23:05:36 +00:00
kevinz000
454c073d22
Fixes message spam when proccalls are delayed due to another admin's proccalls running ( #33732 )
...
* Fixes proccall block message spam
* One thread
2017-12-22 10:40:25 -06:00
oranges
4e8898d55f
Merge pull request #33714 from lzimann/icon
...
Job landmarks now show the mob with the proper job outfit.
2017-12-21 19:27:23 -06:00
LetterJay
8ea38cfde2
Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681
...
[MIRROR] Immovable rod abuse, smite and event trigger.
2017-12-21 04:55:32 -06:00
LetterJay
56ecc13289
Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246
...
[MIRROR] Roundend report refactor
2017-12-21 03:22:31 -06:00
AnturK
6c4d687db6
Immovable rod abuse, smite and event trigger. ( #33681 )
2017-12-21 00:11:20 -06:00
deathride58
0be7ea0755
Merge pull request #4451 from Citadel-Station-13/upstream-merge-33599
...
[MIRROR] Callback security and usr
2017-12-21 03:29:13 +00:00
deathride58
17dda62a93
Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622
...
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-21 03:28:14 +00:00
LetterJay
00d3b8f1b7
a lot of shit synced in this one commit.
2017-12-20 02:53:51 -06:00
LetterJay
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
oranges
d960c45e77
Merge pull request #33622 from duncathan/assert_gas
...
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-20 00:14:13 -06:00
LetterJay
2148eb021b
Update randomverbs.dm
2017-12-19 19:34:44 -06:00
LetterJay
da2bf6293f
Update one_click_antag.dm
2017-12-19 19:34:02 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
Jordan Brown
fabfad270f
Callback security and usr ( #33599 )
...
* Gonna regret writing this one day
* tmp -> temp
* Make PushUsr() a /world proc
* Callbacks now preserve usr
* Fixes PushUsr return value
* Fixes PushUsr invocations
* Update modifyvariables.dm
* Use weakrefs in callback user
* Further fixes
* Whoopsie
2017-12-18 21:41:33 -06:00
LetterJay
3895eb9eac
Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519
...
[MIRROR] Finishes the forceMove port
2017-12-17 20:28:07 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
Jordan Brown
253a3d519e
Adds SDQL chat command ( #33366 )
...
Allow's calling SDQL from bots supporting the CHAT system API
2017-12-14 15:44:25 -06:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
AnturK
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
deathride58
7179547be4
Merge branch 'master' into upstream-merge-31727
2017-12-10 21:51:51 +00:00
oranges
38da8cb545
Merge pull request #33320 from AutomaticFrenzy/patch/component-ratings
...
Fix runtimes using Tweak Component Ratings on non-machines
2017-12-10 14:08:21 -06:00
Jordan Brown
8b9e15d1b5
Merge pull request #33324 from deathride58/foreignfurryaddswidescreen
...
[Ready] Makes the default view range a config option (Allows hosts to enable widescreen)
2017-12-08 10:35:23 -06:00
XDTM
988dbe87da
Brain Traumas
2017-12-06 12:05:20 -06:00
AnturK
4671fd9724
Fixes ahelp trimming ( #33268 )
2017-12-05 14:27:16 -06:00
Leo
c0547bea4b
Merge pull request #33217 from tgstation/Cyberboss-patch-3
...
Makes ahelp timestamps consistent with logs
2017-12-03 16:07:30 -06:00
Dorsisdwarf
6dea43c709
Advanced Laserpointer Feline Interaction
2017-11-24 17:56:58 -06:00
LetterJay
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58
0f9a85e4d7
Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
...
[MIRROR] Refactor of catpeople mutant organs
2017-11-21 21:16:31 +00:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
deathride58
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
deathride58
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
deathride58
bc1f65b381
Update adminhelp.dm
2017-11-18 00:24:52 -05:00
deathride58
3cee5f3568
Update pray.dm
2017-11-17 23:36:00 -05:00
deathride58
2d250c9b01
Update playsound.dm
2017-11-17 23:34:31 -05:00
deathride58
9cb06c70f6
Update adminjump.dm
2017-11-17 23:33:22 -05:00
deathride58
7669ea4820
and copypasta falls out of my pocket
2017-11-17 22:14:09 -05:00
deathride58
fb62491701
manual map syncs + manual missed pr mirrors
2017-11-17 21:34:49 -05:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
vuonojenmustaturska
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
LetterJay
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
LetterJay
439723caff
Update adminhelp.dm
2017-11-12 11:18:11 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -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
swindly
3fa561c3b1
fixes spelling and stuff ( #32531 )
2017-11-09 11:04:50 -06:00
LetterJay
460f19297f
Merge pull request #3751 from Citadel-Station-13/upstream-merge-32292
...
[MIRROR] animate sqdl wrapper works now.
2017-11-09 03:20:01 -06:00
