kevinz000
|
335b6cde56
|
Merge branch 'master' into upstream-merge-26813
|
2017-05-07 22:31:16 -07:00 |
|
kevinz000
|
a87cee8a05
|
copy-paste-this-from-tg
|
2017-05-07 22:30:43 -07:00 |
|
kevinz000
|
68f7ea7fd0
|
handled rejects
|
2017-05-07 22:30:28 -07:00 |
|
kevinz000
|
2e0dd27978
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26813
|
2017-05-07 22:28:00 -07:00 |
|
kevinz000
|
066c8e8de8
|
Merge pull request #720 from Citadel-Station-13/upstream-merge-26822
[MIRROR] Trophy case hotfixes
|
2017-05-07 22:27:05 -07:00 |
|
kevinz000
|
48d9e2e349
|
fixes rejects
|
2017-05-07 22:24:26 -07:00 |
|
kevinz000
|
5d2f131d07
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-26822
|
2017-05-07 22:22:24 -07:00 |
|
kevinz000
|
13b0ae2b45
|
Merge pull request #676 from Citadel-Station-13/upstream-merge-26725
[MIRROR] Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass
|
2017-05-07 19:37:35 -07:00 |
|
kevinz000
|
03a52b2bc9
|
Merge pull request #836 from Citadel-Station-13/upstream-merge-26984
[MIRROR] Fixes clockwork obelisk logic
|
2017-05-07 19:21:56 -07:00 |
|
kevinz000
|
e3f123d5bb
|
Merge pull request #821 from Citadel-Station-13/upstream-merge-26970
[MIRROR] Fixes an inconsistency with the Banana Honk drink
|
2017-05-07 19:19:44 -07:00 |
|
kevinz000
|
68e1087825
|
Merge pull request #823 from Citadel-Station-13/upstream-merge-26959
[MIRROR] Mega arachnid
|
2017-05-07 19:17:10 -07:00 |
|
kevinz000
|
6c293e3e3d
|
Merge pull request #716 from Citadel-Station-13/upstream-merge-26768
[MIRROR] Species-locked inventory slots are now indicated.
|
2017-05-07 19:15:02 -07:00 |
|
kevinz000
|
eb9caea261
|
Merge pull request #658 from Citadel-Station-13/upstream-merge-26670
[MIRROR] The least surprising nerf: Null Crates & Emagged Plasma Export Bonus
|
2017-05-07 19:14:06 -07:00 |
|
kevinz000
|
2f55a67b7a
|
Delete packs.dm.rej
|
2017-05-07 19:13:39 -07:00 |
|
kevinz000
|
18abfb70c9
|
Update packs.dm
|
2017-05-07 19:13:29 -07:00 |
|
kevinz000
|
2a8acb13d2
|
Merge pull request #840 from Citadel-Station-13/upstream-merge-26966
[MIRROR] Fixes being able to stand on chasms
|
2017-05-07 19:07:59 -07:00 |
|
kevinz000
|
09dbd467bb
|
Merge pull request #820 from Citadel-Station-13/upstream-merge-26976
[MIRROR] Fixes away gateway
|
2017-05-07 19:07:41 -07:00 |
|
kevinz000
|
cab4c53f06
|
Merge pull request #841 from Citadel-Station-13/upstream-merge-26940
[MIRROR] Plastic sheet production - Chemistry recipe
|
2017-05-07 19:06:30 -07:00 |
|
LetterJay
|
2efe90055f
|
Revert "[MIRROR] Fixes say verbs not working"
|
2017-05-07 19:41:33 -04:00 |
|
CitadelStationBot
|
61a7897962
|
Plastic sheet production - Chemistry recipe
|
2017-05-07 18:23:05 -05:00 |
|
CitadelStationBot
|
884338d048
|
Fixes being able to stand on chasms
|
2017-05-07 18:06:44 -05:00 |
|
CitadelStationBot
|
e3b3921bf2
|
Fixes clockwork obelisk logic
|
2017-05-07 17:15:22 -05:00 |
|
LetterJay
|
75ca44a767
|
Merge pull request #827 from LetterJay/snap
Snap Emote
|
2017-05-07 15:41:32 -05:00 |
|
kevinz000
|
482ac95873
|
Merge pull request #822 from Citadel-Station-13/upstream-merge-26987
[MIRROR] Sigils of Transgression are brighter
|
2017-05-07 13:07:14 -07:00 |
|
kevinz000
|
78d64cbeed
|
Merge pull request #825 from Citadel-Station-13/upstream-merge-26941
[MIRROR] C4 planting takes 3 seconds, down from 5
|
2017-05-07 12:59:10 -07:00 |
|
LetterJay
|
659139ca1c
|
finger snap emote
|
2017-05-07 12:41:45 -05:00 |
|
CitadelStationBot
|
1a5050692b
|
Fixes his grace CtrlClick
|
2017-05-07 11:33:55 -05:00 |
|
CitadelStationBot
|
b0cceb8766
|
C4 planting takes 3 seconds, down from 5
|
2017-05-07 09:31:51 -05:00 |
|
kevinz000
|
cd95e42b69
|
Merge pull request #753 from Citadel-Station-13/upstream-merge-26870
[MIRROR] Adds an effect to Mending Mantra to show who is chanting it
|
2017-05-07 07:08:06 -07:00 |
|
CitadelStationBot
|
617bb4ed38
|
Mega arachnid
|
2017-05-07 08:55:11 -05:00 |
|
CitadelStationBot
|
281f382605
|
Sigils of Transgression are brighter
|
2017-05-07 08:54:06 -05:00 |
|
CitadelStationBot
|
27e7434320
|
Fixes an inconsistency with the Banana Honk drink
|
2017-05-07 08:54:02 -05:00 |
|
CitadelStationBot
|
164b830f23
|
Fixes away gateway
|
2017-05-07 08:52:57 -05:00 |
|
kevinz000
|
d9908a74a7
|
Merge pull request #748 from Citadel-Station-13/upstream-merge-26808
[MIRROR] Adds aesthetic basalt floor tiles
|
2017-05-07 06:24:50 -07:00 |
|
kevinz000
|
cc25c18196
|
Merge pull request #801 from Citadel-Station-13/upstream-merge-26921
[MIRROR] Internal affairs upgrades [READY]
|
2017-05-07 06:23:59 -07:00 |
|
kevinz000
|
2f2c850937
|
Delete scripture_applications.dm.rej
|
2017-05-06 22:09:58 -07:00 |
|
kevinz000
|
61baae0544
|
Merge branch 'master' into upstream-merge-26864
|
2017-05-06 22:09:35 -07:00 |
|
kevinz000
|
c1a9bb5864
|
Update scripture_applications.dm
|
2017-05-06 22:08:00 -07:00 |
|
kevinz000
|
14fe4948e9
|
Merge pull request #652 from Citadel-Station-13/upstream-merge-26685
[MIRROR] Fixed Dsay always causing a disk read
|
2017-05-06 22:03:08 -07:00 |
|
kevinz000
|
52f5226547
|
Merge pull request #750 from Citadel-Station-13/upstream-merge-26851
[MIRROR] Fixes runtime with null nutriment taste data
|
2017-05-06 22:00:16 -07:00 |
|
kevinz000
|
236c91a945
|
Merge pull request #755 from Citadel-Station-13/upstream-merge-26809
[MIRROR] Increases pixel projectile angles/accuracy
|
2017-05-06 21:59:40 -07:00 |
|
kevinz000
|
e528ec823c
|
Merge pull request #751 from Citadel-Station-13/upstream-merge-26841
[MIRROR] Fixes Set Round End Sound.
|
2017-05-06 21:45:38 -07:00 |
|
kevinz000
|
035dd93158
|
Merge pull request #756 from Citadel-Station-13/upstream-merge-26848
[MIRROR] Adds spewium toxin in traitor kits
|
2017-05-06 21:43:08 -07:00 |
|
kevinz000
|
1c7fa59d6c
|
Merge pull request #798 from Citadel-Station-13/upstream-merge-26910
This makes Nar'Sie a girl ------------> [MIRROR] hm
|
2017-05-06 21:42:22 -07:00 |
|
kevinz000
|
5ac3bb924f
|
Merge pull request #799 from Citadel-Station-13/upstream-merge-26939
[MIRROR] Blorble
|
2017-05-06 21:41:56 -07:00 |
|
kevinz000
|
83a506803a
|
Merge pull request #695 from Citadel-Station-13/upstream-merge-24002
[MIRROR] PR announcement spam prevention
|
2017-05-06 21:36:41 -07:00 |
|
kevinz000
|
7fa53c5ce4
|
Delete world.dm.rej
|
2017-05-06 21:36:15 -07:00 |
|
kevinz000
|
51442e4930
|
Merge pull request #802 from Citadel-Station-13/upstream-merge-26930
[MIRROR] Preliminary tesla projectile refactor (also insults vcordie because I'm mean.)
|
2017-05-06 21:34:07 -07:00 |
|
kevinz000
|
286e492df8
|
Merge pull request #757 from Citadel-Station-13/upstream-merge-26846
[MIRROR] Fixes detective scanner not being able to ranged scan, adds range/viewcheck vars
|
2017-05-06 21:31:47 -07:00 |
|
kevinz000
|
c8dbcb8597
|
Merge pull request #754 from Citadel-Station-13/upstream-merge-26863
[MIRROR] Fixes dropped cyborg repair modules
|
2017-05-06 21:30:12 -07:00 |
|