Commit Graph

10362 Commits

Author SHA1 Message Date
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
1c380e3ed4 Update verbs.dm 2017-12-17 17:50:05 -06:00
LetterJay
67e7f62416 Update shock_kit.dm 2017-12-17 17:38:17 -06:00
LetterJay
eb9260c8bf Update implantcase.dm 2017-12-17 17:38:09 -06:00
LetterJay
5c3b500ba9 Update camera.dm 2017-12-17 17:38:00 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
LetterJay
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
deathride58
b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
CitadelStationBot
a2dd4f0fdd Further emphasises the importance of round ID in issue template 2017-12-15 14:07:20 -06:00
Jordan Brown
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-Swenson
2152bc7121 Adds some permission checks to admin/topic (#33527) 2017-12-15 03:27:46 -06:00
Trevor Serpas
f7a943575d Removed drone light in favor of night vision 2017-12-15 03:26:35 -06:00
oranges
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 Brown
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 Brown
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
deathride58
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
deathride58
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
deathride58
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
deathride58
c4b7b940d2 Merge pull request #4345 from Citadel-Station-13/upstream-merge-33475
[MIRROR] Antag spawner fixes
2017-12-15 04:20:27 +00:00
EtheoBoxxman
c2153eb279 Update ash_walker_den.dm 2017-12-14 19:38:14 -06:00
deathride58
d2d9cd7fc2 Update logout.dm 2017-12-14 19:12:27 -05:00
vuonojenmustaturska
c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
deathride58
e5671eece5 Merge pull request #4379 from Citadel-Station-13/upstream-merge-33298
[MIRROR] Fixes zombie head removal
2017-12-14 22:20:45 +00:00
CitadelStationBot
6108a71595 Automatic changelog generation for PR #4378 [ci skip] 2017-12-14 16:20:27 -06:00
deathride58
f1ad5fe4d8 Merge pull request #4378 from Citadel-Station-13/upstream-merge-33207
[MIRROR] New closet sprites
2017-12-14 22:20:24 +00:00
deathride58
94b93878be Merge pull request #4376 from Citadel-Station-13/upstream-merge-33366
[MIRROR] Adds SDQL chat command
2017-12-14 22:20:05 +00:00
CitadelStationBot
54bd072932 Fixes zombie head removal 2017-12-14 15:54:07 -06:00
oranges
382017cbe8 Merge pull request #33298 from QualityVan/zombrain
Fixes zombie head removal
2017-12-14 15:54:07 -06:00
CitadelStationBot
7cb8f5ceb3 New closet sprites 2017-12-14 15:49:50 -06:00