MrStonedOne 5addddb1d4 Merge remote-tracking branch 'upstream/master' into lib-sucks-no-homo ...

Conflicts:
	code/modules/library/lib_machines.dm

2015-02-18 18:20:16 -08:00

..

admin

Merge pull request #7723 from Miauw62/welpwelp

2015-02-17 14:28:03 +01: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

Fixes conflicts, fixes casually worn uniforms looking weird

2015-02-15 13:07:06 -05: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

Renames game_options.txt OOC_EMOJIS to EMOJIS

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

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

Fixes that damn typo FOR REAL THIS TIME

2015-02-18 11:53:20 -06:00

holiday

Spookoween should be mucho bettero now

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

hydroponics

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

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

library

Merge remote-tracking branch 'upstream/master' into lib-sucks-no-homo

2015-02-18 18:20:16 -08:00

mining

Drone Access get

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

mob

Merge pull request #7652 from Incoming5643/Circumstantial_Dickpixel

2015-02-18 21:07:08 +01:00

nano

SubSystem rewrite

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

paperwork

fixes a bunch of bugs

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

power

Merge pull request #7740 from Menshin/nano_solars

2015-02-17 13:53:37 +01:00

projectiles

Merge pull request #7653 from GunHog/IonCarbinesFor-k-ommandos

2015-02-18 00:16:33 +01:00

reagents

Merge pull request #7731 from Incoming5643/mediborg_drugs

2015-02-17 15:37:39 +01:00

recycling

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

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

research

Merge pull request #7653 from GunHog/IonCarbinesFor-k-ommandos

2015-02-18 00:16:33 +01:00

scripting

Updates/fixes to NTSL

2015-01-03 17:43:43 -08:00

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