Razharas 9fdae2fe4e Merge pull request #17576 from LatD/Research ...

[Ready for test/merge] R&D level remake

2016-06-02 18:41:43 +03:00

..

admin

Merge pull request #18081 from KorPhaeron/create_antag

2016-06-01 19:44:03 +12:00

assembly

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-24 22:17:44 +03:00

atmospherics

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

awaymissions

Ghost sword orbits on button click, added URL, POI

2016-05-28 12:23:24 +01:00

cargo

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

chatter

improve chatter regex to prevent infinite loop

2016-05-15 20:12:17 +12:00

client

Fixes merge conflicts

2016-05-27 15:36:56 -07:00

clothing

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

crafting

Re-adds Spear to tablecrafting menu, SLAPCRAFTING IS STILL ALIVE (#17985)

2016-05-29 08:29:21 -05:00

detectivework

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-24 22:17:44 +03:00

emoji

…

events

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

flufftext

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

food_and_drinks

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

games

Even more Cards Against Spess tweaks. (#17398)

2016-05-09 15:00:40 -05:00

holiday

Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui

2016-05-28 00:24:58 +01:00

holodeck

Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.

2016-05-24 01:28:04 +02:00

html_interface

…

hydroponics

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-28 01:37:55 +03:00

jobs

Gives the bartender the slim armor variant.

2016-05-28 14:14:41 -07:00

library

Merge pull request #18005 from swankcookie/book_length

2016-05-29 17:05:33 +12:00

lighting

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

mining

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

mob

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

ninja

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

paperwork

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-28 01:37:55 +03:00

power

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

procedural_mapping

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

projectiles

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

reagents

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

recycling

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

research

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

ruins

Revert "Updates some lavaland ruins and adds new ones."

2016-06-01 16:47:16 -05:00

security_levels

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

shuttle

Mobs only take damage once from a shuttle roadkill

2016-05-31 04:31:08 +01:00

space_transition

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

spells

Merge pull request #18018 from Xhuis/general_rabbits

2016-05-29 13:34:58 -05:00

stock_market

…

surgery

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-30 18:33:55 +03:00

telesci

Merge pull request #17576 from LatD/Research

2016-06-02 18:41:43 +03:00

tgui

Merge branch 'master' of https://github.com/tgstation/-tg-station into crafting-tgui

2016-05-28 00:24:58 +01:00

tooltip

…

uplink

KA rebalance; brings back holding a satchel

2016-05-17 00:38:29 +01:00

vehicles

Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

2016-05-28 01:37:55 +03:00

zombie

Infectious zombies are now a full subspecies

2016-05-31 00:15:10 +01:00