bgobandit eaf93e34cd Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb ...

Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2016-05-15 17:19:14 -04:00

..

admin

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

2016-05-15 17:19:14 -04:00

assembly

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

2016-05-07 12:33:06 +02:00

atmospherics

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

2016-05-10 01:14:44 -04:00

awaymissions

Merge pull request #17284 from MMMiracles/spookyjookie

2016-05-13 20:22:56 -04:00

cargo

Merge pull request #17654 from coiax/fix-17624

2016-05-15 14:59:42 +02:00

chatter

improve chatter regex to prevent infinite loop

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

client

Fixes announcement prefs, fixes SOUND_ANNOUNCEMENTS (#17626)

2016-05-14 00:55:50 +02:00

clothing

swat mask now hides hair (#17675)

2016-05-14 19:24:39 -05:00

crafting

Adds Bone Weaponry (#17672)

2016-05-14 18:31:36 -05:00

detectivework

The Creampie Throw Update (#17392)

2016-05-08 21:39:23 +02:00

emoji

…

events

Adds artificers, reduced juggs/wraiths

2016-05-13 11:01:33 -04:00

flufftext

…

food&drinks

Moved crayon code out of toys.dm and into crayons.dm

2016-05-10 22:53:47 +02:00

games

Even more Cards Against Spess tweaks. (#17398)

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

holiday

Turns tablecrafting into personal crafting (#17341)

2016-05-09 18:14:48 +02:00

holodeck

…

html_interface

…

hydroponics

SLIP-SANITY (#17096)

2016-05-10 22:52:05 -05:00

jobs

fancy steel-toed boots

2016-05-09 15:34:26 -04:00

library

Devil Antag Round 2. (#15794)

2016-05-08 18:44:27 +01:00

lighting

…

mining

Merge pull request #17634 from KorPhaeron/austurfs2

2016-05-14 15:10:55 -05:00

mob

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

2016-05-15 17:19:14 -04:00

ninja

Ghost role event code cleanup (#17206)

2016-05-09 17:10:11 +02:00

paperwork

[s] Removes another world << from stamps (#17655)

2016-05-14 06:41:13 -05:00

power

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

procedural mapping

Machine/computer boards and frames refactor (#17300)

2016-05-08 12:11:18 +02:00

projectiles

Fixes projectile destruction breaking energy guns.

2016-05-14 16:31:17 +02:00

reagents

Adds new items to the mining vendors. (#17362)

2016-05-11 22:19:47 -05:00

recycling

…

research

Merge pull request #17619 from phil235/FixRnDThrow

2016-05-13 17:36:51 -04:00

ruins

Adds new items to the mining vendors. (#17362)

2016-05-11 22:19:47 -05:00

security levels

…

shuttle

Adds two alternate shuttles (#17592)

2016-05-14 19:06:25 -05:00

space transition

…

spells

unrobustin fixes

2016-05-09 15:45:31 -04:00

stock_market

…

surgery

Specflag'd Dismemberment (#17469)

2016-05-15 22:05:42 +02:00

telesci

Adds new items to the mining vendors. (#17362)

2016-05-11 22:19:47 -05:00

tgui

…

tooltip

…

uplink

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

2016-05-05 21:57:10 +02:00

vehicles

…