 deathride58andGitHub
|
fc132ff72a
|
Merge pull request #4197 from Citadel-Station-13/upstream-merge-33219
[MIRROR] Crash to timers and INFINITY check to beams.
|
2017-12-03 23:24:53 +00:00 |
|
CitadelStationBot
|
3128e8d3b4
|
Automatic changelog generation for PR #4196 [ci skip]
|
2017-12-03 17:23:32 -06:00 |
|
 deathride58andGitHub
|
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 |
|
 deathride58andGitHub
|
a376c25790
|
Merge pull request #4194 from Citadel-Station-13/upstream-merge-33202
[MIRROR] Revolutionaries can now see deconversion message regardless of status
|
2017-12-03 23:23:01 +00:00 |
|
CitadelStationBot
|
bf94dfd281
|
Automatic changelog generation for PR #4191 [ci skip]
|
2017-12-03 17:21:31 -06:00 |
|
 deathride58andGitHub
|
51f07eb65a
|
Merge pull request #4191 from Citadel-Station-13/upstream-merge-33189
[MIRROR] Fixes spelling error in opened cryogenic pods.
|
2017-12-03 23:21:28 +00:00 |
|
 deathride58andGitHub
|
fc813e748b
|
Merge pull request #4188 from Citadel-Station-13/upstream-merge-33179
[MIRROR] Removes the mob mouse from maintenance from maps
|
2017-12-03 23:21:02 +00:00 |
|
CitadelStationBot
|
73956e0e88
|
Automatic changelog generation for PR #4171 [ci skip]
|
2017-12-03 17:20:42 -06:00 |
|
 deathride58andGitHub
|
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 |
|
CitadelStationBot
|
6b245207c1
|
Crash to timers and INFINITY check to beams.
|
2017-12-03 12:45:27 -06:00 |
|
 jammer312andCitadelStationBot
|
b1e15a0da2
|
Crash to timers and INFINITY check to beams. (#33219)
* beams
* timers
* >= instead of !=
* whooops
|
2017-12-03 12:45:27 -06:00 |
|
CitadelStationBot
|
824f428a52
|
spellcheck weapon firing mechanism description
|
2017-12-03 12:42:10 -06:00 |
|
 checkraisefoldandCitadelStationBot
|
96a064258f
|
Spellcheck (#33214)
|
2017-12-03 12:42:10 -06:00 |
|
 LetterJayandGitHub
|
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 |
|
 LetterJayandGitHub
|
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 |
|
 LetterJayandGitHub
|
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 |
|
 LetterJayandGitHub
|
b2f1359795
|
Merge pull request #4185 from Citadel-Station-13/upstream-merge-33197
[MIRROR] Fixes syndieborg spawner
|
2017-12-03 06:14:25 -06:00 |
|
 LetterJayandGitHub
|
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 |
|
 LetterJayandGitHub
|
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 |
|
 LetterJayandGitHub
|
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 |
|
 LetterJayandGitHub
|
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 |
|
 LetterJayandGitHub
|
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 |
|
 LetterJayandGitHub
|
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
|
efceed4277
|
tgui
|
2017-12-03 06:09:42 -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 |
|
 LetterJayandGitHub
|
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 |
|
 LetterJayandGitHub
|
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
|
67f7fe38c4
|
Revolutionaries can now see deconversion message regardless of status
|
2017-12-02 17:47:30 -06:00 |
|
 ExcessiveUseOfCobblestoneandCitadelStationBot
|
ae5221371f
|
Revolutionaries can now see deconversion message regardless of status (#33202)
|
2017-12-02 17:47:30 -06:00 |
|
CitadelStationBot
|
71b92b8cd1
|
Fixes spelling error in opened cryogenic pods.
|
2017-12-02 09:45:07 -06:00 |
|
 BeeSting12andCitadelStationBot
|
8017aac116
|
Fixes spelling error in opened cryogenic pods. (#33189)
|
2017-12-02 09:45:07 -06:00 |
|
CitadelStationBot
|
513056ff60
|
cardboard no longer can damage you
|
2017-12-02 09:44:48 -06:00 |
|
 LeoandCitadelStationBot
|
4723a1813b
|
Merge pull request #33180 from praisenarsie/patch-13
cardboard no longer can damage you
|
2017-12-02 09:44:47 -06:00 |
|
CitadelStationBot
|
94105ab103
|
Removes the mob mouse from maintenance from maps
|
2017-12-02 09:44:39 -06:00 |
|
 LeoandCitadelStationBot
|
f016daa833
|
Merge pull request #33179 from nicbn/removesmices
Removes the mob mouse from maintenance from maps
|
2017-12-02 09:44:39 -06:00 |
|
 LeoandCitadelStationBot
|
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 |
|
 vuonojenmustaturskaandCitadelStationBot
|
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 |
|
 AnturKandCitadelStationBot
|
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 BrownandCitadelStationBot
|
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 |
|
 FrozenGuy5andCitadelStationBot
|
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 |
|