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
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
3526d4045a
Merge pull request #4214 from Citadel-Station-13/upstream-merge-33288
...
[MIRROR] Fixes powernets
2017-12-05 20:17:33 +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
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
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
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
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
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
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
7150e738e7
Update autolathe_designs.dm
2017-12-04 16:08:49 -05: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
AnturK
1cc3e33714
Holorecord disks.
2017-12-04 05:14:13 -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
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
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
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
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
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
kevinz000
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
MoreRobustThanYou
29ba71765c
Datumizes saymodes
2017-12-03 12:56:03 -06:00
Ashe Higgs
5621507b4a
Adds emergency lights, built into light fixtures
2017-12-03 12:54:48 -06:00
checkraisefold
96a064258f
Spellcheck ( #33214 )
2017-12-03 12:42:10 -06:00
LetterJay
c5f0b380cd
Merge pull request #4186 from Citadel-Station-13/upstream-merge-33157
...
[MIRROR] Clean up some loc assignments
2017-12-03 06:14:34 -06:00
LetterJay
6fe319af5a
Merge pull request #4183 from Citadel-Station-13/upstream-merge-33191
...
[MIRROR] Fixes a division by zero in humans' ex_act()
2017-12-03 06:13:43 -06:00
LetterJay
6f9431a893
Merge pull request #4180 from Citadel-Station-13/upstream-merge-33192
...
[MIRROR] Fixes terrible Flash logic
2017-12-03 06:11:18 -06:00
LetterJay
624b570763
Merge pull request #4173 from Citadel-Station-13/upstream-merge-33120
...
[MIRROR] Makes glasses handle both nearsightedness and eye damage
2017-12-03 06:06:33 -06:00
vuonojenmustaturska
9f9582ba5e
Clean up some loc assignments ( #33157 )
2017-12-02 09:44:20 -06:00
Jordan Brown
4489843fd6
Merge pull request #33191 from vuonojenmustaturska/bombmemes
...
Fixes a division by zero in humans' ex_act()
2017-12-02 09:43:51 -06:00
Jordan Brown
ee8ca86e3a
Merge pull request #33192 from Robustin/SavioroftheUniverse
...
Fixes terrible Flash logic
2017-12-02 09:43:25 -06:00
deathride58
58ad202db2
Merge pull request #4172 from Citadel-Station-13/upstream-merge-33008
...
[MIRROR] Moderate Damage Examination
2017-12-01 02:02:53 +00:00
oranges
6949c2e2a5
Merge pull request #33120 from QualityVan/glasses
...
Makes glasses handle both nearsightedness and eye damage
2017-11-30 19:22:02 -06:00
Robustin
56969e2541
Moderate Damage Examination ( #33008 )
...
Ok so the last one only worked on carbons who weren't humans, woops. See: #32707
🆑 Robustin
tweak: Damage examinations now include a "moderate" classification. Before minor was <30 and severe was anything 30 or above. Now minor is <25, moderate is 25 to <50, and severe is 50+.
/🆑
2017-11-30 19:16:40 -06:00
