Commit Graph

3894 Commits

Author SHA1 Message Date
LetterJay
822cddc718 Update Hallucination.dm 2017-08-14 08:55:45 -05:00
LetterJay
80bb075eb3 Update Hallucination.dm.rej 2017-08-14 08:24:58 -05:00
LetterJay
fdfdd4fc21 Update admin_investigate.dm 2017-08-14 08:24:34 -05:00
LetterJay
4edf9880d6 Update logging.dm 2017-08-14 08:23:46 -05:00
CitadelStationBot
79e6963aca Hallucinations 3.0 2017-07-30 19:58:28 -05:00
CitadelStationBot
10487c9b54 Automatic changelog generation for PR #2190 [ci skip] 2017-07-30 14:04:25 -05:00
LetterJay
ccbb3926d7 Merge pull request #2190 from Citadel-Station-13/upstream-merge-29565
[MIRROR] Fixes a lot of eye damage procs
2017-07-30 14:04:23 -05:00
CitadelStationBot
5da5e58ee5 Fixes a lot of eye damage procs 2017-07-30 08:16:38 -05:00
CitadelStationBot
767b1b3e38 Automatic changelog generation for PR #2054 [ci skip] 2017-07-29 23:56:53 -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
CitadelStationBot
e11cd54ad9 Automatic changelog generation for PR #2184 [ci skip] 2017-07-29 21:50:39 -05:00
CitadelStationBot
2d82262e50 Fixes syringes being unable to inject at all if the target has thick clothing on any slot (#2184) 2017-07-29 19:50:37 -07:00
CitadelStationBot
2342c8f2bc Fixes scythes cutting kudzu (#2185) 2017-07-29 19:50:24 -07:00
CitadelStationBot
6990dcbceb Grammar fix for revenants 2017-07-29 21:03:12 -05:00
LetterJay
d07b21a9d8 Merge pull request #2174 from Citadel-Station-13/upstream-merge-29325
[MIRROR] Prolonging Prisms have a higher cost to delay, but no longer increase in cost based off of CV
2017-07-29 15:47:48 -05:00
LetterJay
d123e865f0 Merge pull request #2177 from Citadel-Station-13/kevinz000-patch-5
Fixes DoS vulnerability
2017-07-29 15:47:32 -05:00
kevinz000
b30bf0c1d1 Update browserOutput.dm 2017-07-29 04:42:57 -07:00
CitadelStationBot
e06f138aa2 Automatic changelog generation for PR #2173 [ci skip] 2017-07-29 01:52:04 -05:00
CitadelStationBot
d16f68b4da Sigils of Transmission can now drain power, but Interdiction Lenses have been removed (#2173) 2017-07-28 23:52:02 -07:00
CitadelStationBot
d64b2d7235 Automatic changelog generation for PR #2161 [ci skip] 2017-07-29 01:51:38 -05:00
CitadelStationBot
9d7820a81c Fixes two consistency/grammar issues (#2161) 2017-07-28 23:51:36 -07:00
CitadelStationBot
108fd9503c Automatic changelog generation for PR #2168 [ci skip] 2017-07-29 01:51:25 -05:00
CitadelStationBot
adc7a52b8d BYPASSES THE DEEP FREEZE (#2168) 2017-07-28 23:51:24 -07:00
CitadelStationBot
3b665e7310 Automatic changelog generation for PR #2169 [ci skip] 2017-07-29 01:51:13 -05:00
CitadelStationBot
64b721ae4f Halloween Costumes (#2169) 2017-07-28 23:51:11 -07:00
CitadelStationBot
cee5ab815a Cleans up the tools folder (#2171) 2017-07-28 23:50:56 -07:00
CitadelStationBot
8df718a587 Automatic changelog generation for PR #2167 [ci skip] 2017-07-28 18:50:55 -05:00
CitadelStationBot
a1c41c461a Ashstorms Matryoshka bugfix (#2167) 2017-07-28 16:50:53 -07:00
CitadelStationBot
30cb54a928 Prolonging Prisms have a higher cost to delay, but no longer increase in cost based off of CV 2017-07-28 18:45:22 -05:00
CitadelStationBot
3f8acbc2c4 Removes bows (#2163) 2017-07-28 02:53:47 -07:00
CitadelStationBot
6b9f8a9282 Readds missing CTF weapon sprites (#2164) 2017-07-28 02:53:32 -07:00
CitadelStationBot
8cb2b1b59e Fixes SDQL for (hopefully) the last time by removing try catches. Removes automatic runtime tracking from SDQL. (#2160) 2017-07-27 06:44:45 -07:00
CitadelStationBot
269e2cbd64 Removes the dangerrating variable, which is completely unused (#2157) 2017-07-27 06:44:35 -07:00
CitadelStationBot
53dc265b94 Fixes virology timing in a better way (#2124) 2017-07-27 05:30:43 -07:00
CitadelStationBot
5872213462 Automatic changelog generation for PR #2140 [ci skip] 2017-07-27 07:28:00 -05:00
ktccd
c52f7a0475 Delayed objective (#2140)
Delayed objective [Latejoiners can now be selected as traitor targets]
2017-07-27 05:27:58 -07:00
CitadelStationBot
34eea1085b Automatic changelog generation for PR #2147 [ci skip] 2017-07-27 03:19:07 -05:00
LetterJay
6986c3bb91 PDA Icon Update (Again) (#2147) 2017-07-27 01:19:05 -07:00
CitadelStationBot
e085c33ac5 Makes narsie less huge (#2144) 2017-07-26 22:57:11 -07:00
CitadelStationBot
0f23a00e40 Cleaned up some turf decals, fixed beach away mission (#2152) 2017-07-26 22:56:55 -07:00
CitadelStationBot
7c65bae7ba Cleaned up doubled turf on omega (#2150) 2017-07-26 22:56:43 -07:00
CitadelStationBot
dc0507c7e0 Automatic changelog generation for PR #2151 [ci skip] 2017-07-27 00:56:29 -05:00
CitadelStationBot
9ac752afb4 Makes chemical payload bomb cores less misleading (#2151) 2017-07-26 22:56:27 -07:00
CitadelStationBot
7cdeae21a5 Moved abductor ships further apart (#2149) 2017-07-26 22:56:13 -07:00
CitadelStationBot
002b20a725 Automatic changelog generation for PR #2142 [ci skip] 2017-07-26 19:52:21 -05:00
LetterJay
471f9d064b Merge pull request #2142 from Citadel-Station-13/upstream-merge-29493
[MIRROR] Fixes guns staying zoomed in after being unequipped
2017-07-26 19:52:19 -05:00