deathride58
84fe88153e
merges #4208
2017-12-04 16:17:43 -05:00
deathride58
4d29723302
Update lighting.dm
2017-12-03 18:25:54 -05:00
Ashe Higgs
5621507b4a
Adds emergency lights, built into light fixtures
2017-12-03 12:54:48 -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
Emmett Gaines
9601136df2
sm soundtweak ( #33154 )
2017-11-30 17:01:29 -06:00
deathride58
b9f42c299b
Merge pull request #4152 from Citadel-Station-13/upstream-merge-33134
...
[MIRROR] Removes "machine prototypes"
2017-11-30 04:46:25 +00:00
deathride58
32f694943b
Merge pull request #4150 from Citadel-Station-13/upstream-merge-32965
...
[MIRROR] Removes mass-spectrometers
2017-11-30 04:45:13 +00:00
deathride58
4eceef7693
Merge pull request #4155 from Citadel-Station-13/upstream-merge-32967
...
[MIRROR] Added bot path data huds
2017-11-30 04:34:25 +00:00
deathride58
e06b368fdb
Update medical_designs.dm
2017-11-28 22:32:23 -05:00
deathride58
0e77256e81
Merge pull request #4163 from Citadel-Station-13/upstream-merge-33138
...
[MIRROR] Fixes piano in the big band music crate
2017-11-29 03:28:53 +00:00
deathride58
7a5a02939c
Merge pull request #4162 from Citadel-Station-13/upstream-merge-33131
...
[MIRROR] Makes the sloth an actual sloth
2017-11-29 03:28:04 +00:00
deathride58
5e2ca3235d
Merge pull request #4160 from Citadel-Station-13/upstream-merge-33112
...
[MIRROR] Fixes devilstuff
2017-11-29 03:26:51 +00:00
deathride58
5fdba02717
Merge pull request #4156 from Citadel-Station-13/upstream-merge-33126
...
[MIRROR] Fixes projectiles not getting range on ricochets
2017-11-29 03:25:18 +00:00
deathride58
507c862c7c
Update hud.dm
2017-11-28 22:24:00 -05:00
deathride58
4ff2063a4a
Update sloth.dm
2017-11-28 22:19:08 -05:00
ShizCalev
48c66093fc
Fixes big band music crate ( #33138 )
2017-11-28 19:02:54 -06:00
Kyle Spier-Swenson
ad135a57a3
Makes the sloth an actual sloth
2017-11-28 19:02:45 -06:00
Jordan Brown
87c16e3939
Merge pull request #33112 from AnturK/devilfix
...
Fixes devilstuff
2017-11-28 06:29:25 -06:00
kevinz000
9c93d8ef4c
fixes ricochets not resetting range
2017-11-28 06:28:47 -06:00
Cruix
b23c92b056
Added bot path data huds
2017-11-28 06:28:40 -06:00
ACCount
d883ec3114
Moves pipe meter sprites ( #33122 )
2017-11-28 06:28:31 -06:00
ACCount
0ad637388f
Removes "machine prototypes"
2017-11-28 06:28:15 -06:00
ACCount
f089b9ca2d
Removes mass-spectrometers
2017-11-28 06:27:55 -06:00
deathride58
e0aaed6d3b
Merge pull request #4148 from Citadel-Station-13/upstream-merge-33086
...
[MIRROR] Fixed a rare custom shuttle docker client crash
2017-11-27 20:40:36 +00:00
Cruix
e9f307af8e
Fixed a rare custom shuttle docker client crash ( #33086 )
2017-11-27 11:46:32 -06:00
vuonojenmustaturska
f685f4bd1a
Removes one source of decal/cleanable qdel failures ( #33083 )
...
* remove one source of qdel memes
* pls
* A housekeeping thing for the ignore list, also removes effectively unused var
* whoops
2017-11-27 05:30:08 -06:00
deathride58
952c25ff6e
Merge pull request #4128 from Citadel-Station-13/upstream-merge-33065
...
[MIRROR] Fixes rdconsole emagging
2017-11-27 05:19:49 +00:00
deathride58
2e708d49c2
Merge pull request #4123 from Citadel-Station-13/upstream-merge-32993
...
[MIRROR] A few investigate_log and message_admin fixes
2017-11-27 05:18:12 +00:00
deathride58
9e0aac69f3
Merge pull request #4136 from Citadel-Station-13/upstream-merge-33034
...
[MIRROR] More integrated circuit fixes and code improvements
2017-11-27 05:17:50 +00:00
deathride58
1d8618eaca
Merge pull request #4139 from Citadel-Station-13/upstream-merge-33090
...
[MIRROR] Cleans up goldcore defines
2017-11-27 03:11:42 +00:00
deathride58
424ba669f1
Update protolathe.dm
2017-11-26 21:40:14 -05:00
deathride58
90691c68d0
Update rdconsole.dm
2017-11-26 21:39:40 -05:00
deathride58
61521990e2
Update circuitprinter.dm
2017-11-26 21:39:11 -05:00
deathride58
c4b3b99c99
Merge pull request #4141 from Citadel-Station-13/upstream-merge-33087
...
[MIRROR] Cleans up some qdel(src)'s in Initialize()
2017-11-27 02:37:07 +00:00
deathride58
c9f0f4923f
Update rdconsole.dm
2017-11-26 21:34:09 -05:00
deathride58
d5eef89e13
Update parrot.dm
2017-11-26 21:26:35 -05:00
deathride58
12cb0a98a4
Update headcrab.dm
2017-11-26 21:25:51 -05:00
deathride58
90e13d0053
Update creature.dm
2017-11-26 21:25:13 -05:00
deathride58
e5e17cf334
Update bear.dm
2017-11-26 21:24:27 -05:00
deathride58
c67063beb5
Update lizard.dm
2017-11-26 21:23:50 -05:00
deathride58
e70daa585c
Update fox.dm
2017-11-26 21:23:26 -05:00
