Commit Graph
10373 Commits
Author SHA1 Message Date
CitadelStationBot 4aa7e2e30b Automatic changelog generation for PR #4389 [ci skip] 2017-12-17 21:25:44 -06:00
LetterJayandGitHub 21a9b09bf5 Merge pull request #4389 from Michiyamenotehifunana/NEB-consolidation
Consolidates NEB code into a modular package
2017-12-17 21:25:42 -06:00
LetterJayandGitHub 91a26e66cf Merge pull request #4396 from Citadel-Station-13/upstream-merge-33513
[MIRROR] ahelp chat command is silent on success
2017-12-17 21:24:24 -06:00
CitadelStationBot 39a4d4c24f Automatic changelog generation for PR #4394 [ci skip] 2017-12-17 21:24:14 -06:00
LetterJayandGitHub 781f40926c Merge pull request #4394 from Citadel-Station-13/upstream-merge-33530
[MIRROR] Fix shuttle autocalls when the round is already over
2017-12-17 21:24:12 -06:00
LetterJayandGitHub cc3fddb0d7 Merge pull request #4393 from Citadel-Station-13/upstream-merge-33538
[MIRROR] Further emphasises the importance of round ID in issue template
2017-12-17 21:23:55 -06:00
LetterJayandGitHub 78dcad12e4 Merge pull request #4391 from Citadel-Station-13/upstream-merge-33527
[MIRROR] Adds some permission checks to admin/topic
2017-12-17 21:23:42 -06:00
CitadelStationBot 77b792d69a Automatic changelog generation for PR #4390 [ci skip] 2017-12-17 20:37:41 -06:00
LetterJayandGitHub 6aa1a86f88 Merge pull request #4390 from Citadel-Station-13/upstream-merge-33529
[MIRROR] Removed drone light in favor of night vision
2017-12-17 20:37:39 -06:00
LetterJayandGitHub f3390aee98 Merge branch 'master' into NEB-consolidation 2017-12-17 20:37:34 -06:00
LetterJayandGitHub 52701ebfee Merge pull request #4388 from Citadel-Station-13/upstream-merge-33517
[MIRROR] SSinput tweaks to address server side lag
2017-12-17 20:37:17 -06:00
LetterJayandGitHub d0ddcbf66b Merge pull request #4387 from Citadel-Station-13/upstream-merge-33524
[MIRROR] Fixes missing mining hammer back sprite
2017-12-17 20:37:04 -06:00
LetterJayandGitHub 1319ba6a21 Merge pull request #4386 from Citadel-Station-13/upstream-merge-33512
[MIRROR] Fixes gateway ignoring exile implants in simple mobs
2017-12-17 20:36:55 -06:00
CitadelStationBot f235a4e391 Automatic changelog generation for PR #4384 [ci skip] 2017-12-17 20:36:19 -06:00
LetterJayandGitHub 4fe21eb44d Merge pull request #4384 from EtheoBoxxman/Bhijnbutt
Ash walker tendril no longer spawns chasm on death
2017-12-17 20:36:17 -06:00
CitadelStationBot 2c9e7abb0f Automatic changelog generation for PR #4375 [ci skip] 2017-12-17 20:28:09 -06:00
LetterJayandGitHub 3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519
[MIRROR] Finishes the forceMove port
2017-12-17 20:28:07 -06:00
LetterJayandGitHub 1c380e3ed4 Update verbs.dm 2017-12-17 17:50:05 -06:00
LetterJayandGitHub 67e7f62416 Update shock_kit.dm 2017-12-17 17:38:17 -06:00
LetterJayandGitHub eb9260c8bf Update implantcase.dm 2017-12-17 17:38:09 -06:00
LetterJayandGitHub 5c3b500ba9 Update camera.dm 2017-12-17 17:38:00 -06:00
LetterJayandGitHub 8d6d561950 Update beebox.dm 2017-12-17 17:37:53 -06:00
CitadelStationBot 9a30c288f0 Automatic changelog generation for PR #4346 [ci skip] 2017-12-17 17:36:19 -06:00
LetterJayandGitHub aa09d859c7 Merge pull request #4346 from deathride58/oldpdarestoration
Restores the PDA sprites by cecily and toriate (And modularizes it)
2017-12-17 17:36:17 -06:00
LetterJayandGitHub 220e1cd8cf Merge pull request #4400 from Citadel-Station-13/revert-4329-tgsync_1
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:10:41 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
LetterJayandGitHub 715960b324 Merge pull request #4329 from Citadel-Station-13/tgsync_1
[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC
2017-12-16 12:54:00 -06:00
deathride58andkevinz000 b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
CitadelStationBot e31d218ad4 ahelp chat command is silent on success 2017-12-15 17:00:58 -06:00
orangesandCitadelStationBot b1ca28ef3c Merge pull request #33513 from tgstation/Cyberboss-patch-2
ahelp chat command is silent on success
2017-12-15 17:00:58 -06:00
CitadelStationBot f5b84e21a1 Fix shuttle autocalls when the round is already over 2017-12-15 14:53:30 -06:00
Jordan BrownandCitadelStationBot 9adb77c5e3 Merge pull request #33530 from AutomaticFrenzy/patch/autocall
Fix shuttle autocalls when the round is already over
2017-12-15 14:53:30 -06:00
CitadelStationBot a2dd4f0fdd Further emphasises the importance of round ID in issue template 2017-12-15 14:07:20 -06:00
Jordan BrownandCitadelStationBot 533c716e56 Further emphasises the importance of round ID in issue template (#33538)
* Further emphasises the importance of round ID in issue template

* Update statbus url. Add server note
2017-12-15 14:07:20 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
CitadelStationBot a4eb96b6ed Adds some permission checks to admin/topic 2017-12-15 03:27:46 -06:00
Kyle Spier-SwensonandCitadelStationBot 2152bc7121 Adds some permission checks to admin/topic (#33527) 2017-12-15 03:27:46 -06:00
Trevor SerpasandCitadelStationBot f7a943575d Removed drone light in favor of night vision 2017-12-15 03:26:35 -06:00
Michiyamenotehifunana e77c1a8a07 Consolidates NEB code into a modular package 2017-12-15 16:57:22 +08:00
orangesandCitadelStationBot 05db439c1e SSinput tweaks to address server side lag 2017-12-14 23:11:52 -06:00
CitadelStationBot 9ef339e7ee Fixes missing mining hammer back sprite 2017-12-14 22:36:07 -06:00
Jordan BrownandCitadelStationBot f91c310ac5 Merge pull request #33524 from ShizCalev/mining_hammer_back
Fixes missing mining hammer back sprite
2017-12-14 22:36:07 -06:00
CitadelStationBot 5bcdebc971 Fixes gateway ignoring exile implants in simple mobs 2017-12-14 22:34:55 -06:00
Jordan BrownandCitadelStationBot a3ee534eb8 Merge pull request #33512 from AnturK/exiledmob
Fixes gateway ignoring exile implants in simple mobs
2017-12-14 22:34:55 -06:00
CitadelStationBot b6b0ab69e3 Automatic changelog generation for PR #4338 [ci skip] 2017-12-14 22:21:58 -06:00
deathride58andGitHub ebf0817c76 Merge pull request #4338 from Citadel-Station-13/upstream-merge-33468
[MIRROR] Designs now default to department flag ALL instead of NONE
2017-12-15 04:21:56 +00:00
CitadelStationBot 4680a22b4c Automatic changelog generation for PR #4359 [ci skip] 2017-12-14 22:21:36 -06:00
deathride58andGitHub fdb9de488e Merge pull request #4359 from Citadel-Station-13/upstream-merge-33480
[MIRROR] Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-15 04:21:34 +00:00
CitadelStationBot a39e1d5515 Automatic changelog generation for PR #4383 [ci skip] 2017-12-14 22:20:52 -06:00
deathride58andGitHub 5c4d9576db Merge pull request #4383 from Citadel-Station-13/upstream-merge-33216
[MIRROR] Player Z-tracking, again
2017-12-15 04:20:50 +00:00