Commit Graph

9193 Commits

Author SHA1 Message Date
deathride58
48adeffc57 Fixes merge conflict 2017-11-20 22:47:08 -05:00
ShizCalev
dc2ecefe90 Fixes unpowered air injectors on pubby 2017-11-20 02:38:51 -06:00
CitadelStationBot
ceda48865d Automatic changelog generation for PR #4022 [ci skip] 2017-11-19 23:48:23 -06:00
deathride58
44287392a4 Merge pull request #4022 from Citadel-Station-13/upstream-merge-32889
[MIRROR] Makes some turning procs consistently turn clockwise
2017-11-20 05:48:20 +00:00
CitadelStationBot
3a14e66604 Automatic changelog generation for PR #3951 [ci skip] 2017-11-19 23:38:12 -06:00
deathride58
b36782f908 Merge pull request #3951 from SpiderPsycho/master
No fuzz insects, renamed instead of added.
2017-11-20 05:38:09 +00:00
deathride58
fd094bfd19 Merge pull request #4029 from Citadel-Station-13/upstream-merge-32853
[MIRROR] Fixes purple bartender clothes
2017-11-20 05:19:42 +00:00
CitadelStationBot
372d1999ba Automatic changelog generation for PR #3995 [ci skip] 2017-11-19 23:12:10 -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
CitadelStationBot
d11486045f Automatic changelog generation for PR #4027 [ci skip] 2017-11-19 23:09:46 -06:00
deathride58
994b55c523 Merge pull request #4027 from Citadel-Station-13/upstream-merge-32864
[MIRROR] Fixes some computer dirs
2017-11-20 05:09:43 +00:00
CitadelStationBot
ff157756bf Automatic changelog generation for PR #4026 [ci skip] 2017-11-19 23:09:10 -06:00
deathride58
dccd2b6744 Merge pull request #4026 from Citadel-Station-13/upstream-merge-32880
[MIRROR] Fixes vehicles & chameleon projector
2017-11-20 05:09:08 +00:00
deathride58
52514c118a Merge pull request #4025 from Citadel-Station-13/upstream-merge-32865
[MIRROR] Lets you add examine text to component decals
2017-11-20 05:08:10 +00:00
deathride58
344e462153 Merge pull request #4024 from Citadel-Station-13/upstream-merge-32883
[MIRROR] Fixes tendril-related things failing to qdel because of chasm shenanigans
2017-11-20 05:07:27 +00:00
deathride58
4687c8498a Merge pull request #4023 from Citadel-Station-13/upstream-merge-32886
[MIRROR] Fixes incorrect to_chat usage
2017-11-20 05:06:25 +00:00
deathride58
1356356740 Update doppler_array.dm 2017-11-20 00:05:43 -05:00
deathride58
50cf4f7a36 Merge pull request #4021 from Citadel-Station-13/upstream-merge-32888
[MIRROR] Corrects animal ruin tank rotation
2017-11-20 05:04:29 +00:00
deathride58
be1f113a12 Merge pull request #4020 from Citadel-Station-13/upstream-merge-32876
[MIRROR] Actually fixes the glowshroom runtime
2017-11-20 05:03:35 +00:00
deathride58
d200169b0c Merge pull request #4018 from Citadel-Station-13/upstream-merge-32869
[MIRROR] Fixes whiteship ruin board swap
2017-11-20 05:01:13 +00:00
deathride58
9d77fb560e Merge pull request #4017 from Citadel-Station-13/upstream-merge-32871
[MIRROR] Transfers orbiting ghosts on most common transforms
2017-11-20 05:00:42 +00:00
CitadelStationBot
04cad4a318 Automatic changelog generation for PR #4012 [ci skip] 2017-11-19 22:59:41 -06:00
deathride58
d7cfc464ff Merge pull request #4012 from Michiyamenotehifunana/foamexploit-fix
Patches Infinite Material Exploits
2017-11-20 04:59:39 +00:00
CitadelStationBot
a8b4e7211b Automatic changelog generation for PR #4013 [ci skip] 2017-11-19 22:58:40 -06:00
deathride58
a7f74a4ff4 Merge pull request #4013 from Citadel-Station-13/upstream-merge-32852
[MIRROR] Fix HUDs being over-added on Login and over-removed by silicons
2017-11-20 04:58:37 +00:00
CitadelStationBot
eb6cdbff77 Fixes purple bartender clothes 2017-11-19 22:55:03 -06:00
Jordie
5bb8a1b962 Merge pull request #32853 from KorPhaeron/purple
Fixes purple bartender clothes
2017-11-19 22:55:03 -06:00
CitadelStationBot
2903b712a9 Fixes some computer dirs 2017-11-19 22:42:28 -06:00
Jordie
571985ca5d Merge pull request #32864 from ike709/dir
Fixes some computer dirs
2017-11-19 22:42:28 -06:00
CitadelStationBot
fca58415cc Fixes vehicles & chameleon projector 2017-11-19 22:39:14 -06:00
Jordie
2bf7b45919 Merge pull request #32880 from vuonojenmustaturska/chameleonprojfix
Fixes vehicles & chameleon projector
2017-11-19 22:39:14 -06:00
CitadelStationBot
d46f538254 Lets you add examine text to component decals 2017-11-19 22:36:01 -06:00
Jordie
2f8d8b8729 Merge pull request #32865 from ninjanomnom/decal-examine
Lets you add examine text to component decals
2017-11-19 22:36:01 -06:00
CitadelStationBot
cd8098a9c3 Fixes tendril-related things failing to qdel because of chasm shenanigans 2017-11-19 22:29:41 -06:00
Jordie
7ca6c282f3 Merge pull request #32883 from vuonojenmustaturska/tendrilqdel
Fixes tendril-related things failing to qdel because of chasm shenanigans
2017-11-19 22:29:41 -06:00
CitadelStationBot
78824fc0c3 Fixes incorrect to_chat usage 2017-11-19 22:26:28 -06:00
Jordie
aea39fdd49 Merge pull request #32886 from ShizCalev/to_chat
Fixes incorrect to_chat usage
2017-11-19 22:26:28 -06:00
Jordie
752bc654ae Makes some turning procs consistently turn clockwise 2017-11-19 22:25:17 -06:00
CitadelStationBot
acdb35a3c0 Corrects animal ruin tank rotation 2017-11-19 22:24:06 -06:00
Jordie
d843e75c3b Merge pull request #32888 from ShizCalev/animal-ruin-tanks
Corrects animal ruin tank rotation
2017-11-19 22:24:06 -06:00
CitadelStationBot
c938c29e3b Actually fixes the glowshroom runtime 2017-11-19 21:24:51 -06:00
oranges
326c87904a Merge pull request #32876 from vuonojenmustaturska/glowshrooms
Actually fixes the glowshroom runtime
2017-11-19 21:24:51 -06:00
CitadelStationBot
f2bbc29879 Fixes whiteship ruin board swap 2017-11-19 21:04:11 -06:00
ShizCalev
ede0a105e5 Fixes whiteship ruin board swap (#32869) 2017-11-19 21:04:11 -06:00
CitadelStationBot
1b65d1d86d Transfers orbiting ghosts on most common transforms 2017-11-19 17:13:08 -06:00
Leo
61501988cb Merge pull request #32871 from AnturK/orbitclean
Transfers orbiting ghosts on most common transforms
2017-11-19 17:13:08 -06:00
CitadelStationBot
5f344d26f0 Fix HUDs being over-added on Login and over-removed by silicons 2017-11-19 15:16:42 -06:00
oranges
808e11b414 Merge pull request #32852 from AutomaticFrenzy/patch/hud-fix
Fix HUDs being over-added on Login and over-removed by silicons
2017-11-19 15:16:42 -06:00
Michiyamenotehifunana
de05bd6896 no moar infinite metal 2017-11-19 16:57:47 +08:00
deathride58
ac4ca767d0 Merge pull request #3987 from deathride58/manualmirror1
Manual mirror of https://github.com/tgstation/tgstation/pull/32496
2017-11-19 07:47:33 +00:00