paprka 279c2709d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart ...

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

2015-01-24 01:40:51 -08:00

..

admin

MoreRefinment

2015-01-23 02:19:17 +08:00

assembly

Makes assembly parts work with wires

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

awaymissions

…

client

Adds chemical heater nanoUI & construction/upgrade

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

clothing

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

2015-01-24 01:11:14 +08:00

crafting

-capitalizes Ephedrine in sleepers

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

detectivework

…

emoji

…

events

replaces all instances of pacid with facid

2015-01-21 20:17:23 -06: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

Merge conflict fix

2015-01-23 07:52:24 +02:00

holiday

…

hydroponics

replaces all instances of pacid with facid

2015-01-21 20:17:23 -06: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 ore redemption machine screwdrivering

2015-01-21 23:53:11 +02:00

mob

Merge pull request #6753 from Ergovisavi/abriums_on_fire_rolling

2015-01-23 22:33:05 -06:00

nano

…

paperwork

Merge pull request #7095 from Miauw62/assthecopying

2015-01-23 13:44:18 -08:00

power

And other readibility improvement

2015-01-16 04:31:02 +03:00

projectiles

Merge pull request #7265 from Firecage/ProtoSMGpin

2015-01-23 17:48:21 +01:00

reagents

Merge pull request #7213 from Iamgoofball/patch-11

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

recycling

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

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

research

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

2015-01-24 01:40:51 -08:00

scripting

…

security levels

…

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

…

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