Ren Erthilo af9a80cce4 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/modules/mob/mob_defines.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/storage.dmi
	maps/tgstation.2.0.8.dmm

2012-04-02 00:37:54 +01:00

..

admin

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

2012-04-02 00:37:54 +01:00

assembly

…

chemical

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

2012-04-02 00:37:54 +01:00

clothing

Merge branch 'master' of git://github.com/Baystation12/Baystation12

2012-03-30 23:58:50 +01:00

critters

…

customitems

durp

2012-03-29 11:21:04 +10:30

DetectiveWork

Fixes for the fingerprint runtimes, other runtimes, the new damage system, and the new objective system, to reduce the super hard objectives.

2012-03-31 22:01:21 -07:00

flufftext

MAde appendicitis only happen once, jump to explosion link should work, hallucination improvement/sanchecking, increased the damage of things to pre-nerf levels.

2012-03-21 09:46:42 -07:00

food

TG: Moved a batch of unchecked and a few unused files into the unused folder.

2012-03-26 23:01:03 +01:00

mining

TG: Slightly updated the mining consoles, so they can interface with a machine in

2012-03-26 18:15:26 +01:00

mob

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

2012-04-02 00:37:54 +01:00

power

TG: Fixed some runtimes.

2012-03-27 06:34:33 +01:00

projectiles

Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

2012-04-02 00:37:54 +01:00

recycling

TG: Fixed some runtimes.

2012-03-27 06:34:33 +01:00

research

TG: - Fixed wrong paths for mech circuit boards

2012-03-26 18:06:54 +01:00

scripting

…

security levels

…