coiax and CitadelStationBot
e7fd239238
[Metastation] Easel in Quiet Room moved to art storage ( #33240 )
...
That easel awkwardly blocks access to the table in the corner, so I've
moved it to art storage, removing a photocopier from art storage to
allow it to fit.
2017-12-05 03:22:56 -06:00
deathride58 and GitHub
e7da4615d6
Merge pull request #4202 from Citadel-Station-13/upstream-merge-32249
...
[MIRROR] [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-04 23:51:14 +00:00
deathride58
7dde10d1d3
fixes compiling errors - fuck
2017-12-04 18:28:18 -05:00
deathride58
f6a2966fca
fixes merge conflicts
2017-12-04 18:24:04 -05:00
deathride58 and GitHub
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
deathride58 and GitHub
858a9bf428
Merge pull request #4074 from Citadel-Station-13/upstream-merge-32624
...
[MIRROR] [READY]Refactors uplinks to a component!
2017-12-04 23:12:45 +00:00
deathride58 and GitHub
3c578b0c46
Update _component.dm
2017-12-04 18:04:10 -05:00
CitadelStationBot
c42462bf04
Automatic changelog generation for PR #4198 [ci skip]
2017-12-04 16:14:18 -06:00
deathride58 and GitHub
a02983691d
Merge pull request #4198 from Citadel-Station-13/upstream-merge-33213
...
[MIRROR] Adds emergency lights, built into light fixtures
2017-12-04 22:14:15 +00:00
deathride58
21d5e8999c
Merge branch 'master' into upstream-merge-32624
2017-12-04 17:12:53 -05:00
deathride58
47960ab931
fixes conflict with base cit code, modularizes citadel uplink items file
2017-12-04 17:07:28 -05:00
CitadelStationBot
2050886a8d
Automatic changelog generation for PR #4076 [ci skip]
2017-12-04 15:57:32 -06:00
deathride58 and GitHub
b9731895fd
Merge pull request #4076 from Citadel-Station-13/upstream-merge-32858
...
[MIRROR] Divides species in subtypes, makes viruses able to infect certain subtypes
2017-12-04 21:57:29 +00:00
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 and GitHub
64aadb868e
Merge branch 'master' into upstream-merge-33213
2017-12-04 21:39:30 +00:00
deathride58
1a40fe16bd
adds species_organic to cit races
2017-12-04 16:38:39 -05:00
CitadelStationBot
6c01835eec
Automatic changelog generation for PR #4184 [ci skip]
2017-12-04 15:32:19 -06:00
deathride58 and GitHub
6dded415b8
Merge pull request #4184 from Citadel-Station-13/upstream-merge-33184
...
[MIRROR] Plushie relationships!
2017-12-04 21:32:16 +00:00
deathride58 and GitHub
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 and GitHub
4ddbe28068
Merge pull request #4209 from Citadel-Station-13/upstream-merge-32868
...
[MIRROR] Holorecord disks.
2017-12-04 21:29:44 +00:00
deathride58 and GitHub
7e1bd55f7c
Update speedbike.dm
2017-12-04 16:23:58 -05:00
deathride58 and GitHub
40cf3ab656
Update robot_movement.dm
2017-12-04 16:22:24 -05:00
deathride58 and GitHub
371ceb8d23
Update components.dm
2017-12-04 16:21:41 -05:00
deathride58 and GitHub
1a32bdc053
Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013
...
[MIRROR] Datumizes saymodes
2017-12-04 21:19:53 +00:00
deathride58 and GitHub
84fe88153e
merges #4208
2017-12-04 16:17:43 -05:00
deathride58 and GitHub
1998c3ff5c
Update _component.dm
2017-12-04 16:15:14 -05:00
deathride58 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and CitadelStationBot
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 and CitadelStationBot
2587b99a69
Adds quiet argument to playsound. ( #33185 )
...
* Adds quiet argument to playsound.
* argument name change
2017-12-04 05:28:43 -06:00
AnturK and CitadelStationBot
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 and CitadelStationBot
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 and CitadelStationBot
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 and CitadelStationBot
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 and CitadelStationBot
2393b7759b
People jitter when revived by defibs
2017-12-03 20:19:44 -06:00
deathride58 and GitHub
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
