Sawu 0de72483bc Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded ...

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

2015-01-14 18:35:29 +11:00

..

admin

fixes some compile errors with my previous PR

2015-01-13 00:45:58 -08:00

assembly

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

2015-01-04 01:52:14 +00:00

awaymissions

Fixes conflicts

2014-12-30 15:12:09 +03:00

client

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

2015-01-04 01:52:14 +00:00

clothing

Merge pull request #6981 from dannno/bandanno's

2015-01-13 21:49:47 -03:00

crafting

fixed compile errors

2014-12-24 21:03:22 -08:00

detectivework

…

emoji

…

events

Merge pull request #6956 from Carn/#3554

2015-01-13 00:58:42 -06:00

flufftext

further changes to the ranged stun system

2015-01-01 22:22:03 -08:00

food&drinks

Merge pull request #6137 from Iamgoofball/byond

2015-01-14 02:31:56 -03:00

holiday

…

hydroponics

Merge pull request #6818 from Ergovisavi/more_pod_cloning

2015-01-06 22:53:41 -03:00

library

Defines allowed books in main bookcase define

2014-12-31 23:08:23 -05:00

mining

Fixes the holosign projector making signs when put into storage, generalizes can_be_placed_into and improves the check in objects that use it.

2015-01-07 01:09:58 -07:00

mob

removes getTotalLoss() for REAL THIS TIME

2015-01-13 21:02:37 -08:00

nano

SubSystem rewrite

2014-12-31 13:25:41 +00:00

paperwork

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

2015-01-04 01:52:14 +00:00

power

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

2015-01-04 01:52:14 +00:00

projectiles

Merge pull request #6737 from tkdrg/hurr

2015-01-13 02:13:38 -06:00

reagents

Merge pull request #6137 from Iamgoofball/byond

2015-01-14 02:31:56 -03:00

recycling

Merge pull request #6324 from Razharas/GenShit

2014-12-31 17:24:15 -03:00

research

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

2015-01-14 18:35:29 +11:00

scripting

Updates/fixes to NTSL

2015-01-03 17:43:43 -08:00

security levels

…

shuttle

Resolves #6953 - Shuttle transparent corners now inherit a snapshot of the turf they replace. Note: don't use them for interiors! Only external corners!.

2015-01-11 18:42:58 +00:00

surgery

Makes butcher's cleaver a child of kitchen knife

2015-01-05 17:23:03 -05:00

telesci

SubSystem rewrite

2014-12-31 13:25:41 +00:00