deathride58
8efbcc9cb0
Update time_track.dm
2017-11-22 14:28:25 -05:00
deathride58
2934effd36
Update blackbox.dm
2017-11-22 14:27:10 -05:00
deathride58
aedf16a76e
merges #4011
2017-11-21 15:07:31 -05:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
deathride58
d2b251d23c
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
...
[MIRROR] Cleans up unused code
2017-11-21 04:15:11 +00:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
Jordan Brown
298035b339
Merge pull request #32900 from AnturK/actuallyfixesthatthing
...
Fixes lobby timer on setup failure
2017-11-20 10:11:04 -06:00
AnturK
e5edaa4656
Fixes setup failure edge case ( #32812 )
2017-11-18 13:51:40 -06:00
deathride58
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00: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
Emmett Gaines
ab21f8d5ed
511 client fix and a config to make the version warning a popup
2017-11-15 04:39:36 -06:00
LetterJay
b4c1ca31d9
Merge pull request #3940 from Citadel-Station-13/upstream-merge-32687
...
[MIRROR] Fixes leg day
2017-11-14 15:56:47 -06:00
LetterJay
528255833f
Merge pull request #3935 from Citadel-Station-13/upstream-merge-32684
...
[MIRROR] Fix the station integrity report to read the correct Z
2017-11-14 15:54:44 -06:00
LetterJay
bbef661092
Merge pull request #3927 from Citadel-Station-13/upstream-merge-32481
...
[MIRROR] [READY]integrated circuitry port+upgrade.
2017-11-14 15:51:03 -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
Jordan Brown
9708ed6003
Merge pull request #32687 from AnturK/client_timer_fix
...
Fixes leg day
2017-11-14 13:16:26 -06:00
Tad Hardesty
aa8581d430
Fix the station integrity report to read the correct Z
...
Fixes a bug where the integrity of CentCom was being taken instead,
coming out at about 85% no matter what happened during the round. Also
removes the gang territory calculation now that it isn't used anywhere.
2017-11-14 12:45:47 -06:00
arsserpentarium
d8847ea167
[READY]integrated circuitry port+upgrade.
2017-11-14 05:00:48 -06:00
LetterJay
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
oranges
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
LetterJay
9fefd15f66
Merge branch 'master' into upstream-merge-32247
2017-11-12 23:09:10 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
LetterJay
4605b252f3
Update config_entry.dm
2017-11-11 15:53:20 -06:00
LetterJay
35a49d5178
Merge pull request #3873 from Citadel-Station-13/upstream-merge-32516
...
[MIRROR] removes pipe construction cache
2017-11-11 12:38:45 -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
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
duncathan salt
3c8eef9243
removes pipe construction cache ( #32516 )
2017-11-09 11:14:43 -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
e96f42a877
Update config.dm
2017-11-09 03:16:36 -06:00
Jordan Brown
146dfe33ea
Adds a config option to change world.sleep_offline
2017-11-09 00:45:48 -06:00
LetterJay
2ec4df456f
Merge pull request #3853 from Citadel-Station-13/upstream-merge-32351
...
[MIRROR] fixes null parent in destroy for components
2017-11-08 01:46:47 -06:00
Emmett Gaines
8fb5936c30
fixes null parent in destroy for components ( #32351 )
...
* fixes parent being null in destroy
* extends qdel
2017-11-07 14:35:46 -06:00
ACCount
0d691189aa
Multiple fixes in RPD and pipe construciton ( #32399 )
...
* Multiple fixes in RPD and pipe construciton
* Integrates another fix PR to avoid conflicts
2017-11-07 14:26:15 -06:00
LetterJay
cf83d3410b
Merge pull request #3797 from Citadel-Station-13/upstream-merge-32329
...
[MIRROR] Some improvements on the holiday system
2017-11-04 22:49:49 -05:00
tortellinitony
3772d722e2
Some improvements on the holiday system ( #32329 )
2017-11-03 23:37:16 -05:00
kevinz000
afca7f1d09
[READY]Helps address atmospherics nullspace runtimes ( #32281 )
...
* Helps fix atmospherics nullspace runtimes, adds debugging to pipe caches and makes the list accessible.
* I can spell properly guys
* Ok ok ok no global!
* Update construction.dm
2017-11-03 15:54:52 -05:00
LetterJay
4946ce5070
Update radiation.dm
2017-11-03 00:17:25 -05:00
Tad Hardesty
144df6c549
Fix a few syntactic aberrations ( #32284 )
2017-11-02 04:21:51 -05:00
CitadelStationBot
f628779d36
Update radiation.dm
2017-11-02 03:20:33 -05:00
LetterJay
ed2ba5e3f5
Update radiation.dm
2017-11-02 02:21:07 -05:00
oranges
c5e11eceed
Some minor contamination fixes
2017-10-31 15:30:53 -05:00
CitadelStationBot
125f81de08
[MIRROR] Use associative list instead of in ( #3710 )
...
* Merge pull request #32128 from Cyberboss/LocateFix
Use associative list instead of `in`
* Use associative list instead of `in`
2017-10-31 00:43:39 -07:00
Emmett Gaines
6f940baa0a
New ambience for ash storms ( #32213 )
...
song name?
2017-10-30 15:22:23 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
LetterJay
324da0d915
Merge pull request #3657 from Citadel-Station-13/upstream-merge-32066
...
[MIRROR] build_appearance_list no longer edits the list it is passed
2017-10-29 04:20:56 -04:00
LetterJay
6156067cd6
Merge pull request #3645 from Citadel-Station-13/upstream-merge-32022
...
[MIRROR] Find references fix.
2017-10-29 03:45:15 -04:00
LetterJay
c62f6ec353
Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093
...
[MIRROR] Roundstart species pref fixes/removes redundant species config
2017-10-29 03:41:59 -04:00
