CitadelStationBot
|
458c437a73
|
Automatic changelog generation for PR #4580 [ci skip]
|
2017-12-30 05:03:51 -06:00 |
|
LetterJay
|
4599680f68
|
Merge pull request #4580 from Citadel-Station-13/upstream-merge-33842
[MIRROR] Internal radio implant
|
2017-12-30 05:03:48 -06:00 |
|
LetterJay
|
2d9a70a487
|
Update uplink_kits.dm
|
2017-12-29 18:42:44 -06:00 |
|
LetterJay
|
48e0c47410
|
Merge pull request #4520 from Citadel-Station-13/upstream-merge-33783
[MIRROR] Prefixed all disability defines with DISABILITY_ to fix a name collision
|
2017-12-29 09:02:53 -06:00 |
|
LetterJay
|
a56882556b
|
Update _eminence.dm
|
2017-12-29 07:36:03 -06:00 |
|
LetterJay
|
a64a1e4a5c
|
Merge branch 'master' into upstream-merge-33783
|
2017-12-29 06:49:47 -06:00 |
|
LetterJay
|
6d52395643
|
Merge pull request #4587 from Citadel-Station-13/upstream-merge-33899
[MIRROR] Fixes air alarm contaminated mode
|
2017-12-29 06:48:09 -06:00 |
|
LetterJay
|
e17f9fdc07
|
Merge pull request #4586 from Citadel-Station-13/upstream-merge-33895
[MIRROR] Corrects abductor uncuffing message
|
2017-12-29 06:47:56 -06:00 |
|
LetterJay
|
b2b10703f0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2017-12-29 06:47:28 -06:00 |
|
LetterJay
|
c652bd6a46
|
cl
|
2017-12-29 06:47:17 -06:00 |
|
LetterJay
|
464edc7699
|
Merge pull request #4585 from Citadel-Station-13/upstream-merge-33896
[MIRROR] Fixes apple/banana/potato juicing
|
2017-12-29 06:30:04 -06:00 |
|
LetterJay
|
0bfd05e668
|
Merge pull request #4584 from Citadel-Station-13/upstream-merge-33857
[MIRROR] Increases research point income by 33% (APPROVED BY KORPHAERON)
|
2017-12-29 06:26:30 -06:00 |
|
CitadelStationBot
|
7caa5a48b1
|
Automatic changelog generation for PR #4583 [ci skip]
|
2017-12-29 06:26:08 -06:00 |
|
LetterJay
|
80ce187d3d
|
Merge pull request #4583 from Citadel-Station-13/upstream-merge-33873
[MIRROR] The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
|
2017-12-29 06:26:06 -06:00 |
|
CitadelStationBot
|
fcbb8d1a2f
|
Automatic changelog generation for PR #4582 [ci skip]
|
2017-12-29 06:25:56 -06:00 |
|
LetterJay
|
b8370a7786
|
Merge pull request #4582 from Citadel-Station-13/upstream-merge-33882
[MIRROR] Spell action buttons finally fixed
|
2017-12-29 06:25:54 -06:00 |
|
CitadelStationBot
|
b778fd1251
|
Automatic changelog generation for PR #4581 [ci skip]
|
2017-12-29 06:25:43 -06:00 |
|
LetterJay
|
71a51528c3
|
Merge pull request #4581 from Citadel-Station-13/upstream-merge-33847
[MIRROR] Adds colour shift to timestop
|
2017-12-29 06:25:41 -06:00 |
|
LetterJay
|
72ab9444c1
|
Merge pull request #4578 from Citadel-Station-13/upstream-merge-33876
[MIRROR] Cleans up survivor counting tiny bit
|
2017-12-29 06:25:11 -06:00 |
|
LetterJay
|
9d7dc29efc
|
Merge pull request #4577 from Citadel-Station-13/upstream-merge-33874
[MIRROR] CTF flags are no longer locked to CTF.
|
2017-12-29 06:24:57 -06:00 |
|
LetterJay
|
cbc43aeacf
|
Merge pull request #4576 from Citadel-Station-13/upstream-merge-33875
[MIRROR] Makes default admin websound volume work again.
|
2017-12-29 06:24:42 -06:00 |
|
CitadelStationBot
|
1b02f385b4
|
Automatic changelog generation for PR #4575 [ci skip]
|
2017-12-29 06:24:23 -06:00 |
|
LetterJay
|
79e9e039a8
|
Merge pull request #4575 from Citadel-Station-13/upstream-merge-33878
[MIRROR] Fixes ghost light not moving while orbiting
|
2017-12-29 06:24:21 -06:00 |
|
CitadelStationBot
|
4aff93c564
|
Automatic changelog generation for PR #4574 [ci skip]
|
2017-12-29 06:24:11 -06:00 |
|
LetterJay
|
0f328e22b2
|
Merge pull request #4574 from Citadel-Station-13/upstream-merge-33558
[MIRROR] Dead cultists can now cross Reebe's "Servant Blocker"
|
2017-12-29 06:24:09 -06:00 |
|
LetterJay
|
b13d4dd721
|
Merge pull request #4572 from Citadel-Station-13/upstream-merge-33807
[MIRROR] Made atoms not smooth with shuttles
|
2017-12-29 06:23:12 -06:00 |
|
LetterJay
|
93914f2a31
|
Merge pull request #4571 from Citadel-Station-13/upstream-merge-33902
[MIRROR] Fixes admin fingerprintslast
|
2017-12-29 06:23:01 -06:00 |
|
LetterJay
|
f093bb8fec
|
Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
|
2017-12-29 06:22:35 -06:00 |
|
CitadelStationBot
|
9320c7493f
|
Automatic changelog generation for PR #4569 [ci skip]
|
2017-12-29 06:22:28 -06:00 |
|
LetterJay
|
3c204c0125
|
Merge pull request #4569 from Citadel-Station-13/upstream-merge-33867
[MIRROR] Fixes ethanol + book reaction message
|
2017-12-29 06:22:26 -06:00 |
|
LetterJay
|
bbaee9f3d7
|
Merge pull request #4568 from Citadel-Station-13/upstream-merge-33880
[MIRROR] Fixes wall CanPass
|
2017-12-29 06:22:13 -06:00 |
|
LetterJay
|
69766d8a32
|
Merge pull request #4567 from Citadel-Station-13/upstream-merge-33869
[MIRROR] Add a new and improved mapmerge
|
2017-12-29 06:21:58 -06:00 |
|
LetterJay
|
c7db4e8310
|
also syncs a bunch of shit
|
2017-12-29 04:12:43 -06:00 |
|
CitadelStationBot
|
e023cb88cd
|
Fixes air alarm contaminated mode
|
2017-12-29 02:57:42 -06:00 |
|
YPOQ
|
a41a508475
|
Fixes air alarm contaminated mode (#33899)
* Fixes air alarm contaminated mode
* set_filters, paths instead of ids
* Readds gasid2path call
|
2017-12-29 02:57:42 -06:00 |
|
CitadelStationBot
|
911c315fc4
|
Corrects abductor uncuffing message
|
2017-12-29 02:56:30 -06:00 |
|
XDTM
|
6eabea6a71
|
Corrects abductor uncuffing message (#33895)
* Corrects abductor uncuffing message
* breaks
|
2017-12-29 02:56:30 -06:00 |
|
CitadelStationBot
|
0373fb3961
|
Fixes apple/banana/potato juicing
|
2017-12-29 02:56:22 -06:00 |
|
YPOQ
|
8bf721d5b7
|
Fixes plant juicing (#33896)
|
2017-12-29 02:56:22 -06:00 |
|
CitadelStationBot
|
7ae2703bb4
|
Increases research point income by 33% (APPROVED BY KORPHAERON)
|
2017-12-29 02:55:10 -06:00 |
|
Buggy123
|
2c40a61968
|
Increases research point income by 33% (#33857)
|
2017-12-29 02:55:10 -06:00 |
|
CitadelStationBot
|
dec107a95c
|
The Radiance (eminence after ratvar awakens) can now ignore chapel tiles
|
2017-12-29 02:55:03 -06:00 |
|
MoreRobustThanYou
|
07ba4e8189
|
The Radiance (eminence after ratvar awakens) can now ignore chapel tiles (#33873)
|
2017-12-29 02:55:03 -06:00 |
|
CitadelStationBot
|
42ee5fb480
|
Spell action buttons finally fixed
|
2017-12-29 02:54:50 -06:00 |
|
Robustin
|
d7723a064c
|
Spell action buttons finally fixed (#33882)
* Action button fix
* Action button fix
* Spell action button fix
* Spell action button fix
* Update alien_powers.dm
* Update spell.dm
* Action button fix
* Update touch_attacks.dm
|
2017-12-29 02:54:50 -06:00 |
|
CitadelStationBot
|
15fa9567e9
|
Adds colour shift to timestop
|
2017-12-29 02:53:37 -06:00 |
|
CosmicScientist
|
0078782285
|
Adds colour shift to timestop (#33847)
* For PKPenguin, from Cosmic
* Removes a colour removal line due to no functionality
|
2017-12-29 02:53:37 -06:00 |
|
coiax
|
866318e33e
|
Internal radio implant
|
2017-12-29 02:52:24 -06:00 |
|
LetterJay
|
518b264654
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783
# Conflicts:
# _maps/map_files/generic/CentCom.dmm
# code/modules/mob/living/living.dm
|
2017-12-29 01:34:17 -06:00 |
|
LetterJay
|
1047dccdd5
|
fk
|
2017-12-29 01:20:09 -06:00 |
|