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
0fc1837c3a
standardizes wearable donor icon names, fixes recent donor items not rendering properly
2017-12-04 20:23:15 -05:00
deathride58
f57e02ce95
Merge branch 'master' into donoritemmodularization
2017-12-04 20:17:02 -05: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
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
Ashe Higgs
3689b3d5fd
Mechs now require fuel to repair ( #33225 )
2017-12-04 04:55:25 -06:00
ACCount
00279c71f0
IC fixes ( #33215 )
2017-12-04 04:53:12 -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
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
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
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
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
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
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
