deathride58
d2a52f5c72
Merge pull request #4229 from Citadel-Station-13/upstream-merge-33268
...
[MIRROR] Fixes ahelp trimming
2017-12-05 22:39:25 +00:00
deathride58
a6aa181161
Merge pull request #4225 from Citadel-Station-13/upstream-merge-33124
...
[MIRROR] Moves some machine sprites into /machines/ folder
2017-12-05 20:37:30 +00:00
AnturK
4671fd9724
Fixes ahelp trimming ( #33268 )
2017-12-05 14:27:16 -06:00
deathride58
24d205f9c9
Merge pull request #4223 from Citadel-Station-13/upstream-merge-33243
...
[MIRROR] Adds a CRASH on invalid calls to record_feedback
2017-12-05 20:22:38 +00:00
deathride58
6171f2160b
Merge pull request #4220 from Citadel-Station-13/upstream-merge-33251
...
[MIRROR] Reduces the volume of showers
2017-12-05 20:21:32 +00:00
deathride58
a8d0718e0f
Merge pull request #4219 from Citadel-Station-13/upstream-merge-33244
...
[MIRROR] Adds server tools version to feedback
2017-12-05 20:21:18 +00:00
deathride58
d472cc4ba9
Merge pull request #4216 from Citadel-Station-13/upstream-merge-33234
...
[MIRROR] Stethoscopes now inform the user if the target can be defibrillated
2017-12-05 20:18:43 +00:00
deathride58
44d54c66f1
Merge pull request #4215 from Citadel-Station-13/upstream-merge-33230
...
[MIRROR] Adds disco inferno shuttle.
2017-12-05 20:18:21 +00:00
deathride58
3526d4045a
Merge pull request #4214 from Citadel-Station-13/upstream-merge-33288
...
[MIRROR] Fixes powernets
2017-12-05 20:17:33 +00:00
deathride58
fec2c32ec7
Merge pull request #4224 from Citadel-Station-13/upstream-merge-33237
...
[MIRROR] Fixes robeless apprentice
2017-12-05 20:13:38 +00:00
deathride58
565852d835
Merge pull request #4218 from Citadel-Station-13/upstream-merge-32964
...
[MIRROR] Measure energy values in joules
2017-12-05 20:12:25 +00:00
deathride58
69f730493d
Merge pull request #4226 from Citadel-Station-13/upstream-merge-33277
...
[MIRROR] Fixes departmental say
2017-12-05 20:12:01 +00:00
MoreRobustThanYou
d5cf1b3fec
[s] Fix changeling chat ( #33305 )
...
* Fix changeling chat
* Update say.dm
2017-12-05 13:43:03 -06:00
LetterJay
828df6f12a
rreeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
2017-12-05 07:14:48 -06:00
oranges
4b2a1c9d77
Merge pull request #33277 from tgstation/Cyberboss-patch-8
...
Fixes departmental say
2017-12-05 04:08:13 -06:00
ACCount
435e46e407
Moves some machine sprites into /machines/ folder
2017-12-05 03:24:03 -06:00
AnturK
47ffd28850
Fixes robeless apprentice
2017-12-05 03:23:54 -06:00
Leo
0f76084794
Merge pull request #33243 from tgstation/Cyberboss-patch-5
...
Adds a CRASH on invalid calls to record_feedback
2017-12-05 03:23:46 -06:00
oranges
d6f9871bd3
Merge pull request #33251 from tgstation/Cyberboss-patch-3
...
Reduces the volume of showers
2017-12-05 03:23:22 -06:00
Jordan Brown
5c1ccad969
Adds server tools version to feedback ( #33244 )
...
* Adds server tools version to feedback
* Fix incorrect call to record_feedback
* Add number to record feedback calls
2017-12-05 03:23:15 -06:00
oranges
4204c889ed
Merge pull request #32964 from AutomaticFrenzy/patch/joules
...
Measure energy values in joules
2017-12-05 03:23:06 -06:00
Ashe Higgs
7b3c2862d3
Stethoscope defibrillation checking ( #33234 )
2017-12-05 03:22:48 -06:00
Dax Dupont
91cc5b1024
Adds disco inferno shuttle. ( #33230 )
...
* Adds disco inferno shuttle
* step be gone
* Minor wall replacement
* Add no diagonal walls
* Made the dance machine all access
* Makes the statues work as I originally intended in this shuttle
* Fixes a chair
* Changed door and made it to keep fire inside.
2017-12-05 03:22:40 -06:00
AnturK
005c6dcb59
Fixes powernets ( #33288 )
2017-12-05 03:22:33 -06:00
deathride58
379f73d1e1
Merge branch 'master' into upstream-merge-32249
2017-12-04 23:15:38 +00:00
deathride58
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
3c578b0c46
Update _component.dm
2017-12-04 18:04:10 -05:00
deathride58
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
deathride58
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
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
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
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
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
7e1bd55f7c
Update speedbike.dm
2017-12-04 16:23:58 -05:00
deathride58
40cf3ab656
Update robot_movement.dm
2017-12-04 16:22:24 -05:00
deathride58
371ceb8d23
Update components.dm
2017-12-04 16:21:41 -05: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
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
