Commit Graph

6291 Commits

Author SHA1 Message Date
deathride58
b284385b20 Merge pull request #4042 from Citadel-Station-13/upstream-merge-32908
[MIRROR] Fixes the RD being able to kill the bar drone with his console
2017-11-21 03:26:26 +00:00
deathride58
8249c89cc0 Merge pull request #4040 from Citadel-Station-13/upstream-merge-32905
[MIRROR] Adds AI lawset spawners (mapping helpers)
2017-11-21 03:25:55 +00: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
KorPhaeron
8242b08d28 Bar Drone can't be remotely detonated (#32908) 2017-11-20 13:40:23 -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
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
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
588b76b59e Update lootdrop.dm 2017-11-20 13:57:15 -05: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
Jordan Brown
212071e075 Adds AI lawset spawners (mapping helpers) 2017-11-20 10:12:17 -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
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
Tad Hardesty
5560a557e7 Refactor ladders so that they actually work (#32797) 2017-11-20 02:05:52 -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
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
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
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
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
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
deathride58
d7cfc464ff Merge pull request #4012 from Michiyamenotehifunana/foamexploit-fix
Patches Infinite Material Exploits
2017-11-20 04:59:39 +00:00
Jordie
5bb8a1b962 Merge pull request #32853 from KorPhaeron/purple
Fixes purple bartender clothes
2017-11-19 22:55:03 -06:00
Jordie
571985ca5d Merge pull request #32864 from ike709/dir
Fixes some computer dirs
2017-11-19 22:42:28 -06:00
Jordie
2bf7b45919 Merge pull request #32880 from vuonojenmustaturska/chameleonprojfix
Fixes vehicles & chameleon projector
2017-11-19 22:39:14 -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
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
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
oranges
326c87904a Merge pull request #32876 from vuonojenmustaturska/glowshrooms
Actually fixes the glowshroom runtime
2017-11-19 21:24:51 -06:00
ShizCalev
ede0a105e5 Fixes whiteship ruin board swap (#32869) 2017-11-19 21:04:11 -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
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
deathride58
3dcd88b975 Merge pull request #4009 from Citadel-Station-13/upstream-merge-32788
[MIRROR] Fixes inconsistencies w/ energy descriptions
2017-11-19 05:16:15 +00:00
deathride58
711ca534d9 Merge pull request #4010 from Citadel-Station-13/upstream-merge-32851
[MIRROR] Fixes suicidal blobbernauts
2017-11-19 04:33:08 +00:00
deathride58
6a05a54c96 Update cell.dm 2017-11-18 23:31:32 -05:00
deathride58
75adfdc245 Merge pull request #4008 from Citadel-Station-13/upstream-merge-32814
[MIRROR] fix 'cannot scream while unconscious' bug
2017-11-19 04:29:07 +00:00
deathride58
8c64f1cc49 Merge pull request #4006 from Citadel-Station-13/upstream-merge-32837
[MIRROR] Fixes topic logs exposing serviceCommsKey
2017-11-19 04:28:21 +00:00
deathride58
68d9e90f96 Merge pull request #4005 from Citadel-Station-13/upstream-merge-32811
[MIRROR] Fix for list pin in integrated circuits
2017-11-19 04:27:43 +00:00
deathride58
2faceb1209 Merge pull request #4004 from Citadel-Station-13/upstream-merge-32812
[MIRROR] Fixes setup failure edge case
2017-11-19 04:26:49 +00:00