Commit Graph

9213 Commits

Author SHA1 Message Date
deathride58 8bcc9fcb41 Merge pull request #4047 from Citadel-Station-13/upstream-merge-32859
[MIRROR] Fixes abductor teams getting assigned to same pod
2017-11-21 03:24:57 +00:00
CitadelStationBot fd4194f613 Fixes abductor teams getting assigned to same pod 2017-11-20 19:36:11 -06:00
AnturK 70c7996986 Fixes abductor teams getting assigned to same pod (#32859)
* Fixes abductors getting assigned to same team

* Remove explicit null return
2017-11-20 19:36:10 -06:00
LetterJay 94046f89da donator sprites 2017-11-20 14:22:29 -06:00
CitadelStationBot 5fb8b371eb Automatic changelog generation for PR #4036 [ci skip] 2017-11-20 13:08:16 -06:00
deathride58 05fbbaf867 Merge pull request #4036 from Citadel-Station-13/upstream-merge-32877
[MIRROR] Allows rotating computer frames, fixes rotation on deconstruction, switches dropped materials to use drop_location()
2017-11-20 19:08:13 +00:00
CitadelStationBot 5d0fde9305 Automatic changelog generation for PR #4034 [ci skip] 2017-11-20 13:07:27 -06:00
deathride58 a5ed407bc5 Merge pull request #4034 from Citadel-Station-13/upstream-merge-32890
[MIRROR] Makes drinking glasses smash when thrown
2017-11-20 19:07:25 +00:00
CitadelStationBot 8d2c11dff5 Automatic changelog generation for PR #4031 [ci skip] 2017-11-20 13:06:33 -06:00
deathride58 34b7c7da81 Merge pull request #4031 from Citadel-Station-13/upstream-merge-32797
[MIRROR] Refactor ladders so that they actually work
2017-11-20 19:06:30 +00:00
deathride58 ddd024239a Merge pull request #4035 from Citadel-Station-13/upstream-merge-32892
[MIRROR] Fixes two bugs in disposals
2017-11-20 19:05:23 +00:00
deathride58 580554fb2a Merge pull request #4039 from Citadel-Station-13/upstream-merge-32900
[MIRROR] Fixes lobby timer on setup failure
2017-11-20 19:04:37 +00:00
deathride58 f9b5c04cd3 Update buildandrepair.dm 2017-11-20 13:45:39 -05:00
deathride58 8cbd704988 Update footprints_and_rag.dm 2017-11-20 13:43:48 -05:00
CitadelStationBot 51ccd4daa9 Fixes lobby timer on setup failure 2017-11-20 10:11:05 -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
ShizCalev aea13f75cd Allows rotating computer frames, fixes rotation on deconstruction, switches dropped materials to use drop_location() 2017-11-20 03:08:10 -06:00
CitadelStationBot da05d5afcf Fixes two bugs in disposals 2017-11-20 02:47:35 -06:00
ACCount 0fa731cec0 Fixes two refactor-caused bugs in disposals (#32892) 2017-11-20 02:47:35 -06:00
ShizCalev 831dde525e Makes drinking glasses smash when thrown 2017-11-20 02:45:22 -06:00
CitadelStationBot 6230eb6b9f Refactor ladders so that they actually work 2017-11-20 02:05:52 -06:00
Tad Hardesty 5560a557e7 Refactor ladders so that they actually work (#32797) 2017-11-20 02:05:52 -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