shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,544 Commits 5 Branches 0 Tags
400de30b932a8a4ae2fa52ee1d3988694dd9fdbf
Commit Graph

11544 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58
400de30b93 Merge pull request #4737 from Citadel-Station-13/upstream-merge-34096 
[MIRROR] Cult will actually report victories now
 2018-01-10 19:57:56 +00:00
deathride58
df199bc940 Merge pull request #4736 from Citadel-Station-13/upstream-merge-34160 
[MIRROR] Fixes non-cultist hulks being able to hold cult bbs
 2018-01-10 19:57:35 +00:00
deathride58
d0cf5368b9 Merge pull request #4735 from Citadel-Station-13/upstream-merge-34194 
[MIRROR] Makes the tag warning a stack_trace
 2018-01-10 19:57:16 +00:00
deathride58
14d0857109 Merge pull request #4733 from Citadel-Station-13/upstream-merge-34187 
[MIRROR] Switches butchering/gib drops to use drop_location
 2018-01-10 19:56:54 +00:00
deathride58
f00252540b Merge pull request #4732 from Citadel-Station-13/upstream-merge-34185 
[MIRROR] Fixes feedback spell level var
 2018-01-10 19:56:30 +00:00
deathride58
d0e170d9f9 Merge pull request #4731 from Citadel-Station-13/upstream-merge-34169 
[MIRROR] Fixes fully_heal not curing disabilities
 2018-01-10 19:56:13 +00:00
deathride58
2ee5252a62 Merge pull request #4730 from Citadel-Station-13/upstream-merge-34170 
[MIRROR] Fixes non-holy mobs purifying BBS
 2018-01-10 19:55:35 +00:00
CitadelStationBot
da47927255 Automatic changelog generation for PR #4728 [ci skip] 2018-01-10 13:50:35 -06:00
deathride58
7c576c7d32 Merge pull request #4728 from Citadel-Station-13/upstream-merge-33933 
[MIRROR] Late joiners also get summoned guns/magic
 2018-01-10 19:50:33 +00:00
deathride58
5597c55064 Merge pull request #4722 from Citadel-Station-13/upstream-merge-34110 
[MIRROR] shadowshroom nerf reverted
 2018-01-10 19:48:53 +00:00
deathride58
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
deathride58
ea9c6eb490 Merge pull request #4725 from Citadel-Station-13/upstream-merge-34197 
[MIRROR] Unsets cache_lifespan
 2018-01-10 19:48:03 +00:00
deathride58
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
46ef4f319f Cult will actually report victories now 2018-01-10 03:46:55 -06:00
Robustin
1bd84a8f6b Cult will actually report victories now (#34096) 
* Cult victory fix

* Update cult.dm

* Correct cult victory report
 2018-01-10 03:46:55 -06:00
CitadelStationBot
6db2902156 Fixes non-cultist hulks being able to hold cult bbs 2018-01-10 03:13:02 -06:00
Jordan Brown
cb3506f319 Merge pull request #34160 from ShizCalev/cult-blade-drop 
Fixes non-cultist hulks being able to hold cult bbs
 2018-01-10 03:13:02 -06:00
CitadelStationBot
6284ffe976 Makes the tag warning a stack_trace 2018-01-10 03:12:54 -06:00
Leo
805442ee51 Merge pull request #34194 from ninjanomnom/tag-stack 
Makes the tag warning a stack_trace
 2018-01-10 03:12:54 -06:00
CitadelStationBot
bbf402f6f4 Fixes weakref runtimes 2018-01-10 03:12:47 -06:00
Leo
88fa0ea83f Merge pull request #34195 from tgstation/Cyberboss-patch-1 
Fixes weakref runtimes
 2018-01-10 03:12:46 -06:00
CitadelStationBot
59ca1713b2 Switches butchering/gib drops to use drop_location 2018-01-10 03:12:39 -06:00
Leo
5cc7492f0a Merge pull request #34187 from ShizCalev/butcher-droplocation 
Switches butchering/gib drops to use drop_location
 2018-01-10 03:12:39 -06:00
CitadelStationBot
cb6c5f2ca4 Fixes feedback spell level var 2018-01-10 03:12:31 -06:00
Leo
56d37b17fe Merge pull request #34185 from Jordie0608/quickenedspellislameanywaypicktwinnedandempoweredinsteadorsubtleifyouhatenpcs 
Fixes feedback spell level var
 2018-01-10 03:12:31 -06:00
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
db5d540fac Fixes non-holy mobs purifying BBS 2018-01-10 03:12:16 -06:00
Leo
d8bcc0190d Merge pull request #34170 from ShizCalev/bbs-unholy 
Fixes non-holy mobs purifying BBS
 2018-01-10 03:12:16 -06:00
CitadelStationBot
e42a819000 Late joiners also get summoned guns/magic 2018-01-10 03:11:56 -06:00
oranges
3b9b6f156e Merge pull request #33933 from coiax/wizard-late-joining 
Late joiners also get summoned guns/magic
 2018-01-10 03:11:56 -06:00
CitadelStationBot
dc13dc2d76 Fixes BUILD_TESTING logic being inverted 2018-01-10 03:11:40 -06:00
Jordan Brown
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 Brown
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
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
95ae1b0c95 shadowshroom nerf reverted 2018-01-08 20:07:57 -06:00
oranges
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
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