75fe7bfa65
Merge pull request #4402 from Citadel-Station-13/upstream-merge-33578
...
[MIRROR] Changes manage job slots to use a browser datum, also lets it be used before roundstart
2017-12-18 15:19:22 -06:00
0643aa4fc0
Merge pull request #4399 from Citadel-Station-13/upstream-merge-33542
...
[MIRROR] Fixes mecha drifting.
2017-12-18 15:19:13 -06:00
5636d9dad3
Merge pull request #4397 from Citadel-Station-13/upstream-merge-33433
...
[MIRROR] Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter.
2017-12-18 15:17:49 -06:00
bd1c186111
Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181
...
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
2017-12-17 21:26:08 -06:00
21a9b09bf5
Merge pull request #4389 from Michiyamenotehifunana/NEB-consolidation
...
Consolidates NEB code into a modular package
2017-12-17 21:25:42 -06:00
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
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
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
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
f3390aee98
Merge branch 'master' into NEB-consolidation
2017-12-17 20:37:34 -06:00
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
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
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
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
1c380e3ed4
Update verbs.dm
2017-12-17 17:50:05 -06:00
3c5632bad2
Update pill.dm
2017-12-17 17:38:51 -06:00
67e7f62416
Update shock_kit.dm
2017-12-17 17:38:17 -06:00
eb9260c8bf
Update implantcase.dm
2017-12-17 17:38:09 -06:00
5c3b500ba9
Update camera.dm
2017-12-17 17:38:00 -06:00
8d6d561950
Update beebox.dm
2017-12-17 17:37:53 -06:00
6a09d5c981
Merge pull request #33578 from lzimann/job
...
Changes manage job slots to use a browser datum, also lets it be used before roundstart
2017-12-17 04:09:45 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
ce22210b47
Fixes mecha drifting. ( #33542 )
...
* Fixes mecha drifting.
2017-12-16 04:09:03 -06:00
b1efb191bc
fixes brain_damage_lines.json compile errors
2017-12-15 16:35:07 -08:00
1cd746ba67
Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter. ( #33433 )
...
* Added two new components, HSV to Hex RGB and RGB to Hex RGB, along with icons.
* Added valid input ranges to the extended_desc of the new converter components.
2017-12-15 17:13:20 -06:00
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
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
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
2152bc7121
Adds some permission checks to admin/topic ( #33527 )
2017-12-15 03:27:46 -06:00
f7a943575d
Removed drone light in favor of night vision
2017-12-15 03:26:35 -06:00
e77c1a8a07
Consolidates NEB code into a modular package
2017-12-15 16:57:22 +08:00
05db439c1e
SSinput tweaks to address server side lag
2017-12-14 23:11:52 -06:00
a3ee534eb8
Merge pull request #33512 from AnturK/exiledmob
...
Fixes gateway ignoring exile implants in simple mobs
2017-12-14 22:34:55 -06:00
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
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
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
c4b7b940d2
Merge pull request #4345 from Citadel-Station-13/upstream-merge-33475
...
[MIRROR] Antag spawner fixes
2017-12-15 04:20:27 +00:00
c2153eb279
Update ash_walker_den.dm
2017-12-14 19:38:14 -06:00
d2d9cd7fc2
Update logout.dm
2017-12-14 19:12:27 -05:00
c27c52cf58
Player Z-tracking, again
2017-12-14 17:35:35 -06:00
ede6f432bc
Update pen.dm
2017-12-14 17:24:19 -05:00
ba928eae5e
Update light.dm
2017-12-14 17:23:42 -05:00
8beeeefa44
Update items.dm
2017-12-14 17:23:09 -05:00
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
f1ad5fe4d8
Merge pull request #4378 from Citadel-Station-13/upstream-merge-33207
...
[MIRROR] New closet sprites
2017-12-14 22:20:24 +00:00
382017cbe8
Merge pull request #33298 from QualityVan/zombrain
...
Fixes zombie head removal
2017-12-14 15:54:07 -06:00
6f9ecf2f32
New closet sprites ( #33207 )
...
They're new sprites deal with it
2017-12-14 15:49:49 -06:00
2aef00daf0
All-In-One grinder results are now defined by type, not by huge lists
2017-12-14 15:48:39 -06:00
253a3d519e
Adds SDQL chat command ( #33366 )
...
Allow's calling SDQL from bots supporting the CHAT system API
2017-12-14 15:44:25 -06:00
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
LetterJay