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

Conflicts:
	code/modules/research/designs/mechfabricator_designs.dm

2015-02-06 13:19:15 +08:00

..

admin

Merge pull request #7239 from paprka/ointmentandshit

2015-02-03 16:30:42 -06:00

assembly

Makes assembly parts work with wires

2015-01-17 18:08:55 +01:00

awaymissions

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

client

Adds chemical heater nanoUI & construction/upgrade

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

clothing

Merge pull request #7546 from TZK13/Purple-Shorts

2015-02-05 18:16:14 +01:00

crafting

-capitalizes Ephedrine in sleepers

2015-01-20 23:21:11 -06:00

detectivework

some updates

2015-01-23 21:00:09 -08:00

emoji

…

events

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

flufftext

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00

food&drinks

Reverted Finite Bottles

2015-01-30 18:10:59 +01:00

holiday

…

hydroponics

remove redundant message

2015-02-01 16:35:14 -05: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

Merge pull request #7065 from phil235/GibtoniteLogFix

2015-01-25 00:29:18 -06:00

mob

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

2015-02-06 13:19:15 +08:00

nano

SubSystem rewrite

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

paperwork

Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo

2015-02-05 18:45:53 +01:00

power

Repath all non jetpack tank types to tank/internals

2015-02-01 18:25:39 +00:00

projectiles

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

2015-02-06 13:19:15 +08:00

reagents

Merge pull request #7382 from Iamgoofball/patch-21

2015-02-05 16:16:58 -08:00

recycling

* Cleaned the disposals code a bit (making it uses the defines !)

2015-01-19 01:53:19 +01:00

research

changes combat requirement to materials

2015-02-04 13:12:43 -08: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

Improves shuttle corner fix to use actual appearance data of the turf, so it takes transform into consideration.

2015-01-19 18:48:52 +00:00

surgery

Makes butcher's cleaver a child of kitchen knife

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

telesci

in order to help doctors keep up, since they now need a lot more to heal people, the nanomeds have been stocked with a lot of extra stuff.

2015-01-20 22:26:13 -06:00