GunHog cd00e07f4f Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor ...

Conflicts:
	code/modules/research/experimentor.dm

2015-02-20 15:23:07 -06:00

..

admin

Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor

2015-02-20 15:23:07 -06:00

assembly

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

awaymissions

Repath all non jetpack tank types to tank/internals

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

client

* Converted solar control computers interfaces to NanoUI

2015-02-15 02:39:48 +01:00

clothing

Merge pull request #7765 from Thunder12345/glovening

2015-02-20 14:24:54 -06:00

crafting

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

2015-02-11 16:13:04 +01:00

detectivework

some updates

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

emoji

…

events

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00

flufftext

Adds a slurring filter, replaces stutter filter where appropriate

2015-02-10 16:39:17 -05:00

food&drinks

Merge pull request #7808 from phil235/CookingTweaks

2015-02-20 12:02:04 -06:00

holiday

…

hydroponics

Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix

2015-02-15 10:27:50 -06:00

library

Merge branch 'lib-sucks-no-homo' of https://github.com/MrStonedOne/-tg-station into lib-sucks-no-homo

2015-02-18 18:26:39 -08:00

mining

Drone Access get

2015-02-06 22:17:36 -06:00

mob

Merge pull request #7828 from Incoming5643/let_us_never_speak_of_this_again

2015-02-20 13:18:46 -06:00

nano

…

paperwork

fixes a bunch of bugs

2015-02-08 13:27:55 +01:00

power

Merge pull request #7780 from xxalpha/catwalkmachines

2015-02-20 13:32:44 -06:00

projectiles

Merge pull request #7817 from paprka/whatthefucktg

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

reagents

Fixes issue #7841

2015-02-20 09:15:20 -05:00

recycling

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

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

research

Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor

2015-02-20 15:23:07 -06:00

scripting

…

security levels

Allow station self destruct with captains identity card

2015-02-15 12:09:09 +13: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

Adds a full assortment of surgery tools to the mediborg

2015-02-14 14:04:26 -05:00

telesci

Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.

2015-02-14 14:18:49 +01:00