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

Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/projectiles.dmi

2015-01-15 02:30:31 -05:00

..

admin

Merge pull request #6968 from phil235/LockdownMalfFix

2015-01-14 14:58:10 -03: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 branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS

2015-01-15 02:30:31 -05:00

crafting

…

detectivework

…

emoji

…

events

Merge pull request #6968 from phil235/LockdownMalfFix

2015-01-14 14:58:10 -03: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

Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path.

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

mining

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

mob

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

2015-01-15 02:30:31 -05: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

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

projectiles

Merge pull request #7002 from Menshin/gunlights_runtimes_fix

2015-01-14 17:29:15 +01: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

Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path.

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

scripting

Updates/fixes to NTSL

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

security levels

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

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