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
6217206bae
Merge pull request #4189 from Citadel-Station-13/upstream-merge-33180
...
[MIRROR] cardboard no longer can damage you
2017-12-03 06:16:00 -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
b2f1359795
Merge pull request #4185 from Citadel-Station-13/upstream-merge-33197
...
[MIRROR] Fixes syndieborg spawner
2017-12-03 06:14:25 -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
bf64a40e8f
Merge pull request #4182 from Citadel-Station-13/upstream-merge-33199
...
[MIRROR] Prevents the PA from being EMP'd
2017-12-03 06:12:15 -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
43ae67e83d
Merge pull request #4178 from Citadel-Station-13/upstream-merge-33186
...
[MIRROR] Bitflag returns from component signals
2017-12-03 06:10:54 -06:00
LetterJay
d7cb8da956
Merge pull request #4177 from Citadel-Station-13/upstream-merge-33159
...
[MIRROR] Ratvar will now bitchslap BOH babies
2017-12-03 06:10:34 -06:00
LetterJay
163e5648b7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-12-03 06:07:36 -06:00
LetterJay
03b7839e41
donation fix
2017-12-03 06:07:20 -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
Leo
4723a1813b
Merge pull request #33180 from praisenarsie/patch-13
...
cardboard no longer can damage you
2017-12-02 09:44:47 -06:00
vuonojenmustaturska
9f9582ba5e
Clean up some loc assignments ( #33157 )
2017-12-02 09:44:20 -06:00
AnturK
18c01d88c5
Fixes syndieborg spawner
2017-12-02 09:44:11 -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
FrozenGuy5
65dbabab89
Prevents the PA wires from being EMP'd ( #33199 )
...
* returns emp_act
* jordie for code owner
2017-12-02 09:43:42 -06:00
Jordan Brown
ee8ca86e3a
Merge pull request #33192 from Robustin/SavioroftheUniverse
...
Fixes terrible Flash logic
2017-12-02 09:43:25 -06:00
Emmett Gaines
b8e754500c
Bitflag returns from component signals ( #33186 )
...
* For more useful returns from sendsignal
* removes a needless else/indentation
* cleanup
2017-12-01 13:09:22 -06:00
Robustin
786c26fa97
Ratvar will now bitchslap BOH babies ( #33159 )
...
* Singuloproofing Reebe
* Message reformatted
* Inconsistent Indentification
* user is now living so we can knock them down
2017-12-01 11:58:30 -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
deathride58
6ce868948c
Merge pull request #4170 from Citadel-Station-13/upstream-merge-33154
...
[MIRROR] SM Sound Tweak
2017-12-01 02:02:21 +00:00
deathride58
834102c7d5
Merge pull request #4169 from Citadel-Station-13/upstream-merge-33149
...
[MIRROR] Removes an unused proc
2017-12-01 02:02:11 +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
Jordan Brown
d19c41cf64
Do this ( #33149 )
2017-11-30 17:01:20 -06:00
Leo
6d8d9802d4
Merge pull request #33153 from AnturK/adv_cam_cleanup
...
Fixes some advanced camera issues
2017-11-30 17:00:46 -06:00
LetterJay
4b25b45701
donation
2017-11-30 07:49:42 -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
6ac2a8c9a0
Merge pull request #4133 from Citadel-Station-13/upstream-merge-32432
...
[MIRROR] [Super-Ready for review]Reworks healing symptoms into conditional healing symptoms
2017-11-30 04:43:51 +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
9458087cfa
Update scanners.dm
2017-11-28 22:31:54 -05:00
deathride58
34c9105396
Merge pull request #4165 from Citadel-Station-13/upstream-merge-33129
...
[MIRROR] Adds a new wizard magic suicide.
2017-11-29 03:29:37 +00:00
deathride58
6c6149e1af
Merge pull request #4164 from Citadel-Station-13/upstream-merge-33127
...
[MIRROR] Fixes twohanded weapons showing outdated icons when equipped to the back
2017-11-29 03:29:17 +00: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
3f29fb59e1
Merge pull request #4159 from Citadel-Station-13/upstream-merge-33140
...
[MIRROR] Check door for (welded) upon closing
2017-11-29 03:26:03 +00:00
deathride58
2f42366856
Merge pull request #4158 from Citadel-Station-13/upstream-merge-33109
...
[MIRROR] Cancels camera view on teleport
2017-11-29 03:25:46 +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
0560a94824
Merge pull request #4154 from Citadel-Station-13/upstream-merge-33122
...
[MIRROR] Moves pipe meter sprites
2017-11-29 03:21:45 +00:00
deathride58
1e657d9f61
Merge pull request #4153 from Citadel-Station-13/upstream-merge-33121
...
[MIRROR] Removes some unused sprite files
2017-11-29 03:21:30 +00:00
deathride58
4ff2063a4a
Update sloth.dm
2017-11-28 22:19:08 -05:00
Shadowflame909
5bc059fbc8
Update artefact.dm ( #33129 )
...
Beep Beep more hard to get suicides are fun!
2017-11-28 19:06:24 -06:00
