Commit Graph

9713 Commits

Author SHA1 Message Date
deathride58
9cdaac3640 updates tgui and adds the missing lighting.dmi 2017-12-04 16:53:49 -05:00
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
8ddab27d8e Merge pull request #4187 from Citadel-Station-13/upstream-merge-33172
[MIRROR] Cleans up the README
2017-12-03 06:14:42 -06:00
CitadelStationBot
a96c9f1175 Automatic changelog generation for PR #4186 [ci skip] 2017-12-03 06:14:37 -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
CitadelStationBot
13779a4b10 Automatic changelog generation for PR #4182 [ci skip] 2017-12-03 06:12:17 -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
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
513056ff60 cardboard no longer can damage you 2017-12-02 09:44:48 -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
Leo
fd8e0ebabf Cleans up the README 2017-12-02 09:44:29 -06:00
CitadelStationBot
5dd01a93f8 Clean up some loc assignments 2017-12-02 09:44:20 -06:00
vuonojenmustaturska
9f9582ba5e Clean up some loc assignments (#33157) 2017-12-02 09:44:20 -06:00
CitadelStationBot
afdac6c83f Fixes syndieborg spawner 2017-12-02 09:44:11 -06:00
AnturK
18c01d88c5 Fixes syndieborg spawner 2017-12-02 09:44:11 -06:00
CitadelStationBot
4b17988bf6 Fixes a division by zero in humans' ex_act() 2017-12-02 09:43:51 -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
CitadelStationBot
03d4b67761 Prevents the PA from being EMP'd 2017-12-02 09:43:43 -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
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