shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,509 Commits 5 Branches 0 Tags
70525101654cefada87ff6bbcaee4d6abebf06fb
Commit Graph

11509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
7052510165 Fixes fully_heal not curing disabilities 2018-01-10 03:12:23 -06:00
Leo
377ea0f68c Merge pull request #34169 from ShizCalev/heal-fix 
Fixes fully_heal not curing disabilities
 2018-01-10 03:12:23 -06:00
CitadelStationBot
dfe39e7a1d Automatic changelog generation for PR #4724 [ci skip] 2018-01-09 22:56:15 -06:00
deathride58
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
deathride58
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
AnturK
f6ef771ccd Fixes teleport camera (#34113) 2018-01-08 22:09:14 -06:00
CitadelStationBot
079311331c Automatic changelog generation for PR #4720 [ci skip] 2018-01-08 17:37:22 -06:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
6957a6f13f Merge branch 'master' into upstream-merge-34105 2018-01-08 20:03:41 +00:00
deathride58
d4cf5d2eba Merge branch 'master' into upstream-merge-34067 2018-01-08 20:01:59 +00:00
LetterJay
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
ShizCalev
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 Higgs
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
deathride58
cf57b68830 Merge branch 'master' into mapsyncs43293845982 2018-01-08 06:18:38 +00:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
6b27e322b8 Merge pull request #4714 from Citadel-Station-13/upstream-merge-34125 
[MIRROR] Makes the chaplain's soulshard require death
 2018-01-08 04:19:45 +00:00
deathride58
6bb49b1332 Update say.dm 2018-01-07 23:19:11 -05:00
deathride58
9decb2e2b2 Update overmind.dm 2018-01-07 23:18:28 -05:00
CitadelStationBot
5c82730dc6 Automatic changelog generation for PR #4709 [ci skip] 2018-01-07 22:18:08 -06:00
deathride58
406df3ae92 Merge pull request #4709 from Citadel-Station-13/upstream-merge-34076 
[MIRROR] Fixes diagonal movement in pipes
 2018-01-08 04:18:06 +00:00
deathride58
432fdfc0d3 Merge pull request #4711 from Citadel-Station-13/upstream-merge-34097 
[MIRROR] Fixes can_cast short circuit
 2018-01-08 04:17:42 +00:00
deathride58
984bf470d5 Merge pull request #4710 from Citadel-Station-13/upstream-merge-34093 
[MIRROR] fixes some grinder recipes
 2018-01-08 04:17:29 +00:00
deathride58
266457c274 Update title.dm 2018-01-07 23:17:11 -05:00
CitadelStationBot
e70b9f1f1b Automatic changelog generation for PR #4707 [ci skip] 2018-01-07 22:16:40 -06:00
deathride58
c0d2fe8817 Merge pull request #4707 from Citadel-Station-13/upstream-merge-33979 
[MIRROR] Implements the Ballmer Peak: Now the bartender can help R&D!
 2018-01-08 04:16:38 +00:00