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

Conflicts:
	code/modules/projectiles/ammunition/energy.dm
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi

2015-02-04 18:36:50 +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

fixes hardsuit runtime

2015-02-03 21:07:38 -08: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

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

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

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

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

iv drip hotfixes

2015-02-03 18:34:32 -08:00

nano

SubSystem rewrite

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

paperwork

framework for a future "suicide hotline" job

2015-02-01 19:44:54 -05: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 HoSGun

2015-02-04 18:36:50 +08:00

reagents

iv drip hotfixes

2015-02-03 18:34:32 -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