Commit Graph

2839 Commits

Author SHA1 Message Date
LetterJay
3be62f3ccd Update _lists.dm 2017-07-31 17:33:13 -05:00
LetterJay
576ef2510c Merge branch 'master' into upstream-merge-29367 2017-07-31 17:19:31 -05:00
LetterJay
bb4a98937f Merge pull request #2071 from Citadel-Station-13/upstream-merge-29363
[MIRROR] Fix missing keyword argument syntax in typecache_filter_list
2017-07-31 17:14:38 -05:00
LetterJay
aedd22090b Update _lists.dm 2017-07-31 15:40:52 -05:00
LetterJay
af581f8ab1 Merge pull request #2065 from Citadel-Station-13/upstream-merge-29280
[MIRROR] Refactor Lung Handling
2017-07-31 15:37:41 -05:00
ktccd
a2f92461a4 Merge pull request #2210 from Citadel-Station-13/upstream-merge-29585
[MIRROR] Improves several Sound Loops' Performance
2017-07-31 22:06:17 +02:00
ktccd
3083ad7aa0 Merge pull request #2205 from Citadel-Station-13/upstream-merge-29581
[MIRROR] Corrected holding cell access requirements
2017-07-31 22:05:09 +02:00
ktccd
9918ed7d0c Merge pull request #2204 from Citadel-Station-13/upstream-merge-29582
[MIRROR] Update labor camp stacker accepted sheets.
2017-07-31 22:04:28 +02:00
ktccd
55e2c49b5a Merge pull request #2203 from Citadel-Station-13/upstream-merge-29583
[MIRROR] Fixes a cliffhanger comment
2017-07-31 22:03:16 +02:00
ktccd
b8c8f9d3b2 Merge pull request #2202 from Citadel-Station-13/upstream-merge-29577
[MIRROR] Cyborgs grabbing ore works consistently
2017-07-31 22:02:44 +02:00
ktccd
445fb5a395 Merge pull request #2196 from Citadel-Station-13/upstream-merge-29412
[MIRROR] Colossus's shotgun is now a static-spread blast of 6 bolts
2017-07-31 21:59:10 +02:00
ktccd
a6e74b9a27 Merge pull request #2193 from Citadel-Station-13/upstream-merge-29572
[MIRROR] Removes a rogue period from the sliver theft objective
2017-07-31 21:51:42 +02:00
ktccd
f74baf59e7 Merge pull request #2186 from Citadel-Station-13/upstream-merge-29547
[MIRROR] Player-controlled medibots are now alerted when they can't heal someone
2017-07-31 21:48:50 +02:00
ktccd
aa5ce7ebb1 Merge pull request #2166 from Citadel-Station-13/upstream-merge-29540
[MIRROR] Fixes mutation toxins not stunning properly
2017-07-31 21:46:03 +02:00
CitadelStationBot
3d53f888b1 Improves several Sound Loops' Performance 2017-07-31 14:35:16 -05:00
CitadelStationBot
4ac6b49871 Corrected holding cell access requirements 2017-07-31 08:58:05 -05:00
CitadelStationBot
29b26fbc3e Update labor camp stacker accepted sheets. 2017-07-31 08:57:59 -05:00
CitadelStationBot
2d74f9f45a Fixes a cliffhanger comment 2017-07-31 08:57:56 -05:00
CitadelStationBot
d3f488a5ee Cyborgs grabbing ore works consistently 2017-07-31 07:10:17 -05:00
LetterJay
8a174f8a76 Update damage_procs.dm 2017-07-31 06:24:52 -05:00
LetterJay
dc9c53ae0a Update combat.dm 2017-07-31 06:13:00 -05:00
Poojawa
f53d66b319 Rabbit parts (#2201) 2017-07-31 05:54:16 -05:00
LetterJay
ac9c24dfe5 Update combat.dm 2017-07-31 05:53:58 -05:00
LetterJay
62d7f47497 Merge pull request #2170 from Citadel-Station-13/upstream-merge-29455
[MIRROR] Adds 3D Sound System
2017-07-31 03:43:20 -05:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
LetterJay
79bf3edab9 Update syndi.dm 2017-07-31 02:14:50 -05:00
LetterJay
4f324214c5 Update plasmamen.dm 2017-07-31 02:14:15 -05:00
LetterJay
0bba1ec9b6 Update miscellaneous.dm 2017-07-31 02:13:42 -05:00
LetterJay
fe37d52cc5 Update hardsuit.dm 2017-07-31 02:12:22 -05:00
LetterJay
f90ddf0596 Update lizard.dm 2017-07-30 23:35:11 -05:00
LetterJay
bdcc4bc429 Update miscellaneous.dm 2017-07-30 23:33:58 -05:00
LetterJay
4c0c11524b Update syndi.dm 2017-07-30 23:32:50 -05:00
LetterJay
a99fa2ea49 Update plasmamen.dm 2017-07-30 23:31:33 -05:00
LetterJay
e3dfc8b61d Update miscellaneous.dm 2017-07-30 23:30:51 -05:00
LetterJay
85885330ba Update hardsuit.dm 2017-07-30 23:29:36 -05:00
LetterJay
40216683e0 Update gibspawner.dm 2017-07-30 23:26:16 -05:00
LetterJay
feeb6cdd8b Update game_mode.dm 2017-07-30 23:24:59 -05:00
LetterJay
c2a1a62a2d Merge pull request #2154 from Citadel-Station-13/upstream-merge-29504
[MIRROR] Alcohol Bottle Resprite
2017-07-30 23:15:33 -05:00
LetterJay
77c67b31c6 Merge pull request #2064 from Citadel-Station-13/upstream-merge-29290
[MIRROR] Unwrenching clockwork structures no longer damages them
2017-07-30 23:14:39 -05:00
LetterJay
05f7040d12 Merge pull request #2155 from Citadel-Station-13/kevinz000-patch-4
REEEEEE USE YOUR TRUE/FALSE DEFINES KTCCD
2017-07-30 23:13:42 -05:00
CitadelStationBot
b953db165d Colossus's shotgun is now a static-spread blast of 6 bolts 2017-07-30 19:58:21 -05:00
CitadelStationBot
a98322d497 Removes a rogue period from the sliver theft objective 2017-07-30 19:58:11 -05:00
LetterJay
0ac85c6756 Update sound.dm 2017-07-30 14:43:35 -05:00
LetterJay
896fbdeed7 Update sound.dm 2017-07-30 14:10:59 -05:00
CitadelStationBot
5da5e58ee5 Fixes a lot of eye damage procs 2017-07-30 08:16:38 -05:00
LetterJay
70a5aed428 Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977
[MIRROR] Augment Styles/Changes
2017-07-29 23:56:52 -05:00
LetterJay
0e131b50e5 Merge pull request #2188 from Citadel-Station-13/upstream-merge-29546
[MIRROR] Grammar fix for revenants
2017-07-29 23:55:51 -05:00
CitadelStationBot
95f900a97d Adds emergency toolbox to escape pod supplies (#2182) 2017-07-29 19:51:55 -07:00
CitadelStationBot
f9a6ee8d76 Give c4 correct plastic_overlay (#2183) 2017-07-29 19:51:38 -07:00
CitadelStationBot
272414bd30 Fixes latejoin antagonist exploit (#2181) 2017-07-29 19:51:16 -07:00