 deathride58andGitHub
|
5597c55064
|
Merge pull request #4722 from Citadel-Station-13/upstream-merge-34110
[MIRROR] shadowshroom nerf reverted
|
2018-01-10 19:48:53 +00:00 |
|
|
deathride58andGitHub
|
d81e3b742f
|
Merge pull request #4726 from Citadel-Station-13/upstream-merge-34201
[MIRROR] Fixes BUILD_TESTING logic being inverted
|
2018-01-10 19:48:21 +00:00 |
|
|
deathride58andGitHub
|
ea9c6eb490
|
Merge pull request #4725 from Citadel-Station-13/upstream-merge-34197
[MIRROR] Unsets cache_lifespan
|
2018-01-10 19:48:03 +00:00 |
|
|
deathride58andGitHub
|
1e9edac90f
|
Merge pull request #4734 from Citadel-Station-13/upstream-merge-34195
[MIRROR] Fixes weakref runtimes
|
2018-01-10 19:47:28 +00:00 |
|
|
CitadelStationBot
|
bbf402f6f4
|
Fixes weakref runtimes
|
2018-01-10 03:12:47 -06:00 |
|
|
LeoandCitadelStationBot
|
88fa0ea83f
|
Merge pull request #34195 from tgstation/Cyberboss-patch-1
Fixes weakref runtimes
|
2018-01-10 03:12:46 -06:00 |
|
|
CitadelStationBot
|
dc13dc2d76
|
Fixes BUILD_TESTING logic being inverted
|
2018-01-10 03:11:40 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
32052fd06f
|
Fixes BUILD_TESTING logic being inverted (#34201)
|
2018-01-10 03:11:40 -06:00 |
|
|
CitadelStationBot
|
66ed03b40b
|
Unsets cache_lifespan
|
2018-01-10 03:11:30 -06:00 |
|
|
Jordan BrownandCitadelStationBot
|
57b2235d22
|
Unsets cache_lifespan (#34197)
|
2018-01-10 03:11:30 -06:00 |
|
|
CitadelStationBot
|
dfe39e7a1d
|
Automatic changelog generation for PR #4724 [ci skip]
|
2018-01-09 22:56:15 -06:00 |
|
|
deathride58andGitHub
|
99dd163de4
|
Merge pull request #4724 from deathride58/fixesflavortexthopefully
Fixes flavortext readmores for real this time
|
2018-01-10 04:56:13 +00:00 |
|
|
deathride58
|
34297d5005
|
fixes setting flavortext in preferences. hopefully
|
2018-01-09 23:11:22 -05:00 |
|
|
deathride58
|
78df6facb6
|
fixes flavortext readmores for real this time
|
2018-01-09 22:59:22 -05:00 |
|
|
deathride58andGitHub
|
ef92431305
|
Merge pull request #4723 from Citadel-Station-13/upstream-merge-34113
[MIRROR] Fixes camera if destination changes mid forceMove
|
2018-01-09 05:27:05 +00:00 |
|
|
CitadelStationBot
|
26010d1acd
|
Fixes camera if destination changes mid forceMove
|
2018-01-08 22:09:14 -06:00 |
|
|
AnturKandCitadelStationBot
|
f6ef771ccd
|
Fixes teleport camera (#34113)
|
2018-01-08 22:09:14 -06:00 |
|
|
CitadelStationBot
|
95ae1b0c95
|
shadowshroom nerf reverted
|
2018-01-08 20:07:57 -06:00 |
|
|
orangesandCitadelStationBot
|
3671228196
|
Merge pull request #34110 from Armhulen/patch-40
shadowshroom nerf reverted
|
2018-01-08 20:07:57 -06:00 |
|
|
CitadelStationBot
|
079311331c
|
Automatic changelog generation for PR #4720 [ci skip]
|
2018-01-08 17:37:22 -06:00 |
|
|
deathride58andGitHub
|
3e006758e3
|
Merge pull request #4720 from deathride58/howthefuckdidthisslipby
Fixes flavortext. Hopefully.
|
2018-01-08 23:37:20 +00:00 |
|
|
deathride58
|
9337c29450
|
who will win: a thousand yiffy snowflakes, or 1 misplaced \"
|
2018-01-08 18:24:47 -05:00 |
|
|
deathride58andGitHub
|
f606ed9e53
|
Merge pull request #4713 from Citadel-Station-13/upstream-merge-34105
[MIRROR] Clean up a bunch of undefined arg runtimes
|
2018-01-08 20:52:24 +00:00 |
|
|
deathride58andGitHub
|
77897235d8
|
Merge pull request #4708 from Citadel-Station-13/upstream-merge-34067
[MIRROR] Removes standard resources from config tree
|
2018-01-08 20:52:05 +00:00 |
|
|
deathride58
|
ecaf3546f1
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-34105
|
2018-01-08 15:35:45 -05:00 |
|
|
deathride58
|
5bdbd5a771
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-34067
|
2018-01-08 15:34:27 -05:00 |
|
|
deathride58andGitHub
|
932ded0aef
|
Merge pull request #4719 from deathride58/compilefix
Fixes compiling errors with voresounds
|
2018-01-08 20:32:25 +00:00 |
|
|
deathride58
|
2a0c047d3b
|
but seriously, how the fUCK did this manage to break
|
2018-01-08 15:21:58 -05:00 |
|
|
deathride58
|
b31ef1699a
|
part 1 of trying to fix voresound compiling errors
|
2018-01-08 15:21:18 -05:00 |
|
|
CitadelStationBot
|
002f33a2b2
|
Automatic changelog generation for PR #4718 [ci skip]
|
2018-01-08 14:04:30 -06:00 |
|
|
deathride58andGitHub
|
ca4c2da248
|
Merge pull request #4718 from Citadel-Station-13/upstream-merge-34074
[MIRROR] Updates test areas debug command
|
2018-01-08 20:04:28 +00:00 |
|
|
CitadelStationBot
|
e5c0577284
|
Automatic changelog generation for PR #4717 [ci skip]
|
2018-01-08 14:04:11 -06:00 |
|
|
deathride58andGitHub
|
b99f13f1bc
|
Merge pull request #4717 from Citadel-Station-13/upstream-merge-33768
[MIRROR] Fixes vitality matrices giving massively more vitality than they should
|
2018-01-08 20:04:08 +00:00 |
|
|
deathride58andGitHub
|
6957a6f13f
|
Merge branch 'master' into upstream-merge-34105
|
2018-01-08 20:03:41 +00:00 |
|
|
deathride58andGitHub
|
d4cf5d2eba
|
Merge branch 'master' into upstream-merge-34067
|
2018-01-08 20:01:59 +00:00 |
|
|
LetterJayandGitHub
|
aedf5bfdca
|
Merge pull request #4660 from deathride58/mapsyncs43293845982
Complete manual sync with upstream
|
2018-01-08 13:54:57 -06:00 |
|
|
CitadelStationBot
|
52de2b84ab
|
Updates test areas debug command
|
2018-01-08 04:39:09 -06:00 |
|
|
ShizCalevandCitadelStationBot
|
f54854bca8
|
Updates test areas debug command (#34074)
* Sanity check for test areas debug command
* Shifted to popup window
|
2018-01-08 04:39:09 -06:00 |
|
|
CitadelStationBot
|
5eeeae236a
|
Fixes vitality matrices giving massively more vitality than they should
|
2018-01-08 03:51:10 -06:00 |
|
|
Ashe HiggsandCitadelStationBot
|
15f961958e
|
Fixes vitality matrices giving massively more vitality than they should (#33768)
* Fixes vitality matrix shenanigans
* Replaces the spawn_dust() with a variable check
* Update clock_sigils.dm
|
2018-01-08 03:51:10 -06:00 |
|
|
deathride58andGitHub
|
cf57b68830
|
Merge branch 'master' into mapsyncs43293845982
|
2018-01-08 06:18:38 +00:00 |
|
|
deathride58andGitHub
|
e4410a3320
|
Merge branch 'master' into mapsyncs43293845982
|
2018-01-08 06:18:11 +00:00 |
|
|
CitadelStationBot
|
2d63c57837
|
Automatic changelog generation for PR #4712 [ci skip]
|
2018-01-08 00:17:25 -06:00 |
|
|
deathride58andGitHub
|
39614f685e
|
Merge pull request #4712 from Citadel-Station-13/upstream-merge-34100
[MIRROR] Adds spaceturf check to blob overmind spawning
|
2018-01-08 06:17:23 +00:00 |
|
|
deathride58
|
e39ae49a2e
|
!!experimental!! fix for flavortext readmore
|
2018-01-08 01:15:40 -05:00 |
|
|
deathride58
|
7280d91628
|
Minor boxstation changes, merges #4694 and #4697
|
2018-01-08 00:55:05 -05:00 |
|
|
CitadelStationBot
|
ec59412bca
|
Automatic changelog generation for PR #4696 [ci skip]
|
2018-01-07 22:42:30 -06:00 |
|
|
deathride58andGitHub
|
c2eed848dd
|
Merge pull request #4696 from Citadel-Station-13/upstream-merge-34150
[MIRROR] Ridden vehicles now move mobs post-buckle via the buckle_mob proc instead of pre, fixing lavaboats setting people on fire
|
2018-01-08 04:42:28 +00:00 |
|
|
deathride58andGitHub
|
c977193db0
|
Merge pull request #4715 from Citadel-Station-13/upstream-merge-34058
[MIRROR] Fixes component forensics deleting old instead of new component.
|
2018-01-08 04:20:43 +00:00 |
|
|
CitadelStationBot
|
e292cfce6b
|
Automatic changelog generation for PR #4714 [ci skip]
|
2018-01-07 22:19:47 -06:00 |
|