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

Conflicts:
	code/game/gamemodes/wizard/artefact.dm

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

..

admin

Merge branch 'qoladv' of git://github.com/tkdrg/-tg-station into tkdrg-qoladv

2015-02-14 23:16:02 -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

adds a skeleton ghost for byond supporters

2015-02-01 22:58:55 -08:00

clothing

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

2015-02-15 10:27:50 -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 #7718 from TheVekter/shotglasseshowdotheywork

2015-02-14 18:33:00 -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

…

mining

Drone Access get

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

mob

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

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

nano

…

paperwork

fixes a bunch of bugs

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

power

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

projectiles

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

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

reagents

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

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

recycling

…

research

* Building an item from the protolathe/imprinter now correctly returns to the previous screen (categories or search)

2015-02-13 22:33:58 +01: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

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