 deathride58
|
ff93a0cd6c
|
rebuilds tgui correctly
|
2017-12-04 16:56:14 -05:00 |
|
|
deathride58
|
8a75e55b42
|
Merge branch 'upstream-merge-33213' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33213
|
2017-12-04 16:54:32 -05:00 |
|
|
deathride58
|
9cdaac3640
|
updates tgui and adds the missing lighting.dmi
|
2017-12-04 16:53:49 -05:00 |
|
|
deathride58
|
64aadb868e
|
Merge branch 'master' into upstream-merge-33213
|
2017-12-04 21:39:30 +00:00 |
|
|
CitadelStationBot
|
6c01835eec
|
Automatic changelog generation for PR #4184 [ci skip]
|
2017-12-04 15:32:19 -06:00 |
|
|
deathride58
|
6dded415b8
|
Merge pull request #4184 from Citadel-Station-13/upstream-merge-33184
[MIRROR] Plushie relationships!
|
2017-12-04 21:32:16 +00:00 |
|
|
deathride58
|
5ecab0d993
|
Merge pull request #4211 from Citadel-Station-13/upstream-merge-33220
[MIRROR] SendSignal optimization
|
2017-12-04 21:30:01 +00:00 |
|
|
CitadelStationBot
|
9396424277
|
Automatic changelog generation for PR #4209 [ci skip]
|
2017-12-04 15:29:47 -06:00 |
|
|
deathride58
|
4ddbe28068
|
Merge pull request #4209 from Citadel-Station-13/upstream-merge-32868
[MIRROR] Holorecord disks.
|
2017-12-04 21:29:44 +00:00 |
|
|
deathride58
|
1a32bdc053
|
Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013
[MIRROR] Datumizes saymodes
|
2017-12-04 21:19:53 +00:00 |
|
|
deathride58
|
84fe88153e
|
merges #4208
|
2017-12-04 16:17:43 -05:00 |
|
|
deathride58
|
1998c3ff5c
|
Update _component.dm
|
2017-12-04 16:15:14 -05:00 |
|
|
deathride58
|
ca14e25639
|
Merge pull request #4210 from Citadel-Station-13/upstream-merge-33185
[MIRROR] Adds quiet argument to playsound.
|
2017-12-04 21:09:24 +00:00 |
|
|
deathride58
|
7150e738e7
|
Update autolathe_designs.dm
|
2017-12-04 16:08:49 -05:00 |
|
|
CitadelStationBot
|
77ef9b0816
|
Automatic changelog generation for PR #4207 [ci skip]
|
2017-12-04 15:07:28 -06:00 |
|
|
deathride58
|
9d87f5fd9f
|
Merge pull request #4207 from Citadel-Station-13/upstream-merge-33225
[MIRROR] Fixes mechs needing no fuel to repair, and tweaks repair messages
|
2017-12-04 21:07:25 +00:00 |
|
|
deathride58
|
692bd0b550
|
Merge pull request #4206 from Citadel-Station-13/upstream-merge-33215
[MIRROR] Integrated circuit fixes
|
2017-12-04 21:06:51 +00:00 |
|
|
deathride58
|
eba4925aa4
|
Merge pull request #4205 from Citadel-Station-13/upstream-merge-33203
[MIRROR] Fixes missing eyes not being absent on mobs
|
2017-12-04 21:06:22 +00:00 |
|
|
deathride58
|
97f05c08db
|
Merge pull request #4204 from Citadel-Station-13/upstream-merge-33229
[MIRROR] People jitter when revived by defibs
|
2017-12-04 21:05:52 +00:00 |
|
|
Jordan Brown
|
e36f4a5b22
|
SendSignal optimization
|
2017-12-04 05:29:56 -06:00 |
|
|
CitadelStationBot
|
b5037f2e8f
|
Adds quiet argument to playsound.
|
2017-12-04 05:28:43 -06:00 |
|
|
AnturK
|
2587b99a69
|
Adds quiet argument to playsound. (#33185)
* Adds quiet argument to playsound.
* argument name change
|
2017-12-04 05:28:43 -06:00 |
|
|
AnturK
|
1cc3e33714
|
Holorecord disks.
|
2017-12-04 05:14:13 -06:00 |
|
|
CitadelStationBot
|
3645157c80
|
Fixes mechs needing no fuel to repair, and tweaks repair messages
|
2017-12-04 04:55:25 -06:00 |
|
|
Ashe Higgs
|
3689b3d5fd
|
Mechs now require fuel to repair (#33225)
|
2017-12-04 04:55:25 -06:00 |
|
|
CitadelStationBot
|
c07df981bb
|
Integrated circuit fixes
|
2017-12-04 04:53:12 -06:00 |
|
|
ACCount
|
00279c71f0
|
IC fixes (#33215)
|
2017-12-04 04:53:12 -06:00 |
|
|
CitadelStationBot
|
5177ef95f4
|
Fixes missing eyes not being absent on mobs
|
2017-12-04 04:50:55 -06:00 |
|
|
QualityVan
|
4f8323a735
|
Fixes missing eyes being absent (#33203)
|
2017-12-04 04:50:55 -06:00 |
|
|
LetterJay
|
985c8ea86b
|
donation
|
2017-12-04 02:14:16 -06:00 |
|
|
CitadelStationBot
|
cad36fb29d
|
People jitter when revived by defibs
|
2017-12-03 20:19:44 -06:00 |
|
|
Jordan Brown
|
2393b7759b
|
People jitter when revived by defibs
|
2017-12-03 20:19:44 -06:00 |
|
|
deathride58
|
65d5c779c3
|
Merge pull request #4203 from Citadel-Station-13/upstream-merge-33217
[MIRROR] Makes ahelp timestamps consistent with logs
|
2017-12-03 23:33:17 +00:00 |
|
|
CitadelStationBot
|
1297cf907e
|
Automatic changelog generation for PR #4201 [ci skip]
|
2017-12-03 17:30:04 -06:00 |
|
|
deathride58
|
d9ca1d6831
|
Merge pull request #4201 from Citadel-Station-13/upstream-merge-33224
[MIRROR] Plasma statues get fixed
|
2017-12-03 23:30:01 +00:00 |
|
|
CitadelStationBot
|
7e28ac775c
|
Automatic changelog generation for PR #4200 [ci skip]
|
2017-12-03 17:29:44 -06:00 |
|
|
deathride58
|
e42fa29e96
|
Merge pull request #4200 from Citadel-Station-13/upstream-merge-33204
[MIRROR] Being buckled to a bed now saves you from "the floor is lava"
|
2017-12-03 23:29:42 +00:00 |
|
|
deathride58
|
222346bf30
|
Update say.dm
|
2017-12-03 18:29:08 -05:00 |
|
|
deathride58
|
4d29723302
|
Update lighting.dm
|
2017-12-03 18:25:54 -05:00 |
|
|
deathride58
|
fc132ff72a
|
Merge pull request #4197 from Citadel-Station-13/upstream-merge-33219
[MIRROR] Crash to timers and INFINITY check to beams.
|
2017-12-03 23:24:53 +00:00 |
|
|
CitadelStationBot
|
3128e8d3b4
|
Automatic changelog generation for PR #4196 [ci skip]
|
2017-12-03 17:23:32 -06:00 |
|
|
deathride58
|
1e6716f91b
|
Merge pull request #4196 from Citadel-Station-13/upstream-merge-33214
[MIRROR] spellcheck weapon firing mechanism description
|
2017-12-03 23:23:30 +00:00 |
|
|
deathride58
|
a376c25790
|
Merge pull request #4194 from Citadel-Station-13/upstream-merge-33202
[MIRROR] Revolutionaries can now see deconversion message regardless of status
|
2017-12-03 23:23:01 +00:00 |
|
|
CitadelStationBot
|
bf94dfd281
|
Automatic changelog generation for PR #4191 [ci skip]
|
2017-12-03 17:21:31 -06:00 |
|
|
deathride58
|
51f07eb65a
|
Merge pull request #4191 from Citadel-Station-13/upstream-merge-33189
[MIRROR] Fixes spelling error in opened cryogenic pods.
|
2017-12-03 23:21:28 +00:00 |
|
|
deathride58
|
fc813e748b
|
Merge pull request #4188 from Citadel-Station-13/upstream-merge-33179
[MIRROR] Removes the mob mouse from maintenance from maps
|
2017-12-03 23:21:02 +00:00 |
|
|
CitadelStationBot
|
73956e0e88
|
Automatic changelog generation for PR #4171 [ci skip]
|
2017-12-03 17:20:42 -06:00 |
|
|
deathride58
|
a95b5a2b91
|
Merge pull request #4171 from Citadel-Station-13/upstream-merge-33144
[MIRROR] Fix turbine computer showing broken
|
2017-12-03 23:20:40 +00:00 |
|
|
CitadelStationBot
|
ee995602cb
|
Makes ahelp timestamps consistent with logs
|
2017-12-03 16:07:30 -06:00 |
|
|
Leo
|
c0547bea4b
|
Merge pull request #33217 from tgstation/Cyberboss-patch-3
Makes ahelp timestamps consistent with logs
|
2017-12-03 16:07:30 -06:00 |
|