paprka 6de33d4063 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff ...

Conflicts:
	_maps/map_files/generic/z2.dmm

2015-02-02 19:13:49 -08:00

..

admin

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

2015-02-02 19:13:49 -08: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 branch 'master' of https://github.com/tgstation/-tg-station into gunstuff

2015-02-02 19:13:49 -08:00

crafting

-capitalizes Ephedrine in sleepers

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

detectivework

…

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

Merge pull request #7306 from hornygranny/wzhzhzh

2015-01-25 04:21:00 +03: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

Merge pull request #7065 from phil235/GibtoniteLogFix

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

mob

Merge pull request #7492 from xxalpha/spacesuit_storage

2015-02-02 18:52:51 +01:00

nano

…

paperwork

Merge pull request #7381 from phil235/AIPicturePrintTypo

2015-01-28 14:45:04 +01:00

power

Repath all non jetpack tank types to tank/internals

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

projectiles

updates to ERT stuff

2015-02-02 03:33:37 -08:00

reagents

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

2015-02-02 19:13:49 -08:00

recycling

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

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

research

readds the stun revolver (oops)

2015-02-01 21:32:51 -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