CitadelStationBot
6d65fd8714
Automatic changelog generation for PR #4180 [ci skip]
2017-12-03 06:11:21 -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
CitadelStationBot
d5a202c78f
Automatic changelog generation for PR #4177 [ci skip]
2017-12-03 06:10:36 -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
CitadelStationBot
0aa648133f
Automatic changelog generation for PR #4175 [ci skip]
2017-12-03 06:10:15 -06:00
LetterJay
5ed186d5ee
Merge pull request #4175 from Citadel-Station-13/upstream-merge-33171
...
[MIRROR] New Construct Shell Sprite
2017-12-03 06:10:13 -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
0f3ac956ef
Merge pull request #4174 from Citadel-Station-13/upstream-merge-33174
...
[MIRROR] Cyberboss vs LICENSE round 27
2017-12-03 06:06:43 -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
CitadelStationBot
5041a0f8f4
Fixes terrible Flash logic
2017-12-02 09:43:25 -06:00
Jordan Brown
ee8ca86e3a
Merge pull request #33192 from Robustin/SavioroftheUniverse
...
Fixes terrible Flash logic
2017-12-02 09:43:25 -06:00
CitadelStationBot
cb43cc9254
Bitflag returns from component signals
2017-12-01 13:09:22 -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
CitadelStationBot
4889f1fe3a
Ratvar will now bitchslap BOH babies
2017-12-01 11:58:30 -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
CitadelStationBot
b419e3cc3f
New Construct Shell Sprite
2017-12-01 08:46:32 -06:00
uraniummeltdown
19bd0b8486
new cult construct shell sprite ( #33171 )
2017-12-01 08:46:32 -06:00
CitadelStationBot
58ea5ac9d8
Cyberboss vs LICENSE round 27
2017-12-01 08:20:38 -06:00
Jordan Brown
1cfff9477c
Cyberboss vs LICENSE round 27 ( #33174 )
...
* Cyberboss vs LICENSE round 27
* Update license name in README.md
2017-12-01 08:20:38 -06:00
CitadelStationBot
a3a87bdb3f
Automatic changelog generation for PR #4172 [ci skip]
2017-11-30 20:02:55 -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
CitadelStationBot
194513040c
Automatic changelog generation for PR #4170 [ci skip]
2017-11-30 20:02:23 -06: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
CitadelStationBot
ea79dd0427
Makes glasses handle both nearsightedness and eye damage
2017-11-30 19:22:02 -06: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
CitadelStationBot
382516674f
Moderate Damage Examination
2017-11-30 19:16:40 -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
deathride58
b2816ce0de
Merge pull request #4167 from Citadel-Station-13/upstream-merge-33153
...
[MIRROR] Fixes some advanced camera issues
2017-11-30 23:12:26 +00:00
CitadelStationBot
14498aee70
SM Sound Tweak
2017-11-30 17:01:29 -06:00
Emmett Gaines
9601136df2
sm soundtweak ( #33154 )
2017-11-30 17:01:29 -06:00
CitadelStationBot
d86c3b3031
Removes an unused proc
2017-11-30 17:01:21 -06:00
Jordan Brown
d19c41cf64
Do this ( #33149 )
2017-11-30 17:01:20 -06:00
CitadelStationBot
d649f82df5
Fixes some advanced camera issues
2017-11-30 17:00:46 -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
CitadelStationBot
f26f54772a
Automatic changelog generation for PR #4152 [ci skip]
2017-11-29 22:46:27 -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
CitadelStationBot
0b3bfdea89
Automatic changelog generation for PR #4150 [ci skip]
2017-11-29 22:45:15 -06: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
CitadelStationBot
dc57555410
Automatic changelog generation for PR #4133 [ci skip]
2017-11-29 22:43:54 -06: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
CitadelStationBot
008588bd91
Automatic changelog generation for PR #4155 [ci skip]
2017-11-29 22:34:29 -06: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
